gentoo auto-resync : 03:06:2024 - 00:07:25

author: V3n3RiX <venerix@koprulu.sector> 2024-06-03 00:07:26 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2024-06-03 00:07:26 +0100
commit: a3bb28551df94028000fb72308a9e9baa01458b0 (patch)
tree: 33b14c7bf0dffbd5bb04dbd5b395514ebdda4896
parent: 6657c680376cedf378fcf328e5fa03ed3b41d580 (diff)
1228 files changed, 7663 insertions, 6877 deletions
diff --git a/Manifest b/Manifest
index 2f57f1bd95f5..45e6bc75c3e2 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29734 BLAKE2B 0fdcfa549ecef3e6d8ae2a3eef11740baf840cca229feeb07c56871e6838ff50276f7070b3891a4ff41b28ea2d46244522cdc674672582a72f67e03d7063846d SHA512 48d441c914ecef14cb7339113fa4cfc28e651d4b033881b5017c50987fa6a7eaa2f5246d4c81bf339a947293eb4ca193937a613803a27afda44e028f1748d894
-TIMESTAMP 2024-06-01T22:40:37Z
+MANIFEST Manifest.files.gz 29769 BLAKE2B b11f6ac6388fcd37b1d9629965b9385052d6e96e355ffd7d7a67028649a49e29c54c1c39187569fb17703be3c4c3dab2a7153e3135ce22f978c2b3352d8de8b1 SHA512 13f8a3b14c6a65b8f4419a245a779b9eed4db017e8796020d3a1f254e083ea449a6349289fbc3d86a6b79e232e00a8b8e5ba6a9fd4b9efa18d8112d91eef9609
+TIMESTAMP 2024-06-02T22:40:42Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmZbo2VfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmZc9OpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBz0A/+MdFjAPQlEhqcDb9X4vr3ZTlazlti/5YPfrX/SjbVwYdvIFmpVlC6tRpP
-2X/SeT7+WmNvMwNqYJDrj/Rj21JRu5ahMLo4eoSyimYHrMnkulfAL+q9TXzqjLAN
-1H4PbcVBcHOLNN8Ctm7Wq1SD4FU7tsvJ7FkMaBTNaB+KPDn4Gdbu+DD7ERubHm0N
-HOQ+oD49ovSUxBRf4NgsRZGEV3dOXe1ce6tEZsICnVpz0Ykdkszd/87arHTacmB0
-EqxYKzGHrCvkC4r6c+uxt+p0Xngrx89se2HGxSX8B1frBBarynflzk7rtc6yHp9Y
-MVdoCReGT705asVhvB707HD1/Ce25Y/K8zvGC718jn8lENCxFZaQi6IuN3e+EVnb
-78NMx8bsxRVFOtRazxwGespRPqrvKMBVQUV9w4kRGJLEK2epwJJbUwn83jlFhWqV
-xF5JsdrCS+reUBPw39rjUUYurUGu45po4vUGOWtUGkkGRkqKLdfC+ffiYYMuLAEd
-PjRwbnW3Xsm3L12CKE3VLCl3ueqOgSs8H9c3t1x+jGyRBouauoJEPp1Z6P4QeAGF
-OX75yZk4cfJLM+6FMYGFGD/aNgdHIh+/rD1MXyj9EbgWJI1o9WJe8XMu2kME9xCV
-cRXvXYj/Bx1nWlub+h9rVCmu5WGbVUsE2UmnIdKBc8tOdoGgbCo=
-=0M1q
+klC7mxAAkoZ3vtJ10ee7+mMrLJRPbgh1jelhJ4CM8XdGJTbNyTVixO8UHFJ07No3
+IMWp58M2DQw+IGBCQhapfFjJ6HtXYbkAgAyGphWaZpjMkIAMuctZdXNlcJ1WLG1R
+d0hM4OyBdbJkerTy4MO2tpRBqj4X9i3wh3Nmfh1+Q6Ab1ohXI26eB4Hs7apsxGIT
+6ro2QBEtGGWOUajWmGRGQxLbWSAen0K6QsyMxOOA7LCHfF3iH6JJlylp7Efm7VCR
+nFBaxBVnq38hfuBL/6BFzHk6wXcnIctdJHMTjqJcHDawQZRa75Shw6eQV7qLRVU9
+KyMCd+St+MtH7NvI6YvDDgHwwvlmbnDkUTbyYlk62+JAFxAaMmYkpTGyglqbpxL/
+hPFw3O6KF9fbqBKlkpIBNrdXjn0760hvk5a9rY5EISNf3GQ3/tAgFWtp7JUwCzAr
+7uMB4vQ61rLdQv8MP7NO+N8zSeHSUr9KbYY9vjjQ+ISxM5Tp9T1TyeBYxeolXJjv
+AEuhj4hPp9sTDsEbfBsy5mOHl0Q0E1kapHyyOz2kQq4EQrB4BPclav78yDRKMwdR
+aiG24uYBbtVcwvTIQb6AhysAd87n9j8DxwEJrQFdMKv2F6pY/3agI7oB1v/udUIC
+EubCIYVILLxph3Y3Gj7mllzoeOKBSEPmujUFIQVJ+ONuZJPi1SU=
+=N5R0
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index a64963daf91a..79a3ed7a0155 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 8cc6b0c4a15b..212de2877eca 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index 4022843956d3..dea643bad055 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -2,5 +2,5 @@ AUX brltty-6.4-respect-AR.patch 385 BLAKE2B 0029b98054c21b86bb3d03ff52a358fd0858
 AUX brltty-6.6-cython3.patch 1594 BLAKE2B d18b09f888e688efb8a33c0de6cbde25956d1024caa74484b49a48ec65d4dfba06166e26094add5696ba8f8b0563956ff743c81b0510b20db8918ad17ed37f92 SHA512 d4e596a24fbc66629cf935bb6c4c259c594b287a2ea187a362484cd7343247b413f11615afaeb35d761f9497d113d5305819b19830558def0d805036fc4c7149
 AUX brltty.initd 241 BLAKE2B 80969e4840d2d38af6bc310ecf18e0253ef01667517135bc5a2f92e50882c2b72e8a4763b215c62ccbfd8d2250067b44ce9a4cb5d318dd6eb48b298826d8d5de SHA512 55ea97a546a2335ee1148396df71363442b66ed4526f8adb93e88c2cf489f10a21b5361658f590b3f64eec24844235491b15349bd0e1c4533fef7b1390fc3a6e
 DIST brltty-6.6.tar.xz 3684592 BLAKE2B c1ae05b925384f3869d3c90ccc06197da2a592691830504ff01a530da87319d463e25cd7b387805c199562be815ca4e79f3679f592f3a1107025e3aba17ec159 SHA512 852bfd9179570be7b0da8b1279f84bdfedc14a319988d9c2eac5a20a9ce8977f31fdee167e8e96bb411184a1d72f4cdc633944c7b3f55bddae411fc71a9e6898
-EBUILD brltty-6.6-r1.ebuild 5799 BLAKE2B 0d719bf9db29a958611fba94761d7bcc34d32dce44bfb8c7be0022d744f1c626d343378f28d39ca54d1ffca955d9d1e435eb734a658da8c7ca73098370de8187 SHA512 c0a63aa0c99faf2ab9388ce767a73d4c1ff9817906517164970cb1d6e78de6ab9dbbf93217c49ce111f65384f2ffe058194d756f97edb42e27a0485cb015ae50
+EBUILD brltty-6.6-r1.ebuild 5799 BLAKE2B 507821f81a50f205536ccaead2b4e23007ad2536a339b4e044bf2b3761bbfb78b4160758fda0c5142a818d61091c77ce6a62a515be445052fb2a1e35101b19b8 SHA512 ee88cf88581dd6ef95abdc4aee00d1b3c4a1760152d15a0c148a30511fb2cc5b56ee7661f7c5f4d7d53031b135d9c2ee3716f5b00e4bbf5d74cfe0d5eb2e9a52
 MISC metadata.xml 1596 BLAKE2B a0eb74542a3ad8ea8d36e269d9c0c9266b1dda440ff9c5a02b53f60c9b406e30c55d7ef58a2c49d02348b410515fb2b4ca5d36e152f006b9bab7445577441a6e SHA512 369c801ef0a8be96d66c2c163fa6000fcf35b49fd83a5521d93a6a2bac5da1f540c2fa977198fc651451959f804a9e3b3630ca8a0470231892861ed1d5cc5b6f
diff --git a/app-accessibility/brltty/brltty-6.6-r1.ebuild b/app-accessibility/brltty/brltty-6.6-r1.ebuild
index 1c4193844a37..9558fd3f1d65 100644
--- a/app-accessibility/brltty/brltty-6.6-r1.ebuild
+++ b/app-accessibility/brltty/brltty-6.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 FINDLIB_USE="ocaml"
 JAVA_PKG_WANT_SOURCE="1.8"
 JAVA_PKG_WANT_TARGET="1.8"
diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest
index 8565e7055f96..050c975fe62b 100644
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@@ -1,3 +1,3 @@
 DIST orca-45.2.tar.xz 3997024 BLAKE2B dfdf113694127323a92450b04b20fcc5655be0236c0173167d5d15478703b676c3fd8c1de0e75783875c5d2d40541c764fb002314d66c7570475cd63f6bfa473 SHA512 57eee451cf0da52e1297beae6c6d527886721b23c3415a5e046f3431876fdf1603dbd81ca763ed614ace68e7db96d90b413c663f113d0033ec1f2797df7bf589
-EBUILD orca-45.2.ebuild 1452 BLAKE2B 5e5bf09c4c9359275b54bcd99a09256b27d1a5722f918b793838db21e0f3db22391fcfdfca92eb6bed014f3172ec369f312cd93744e4404e10be2a8b3e347d48 SHA512 0b0ca1102818797b143dde89cb5479378f7f6d0b723a8196e9e687d6568f6b3ae8de4d7ea5d851ff30e00aca8088d1340a5f3349699b1e4a791f2111f35d0c3f
+EBUILD orca-45.2-r1.ebuild 1560 BLAKE2B 13ac4e66c0ec8ed347d58136395b80950bb9d6998c0df013bcd5a826d7787b8d7bc6bc1da3a63f58f4148d26b9c9e6fa76efd5c3a0c2420d4d87f6049a388394 SHA512 382464711e1a2d921c9de5e2c410e02a322abcd22181bd82693e75960b957302fc101950e8ef70a29fafd1cb54bbd7fbf31d33f06b349e04c715a92a5649e338
 MISC metadata.xml 762 BLAKE2B fca9ee6ac93d2e860f6791af78380e9d8d29ac10b254299946911a29b5893028e561a18320bc026dd7e9421f3c572e1c3ac63264276a1b292996db93e1cba4a3 SHA512 6bbe0cff5af52cb48adccbb61620fd75a0811cad313867b63cb09b5a7c259230019a54ad607ee46c986188ff11ac2f6878ef20381ef34965dfe918c88ec945d0
diff --git a/app-accessibility/orca/orca-45.2.ebuild b/app-accessibility/orca/orca-45.2-r1.ebuild
index 69045598a323..b501097d07a7 100644
--- a/app-accessibility/orca/orca-45.2.ebuild
+++ b/app-accessibility/orca/orca-45.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit gnome2 python-single-r1
 
@@ -28,8 +28,13 @@ DEPEND="${PYTHON_DEPS}
 	braille? (
 		$(python_gen_cond_dep '
 			>=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
-			dev-libs/liblouis[python,${PYTHON_USEDEP}]
 		')
+		|| (
+			>=dev-libs/liblouis-3.29.0[${PYTHON_SINGLE_USEDEP}]
+			$(python_gen_cond_dep '
+				<dev-libs/liblouis-3.29.0[python,${PYTHON_USEDEP}]
+			')
+		)
 	)
 "
 RDEPEND="${DEPEND}
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 63eeb369a569..1e274ea34fee 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/gtkdiskfree/Manifest b/app-admin/gtkdiskfree/Manifest
index c9d30ba43fa6..e75e9509224b 100644
--- a/app-admin/gtkdiskfree/Manifest
+++ b/app-admin/gtkdiskfree/Manifest
@@ -1,5 +1,7 @@
 AUX gtkdiskfree-2.0.4-musl-setlocale.patch 304 BLAKE2B 3ed1157d242a0d6d4aba09721111c8f6811dd087ead3537e1f2f7808fdb0d57558819c14f0d178c852a31a9bc760eb11b7a53671517cbf7ea29b8b7bb6894e9b SHA512 fde3ba124368a14144553464b2465fc24c40bab5ed86519e59432c982823c285369c34770930d132998c28abbe6f9ca98410741acb1ec2bd01f1ab00e256c58a
+AUX gtkdiskfree-2.0.4-use-const-data-for-icon.patch 456 BLAKE2B c997cc936f878133641ccf213e72f978dda04a52e1dd78b39aa4404edee511dee82836e21f776c8e2b4112833a26f7611ac28aaa1cac99efa8a41104e642e10b SHA512 b99d9950a24b11f7e4bcc6410293683a960f5b12622ac04a3643fe2ce89fb75f3d9cb181cb82d9133416d6db80607a650d8bfe87c1f2276e8b8f47d537286d79
 DIST gtkdiskfree-bdda379b9109a226a37801505a19da91494144a6.tar.gz 318381 BLAKE2B 06fa325714dba0ec8ee319448286af791472d4aebdd7b94923fc102dfa0352f69247b941e91877c906b754a3b15c8c97d3b01281389274bc92ae23d1c4dfe858 SHA512 641aff62adb665ed6faa82925cc8941d894591e8209a46097b04a5feaba50a401144414edaaa1d97dd9c6b01fa6b4a057b3a5d96f9fd20318f85e535550ef2b7
 EBUILD gtkdiskfree-2.0.4_p20200224-r1.ebuild 858 BLAKE2B 2c8c2a71fe1d4151c13fd5f4a6f593b194829d9907d9b7a86d906318188bca7b59a5e129c971c39193226f51b5ca77f5bd37d5c03d36b4d1efd33cff1e0edddc SHA512 4a6af5c3840da75410cb7282f8e02ad346f285089b4717defb08de1cc25b9499ccce960e9e712d265460e77d8329c7d1f47527e70cb7d3d41555776bba273070
+EBUILD gtkdiskfree-2.0.4_p20200224-r2.ebuild 917 BLAKE2B 3c0da657998f4be364faefd72777886a4ff694093df45388a74acdd53e4c92303141c870aa77617cc52d0e6b7837399fbbf7217aaa9104612c8edf73dd2ea76d SHA512 85a47717202fc343d5c2e4e1b70e477e09b627979b384ec11c8634210cc4237a54db8f1eb1e898027684d8eec3d76eae817c51bc19bfab56d8a5fc152f9115d5
 EBUILD gtkdiskfree-2.0.4_p20200224.ebuild 775 BLAKE2B bfbc8fa6f36663e46239e49954c2e23de38a6a32aa88991f6a7f5b6322fe58112e490c71a610516f2ff2d7b6da9e58559df87f26660c6e698d30c93454374c63 SHA512 e3aac871b014e841241b7af30feefd40168feee5eb883c9090a5a5792ed3dc582c9de6db2078dedee77e28abd7b4c501cc7cc782d1783069429cf05868c0e338
 MISC metadata.xml 476 BLAKE2B 3991159342982a35d1edc7d40505ed702a6720cc6b94b15bc0d934a9015928185e122d2198d6fe4e1e1fbb9754e60a4a9aa46b678e15226da7cd9f423da6f97c SHA512 8ea510fdb6ad071afdc0a4a557b3422df7746e24e037cdd4d67d6398039c6dfabfa306eeb420ce106e518931b26c682728e22e3c3c6cb9777df4a4d32534f41e
diff --git a/app-admin/gtkdiskfree/files/gtkdiskfree-2.0.4-use-const-data-for-icon.patch b/app-admin/gtkdiskfree/files/gtkdiskfree-2.0.4-use-const-data-for-icon.patch
new file mode 100644
index 000000000000..a1b99c946c73
--- /dev/null
+++ b/app-admin/gtkdiskfree/files/gtkdiskfree-2.0.4-use-const-data-for-icon.patch
@@ -0,0 +1,18 @@
+https://gitlab.com/listout/gtkdiskfree/-/commit/3e8d72c2e4115e1372edb81ae9e3a9cd682e9c48.patch
+Bug: https://bugs.gentoo.org/923113
+From: Samuel Bauer <samuel.bauer@yahoo.fr>
+Date: Tue, 8 Jun 2021 20:40:21 +0200
+Subject: [PATCH] Use const datas for icon
+
+--- a/src/icons/icon.xpm
++++ b/src/icons/icon.xpm
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * icon_xpm[] = {
++const static char * icon_xpm[] = {
+ "48 48 592 2",
+ "  	c None",
+ ". 	c #C7C7C7",
+-- 
+GitLab
+
diff --git a/app-admin/gtkdiskfree/gtkdiskfree-2.0.4_p20200224-r2.ebuild b/app-admin/gtkdiskfree/gtkdiskfree-2.0.4_p20200224-r2.ebuild
new file mode 100644
index 000000000000..7b48a540eb7d
--- /dev/null
+++ b/app-admin/gtkdiskfree/gtkdiskfree-2.0.4_p20200224-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Graphical tool to show free disk space like df"
+HOMEPAGE="https://gitlab.com/mazes_80/gtkdiskfree"
+COMMIT="bdda379b9109a226a37801505a19da91494144a6"
+SRC_URI="https://gitlab.com/mazes_80/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk2"
+
+RDEPEND="
+	dev-libs/glib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	gtk2? ( x11-libs/gtk+:2 )
+	!gtk2? ( x11-libs/gtk+:3 )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.4-musl-setlocale.patch
+	"${FILESDIR}"/${PN}-2.0.4-use-const-data-for-icon.patch
+)
+
+src_configure() {
+	if use gtk2 ; then
+		econf $(use_with gtk2)
+	else
+		econf --enable-old-color-selector
+	fi
+}
diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
index ee654f4e1a2d..642a03d956fd 100644
--- a/app-admin/lnav/Manifest
+++ b/app-admin/lnav/Manifest
@@ -4,4 +4,4 @@ DIST lnav-0.11.1.tar.gz 10268167 BLAKE2B d490c6798685e80021437e1771742dee59c3b51
 DIST lnav-0.11.2.tar.gz 12379373 BLAKE2B 513e10f44d3770fb0135ad7fd035d07b35d2a44b2745acf700de0bf82ef428eb1549f9fd389ae4d6e3e268378a980f59f164479390a2a3faea16555941d3c9ca SHA512 a48c81e075923a5e1cdb051dd18329ff417f628518c8273fc19d0787226414668e1c29645edf20a46173fdf65a2b8978517948317fdc8b45c772fdc82cb82154
 EBUILD lnav-0.11.1-r2.ebuild 1141 BLAKE2B 7ddf30143ece50dbe6240ece60967a7c4b92857705a4298f2dcbe576ea4ff39a35b63494681b42d9487941191808a2e74ba93624265e2eb50f1eaebbe2c3dbff SHA512 efae32a37544629390a1db703129c3ff6cde22e7d3d3c7514923fa058b602bb15d6c1f6f46d6435da928186e849c87a9fdc615918d54d559511a9add73316214
 EBUILD lnav-0.11.2.ebuild 1052 BLAKE2B 5d5913e668d23ffa162024256d09b54f107bc8cc12562c57a1eea66a4b2b4b3327da0158b043a8ea342c0ce5b8f491cf3aa9178278e51ede12c03e861738df62 SHA512 91e506ef385658eb35c408f5bdedd9a09b857253435fa88dde51e18fb2c5e370f997d79a8f5eae7bf13b04753e6ae1f537aea617497d3ad95bca8fd2fd165cdf
-MISC metadata.xml 858 BLAKE2B 6596baed4200d06faeacd61693e5d2e257587a30555469e0b6661755ab563cfc6693dd7e0970856a78c132544cde04655ca7febac482c9406c26a3b7cbdfc201 SHA512 1787552bd321e245a49a1b5b95d6e6f58362422153b6ee0b51ce644bf67ab098dd3c5ea11cb144dc5dae089208360fcf2a732845c24bb1e4c5dd5c67987e88bf
+MISC metadata.xml 612 BLAKE2B afc47732dba3190cacef50c032d297ed71ca1c30db8c0b01c97ca12ec9f580cc9a9eaa672d2eada43a60f143992c10aee06ba62ff48bd0719cae6939ebd15db0 SHA512 aa14a62218dbfc8cb67eb67bd3b51f3efafce2a03ae27ba5ee2171613c6f1a6e41a06ee7129b5da2e7e194ed0ca9e6b48637f9ee106fe9ca31fdaf9113abea52
diff --git a/app-admin/lnav/metadata.xml b/app-admin/lnav/metadata.xml
index 49ed98af6520..9adb44759029 100644
--- a/app-admin/lnav/metadata.xml
+++ b/app-admin/lnav/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>randy@electronsweatshop.com</email>
-    <name>Randy Barlow</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription lang="en">
     The Log File Navigator, lnav for short, is an advanced log file viewer for the small-scale. It
     is a terminal application that can understand your log files and make it easy for you to find
diff --git a/app-admin/needrestart/Manifest b/app-admin/needrestart/Manifest
index a7d8d0163120..484a3000b9e5 100644
--- a/app-admin/needrestart/Manifest
+++ b/app-admin/needrestart/Manifest
@@ -1,4 +1,5 @@
 DIST needrestart-3.6.tar.gz 71159 BLAKE2B 76994ef0e77a4db0532dca2e17990097b2314f912fc3c32e67643eca7c44fff9611a42b49abd55f959a0e959d6ea69cfef36ad9008c86debfd125b64bdc673b5 SHA512 5c0f2f427c93e6f621fc1727f6abf42651e184e168b3f720708ac73b425bc7dfb94622c6cc2afad1161e3ffbfd36500eb99c375f2f5a525c9cd10d7142f1e365
+EBUILD needrestart-3.6-r1.ebuild 943 BLAKE2B ad240853963c67a4457dc34983fd91e3027fec9aecd6b70b69d7069899bfbaae51bf1ba566a0bbd65fd4fbba5cdb985fb450f8fcff5f4747366b1fff90ed94e8 SHA512 3ab107ca42430b1a91478795d3c6f740b1eface0c70861545c7bfa3a78eac1835fbfbb58c4d2d1f77ecc3ffbb8e961631a514c0c2c6bcc430dec1ed7c5bd0ac7
 EBUILD needrestart-3.6.ebuild 912 BLAKE2B fa17a3fe3c3fe84244901cfd22817e7b78ab5d9ea0b11baa796ce190bc0a2c21e6d6c39e3b1157cfd86c541efccd595ea5ebbb3e26404cdee2c046521daba684 SHA512 b47923f8c912c055251b24f281c00245b0967f497d02ae262c91b4008fe639dce050652232be15c92c8500ca0cdc3a95fb3bad8e36058a01179427615bdd9e1e
-EBUILD needrestart-9999.ebuild 915 BLAKE2B 82577740e01939ca0e0104f3c2be796ae6bdc1e74e0d197057f6672ba9242785e4145ea578c6f236b00f7ab59e61364cbb874837eaa2c99c5c72fbc7752afb7a SHA512 983cfb758f1994a85a68c8a5a45b32218862ede337e7e3443c19133645efa0b691a078a54cc65787acc0608be2a99adfef745aa5f68d6d87f43ffd26a3545d79
+EBUILD needrestart-9999.ebuild 943 BLAKE2B ad240853963c67a4457dc34983fd91e3027fec9aecd6b70b69d7069899bfbaae51bf1ba566a0bbd65fd4fbba5cdb985fb450f8fcff5f4747366b1fff90ed94e8 SHA512 3ab107ca42430b1a91478795d3c6f740b1eface0c70861545c7bfa3a78eac1835fbfbb58c4d2d1f77ecc3ffbb8e961631a514c0c2c6bcc430dec1ed7c5bd0ac7
 MISC metadata.xml 361 BLAKE2B 32f60b794e1017b1b358c91737d3117fcca6e90b52b6b0dc611488262db98966ac2856341b7ba726dd167ca6f63bbb5b6165ac4d066ea49066c1b771447266d5 SHA512 4f21f03e0462da778f7b85ada6f1e8c4fb4f5d2e7ca8d227b0baebbb5922f06a6e3baae21e8bfc33d20bd33ddcbd9fec4cc2eb1711b3f8d8d8bd52b104cd5353
diff --git a/app-admin/needrestart/needrestart-3.6-r1.ebuild b/app-admin/needrestart/needrestart-3.6-r1.ebuild
new file mode 100644
index 000000000000..d530994f324f
--- /dev/null
+++ b/app-admin/needrestart/needrestart-3.6-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/liske/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Restart daemons after library updates"
+HOMEPAGE="https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart"
+IUSE="systemd"
+SLOT="0"
+LICENSE="GPL-2+"
+
+RDEPEND="
+	>=sys-apps/sed-4.2.2
+	dev-lang/perl:=
+	dev-perl/libintl-perl
+	dev-perl/Module-Find
+	dev-perl/Module-ScanDeps
+	dev-perl/Proc-ProcessTable
+	dev-perl/Sort-Naturally
+	dev-perl/TermReadKey
+	!systemd? ( sys-apps/init-system-helpers )
+	amd64? ( sys-apps/iucode_tool )
+	x86? ( sys-apps/iucode_tool )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+src_install() {
+	default
+	doman man/*.1
+	dodoc -r ex
+}
diff --git a/app-admin/needrestart/needrestart-9999.ebuild b/app-admin/needrestart/needrestart-9999.ebuild
index c773506fddc2..d530994f324f 100644
--- a/app-admin/needrestart/needrestart-9999.ebuild
+++ b/app-admin/needrestart/needrestart-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ fi
 
 DESCRIPTION="Restart daemons after library updates"
 HOMEPAGE="https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart"
-
+IUSE="systemd"
 SLOT="0"
 LICENSE="GPL-2+"
 
@@ -27,7 +27,7 @@ RDEPEND="
 	dev-perl/Proc-ProcessTable
 	dev-perl/Sort-Naturally
 	dev-perl/TermReadKey
-	sys-apps/init-system-helpers
+	!systemd? ( sys-apps/init-system-helpers )
 	amd64? ( sys-apps/iucode_tool )
 	x86? ( sys-apps/iucode_tool )
 "
diff --git a/app-admin/opentofu/Manifest b/app-admin/opentofu/Manifest
index 8f7d1db6a765..227dc5716323 100644
--- a/app-admin/opentofu/Manifest
+++ b/app-admin/opentofu/Manifest
@@ -4,7 +4,10 @@ DIST opentofu-1.6.1-deps.tar.xz 332000152 BLAKE2B bfa5bee3c7ba8cc79cd8f81137fb61
 DIST opentofu-1.6.1.tar.gz 3709010 BLAKE2B 3d172a4228ff10608dc74da6980eda38ec9afa13ac4bbfeb4ae3fb3142af81fc30988a99fea01ee7988b7ad057efbe1b270b4b880e4152ec3d87939f29ae8614 SHA512 6d98e5f03340853ad3f516ad890fe297c4239c03c0c5d4b0e7efc490b734ce2948bbd3ee5d1375d9eade2ea4a6ef71dbb22a5dd48fc81df5a9440ce73090a92e
 DIST opentofu-1.6.2-deps.tar.xz 106556484 BLAKE2B fe6ed9507aa3589e34f8c3189d6ee03044b6397a650663c9746c94e45066dbc6e15529f9b4ed3c57649083580a7589596c0b710fdcf0ec832816e76d5137607e SHA512 d8c2e66ab9254d0031aa8fd7dc6fb0ef1aa748282a0b7d9d277398c2f50bceb097b52389a19b70c67d5d0abba9ef289f3d19a786436f16f7549b293bf6b46a48
 DIST opentofu-1.6.2.tar.gz 3708735 BLAKE2B 07c48de78e5510c87413447bf2393ee3e93a91ea562a28849e9db6342eccb7b85745cea0aaa3d8e3861a10127905f4b3614b77863b62a21a0a8c8f5163afac22 SHA512 25fac0e6837f2d125d35f780c3091139819a00ae3f96c2e62a1c3c544e425a60c9880c84b4e1aa6727771c5523c81e8dbab38d5151b854bbc470d7819746567c
+DIST opentofu-1.7.1-deps.tar.xz 107794272 BLAKE2B cf06be88cdfe1e2b12d9f5b6c3576bb5d5fab9a05041fa60ad98a094778ab937efb5d2cc0f535f6212ed233188a4c620cc4ac80b5f58306b2dc92399d138c8b1 SHA512 d9e950cf196b93d75211593b372ecf46a6933f05a653e63c60bb1813530ddf39edce5236f1dcdc815812fbbe2b7721c237ca0cc36f3fcded523e1d213ba7ed7f
+DIST opentofu-1.7.1.tar.gz 3890267 BLAKE2B c82bd4a99eb904a2dddc1c38c7a67680b3a51eb9a4a23ff618d038c4b467c7666a9801c7fb205d2f93b60ec8137a28b193347c0be43357a7397a0d98b8e1cf06 SHA512 11573449cf73e44352124463bb2dfe890688fc0bb1a232fb57a16872612c562e0fe08ed926635fc21063118d83a120febd156073c23d8dc3294e00035c660ad6
 EBUILD opentofu-1.6.0.ebuild 844 BLAKE2B bdfa0b0c680d11a0dc80829f2acfbbd919efd06d6f5a2fc1478455a15e1aa8d1fbf633a23f9479677449a1561a2bc56c85766f94d0561a5df211116c1a395e50 SHA512 54b6886c941cb45f8965816bc2ecd161d2efa79348adf42b3f12bc1217d13f7de47a1a09deff7836864ccf76a7ef198320e7fbe506ed7c4489c494fc20026cc9
 EBUILD opentofu-1.6.1.ebuild 844 BLAKE2B bdfa0b0c680d11a0dc80829f2acfbbd919efd06d6f5a2fc1478455a15e1aa8d1fbf633a23f9479677449a1561a2bc56c85766f94d0561a5df211116c1a395e50 SHA512 54b6886c941cb45f8965816bc2ecd161d2efa79348adf42b3f12bc1217d13f7de47a1a09deff7836864ccf76a7ef198320e7fbe506ed7c4489c494fc20026cc9
 EBUILD opentofu-1.6.2.ebuild 844 BLAKE2B bdfa0b0c680d11a0dc80829f2acfbbd919efd06d6f5a2fc1478455a15e1aa8d1fbf633a23f9479677449a1561a2bc56c85766f94d0561a5df211116c1a395e50 SHA512 54b6886c941cb45f8965816bc2ecd161d2efa79348adf42b3f12bc1217d13f7de47a1a09deff7836864ccf76a7ef198320e7fbe506ed7c4489c494fc20026cc9
+EBUILD opentofu-1.7.1.ebuild 844 BLAKE2B bdfa0b0c680d11a0dc80829f2acfbbd919efd06d6f5a2fc1478455a15e1aa8d1fbf633a23f9479677449a1561a2bc56c85766f94d0561a5df211116c1a395e50 SHA512 54b6886c941cb45f8965816bc2ecd161d2efa79348adf42b3f12bc1217d13f7de47a1a09deff7836864ccf76a7ef198320e7fbe506ed7c4489c494fc20026cc9
 MISC metadata.xml 417 BLAKE2B 82486cb8f3504862ce7658f0d54141e559a952874ec92697e7bd03f7f7a1e4a3df90a20158c8be6b4bb42d9c4e9de49c27754589e909a4e32ec52950a3d169bd SHA512 2a347bf9bd1be70d9e1853ae802091fcbea299a15fe4c170aacba005e7528c3b9c784d2b34bfff015f1b531648e6fb2e73ff3fb9d158df0991b3348a91f74eb6
diff --git a/app-admin/opentofu/opentofu-1.7.1.ebuild b/app-admin/opentofu/opentofu-1.7.1.ebuild
new file mode 100644
index 000000000000..544c2e0b5f16
--- /dev/null
+++ b/app-admin/opentofu/opentofu-1.7.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="The open source infrastructure as code tool"
+HOMEPAGE="https://www.opentofu.org/"
+SRC_URI="https://github.com/opentofu/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MPL-2.0 MIT ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-go/gox"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_compile() {
+	export CGO_ENABLED=0
+	gox \
+		-os=$(go env GOOS) \
+		-arch=$(go env GOARCH) \
+		-output bin/tofu \
+		-verbose \
+		./cmd/tofu || die
+}
+
+src_install() {
+	dobin bin/*
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you would like to install shell completions please run:"
+	elog "    tofu -install-autocomplete"
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 0ed4947e4f0e..46d88269530e 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/torrentzip/Manifest b/app-arch/torrentzip/Manifest
index d62fa5e39f45..32f16d094b75 100644
--- a/app-arch/torrentzip/Manifest
+++ b/app-arch/torrentzip/Manifest
@@ -1,9 +1,3 @@
-AUX torrentzip-0.9-autoconf-quote.patch 337 BLAKE2B 6d1f630d365eaa9aff9d2c910ad30ad79694906cbb3ec7fccf665a468458d8103a0ebbc4e0d3fed1969e18b92780217fa47ed9a6260c42888f8bc022db15b3a6 SHA512 6ec05d00be36479084005c0938fb3df58b960914496ed149cb7eea9a6b4cb6067f9caa3ae7c835cf3bd79f357e17e18b8fcf80994dc1d550247c32416d71596d
-AUX torrentzip-1.2-checksum-detection.patch 2001 BLAKE2B 1efdfa1105a2446e6deafc65750505c3115889dcb7567898f8ea358cc8c96b9bbec1ebad20d913b2cc1f8c9ac46f3201bbedfb026493ab7571c234995a89ef7f SHA512 4d949191caed0285596df6dd53b7a86e892f112059e51af6efded5bdadce495b00941a71ae23438e0489a7a8e9795d266b3ba94a70f4b08fb3beb61669586a0e
-DIST torrentzip-0.9.tar.gz 59007 BLAKE2B eb5d7d8d9026115367afd88ef0cf33d2eed600e6eaa773f039a713c76a48a39e12cb5a8ac6faf2937d3563c9270029543bdb6361d2f22a39e2341953872f589c SHA512 691cd25f501de3de16b5b15b2afadfc34b833c3e93208c2c3497674936580ad2c3532a02e02531b89974302eee7b36f7579a412718914b1b38044b78a39a4d4d
-DIST trrntzip-1.2.tar.gz 62707 BLAKE2B 289ddfe89b91c63b1a6902ea7a4055fa8e235e712d6ea911da2848cc8db15cbdf712967b9fcc1414513c1a18eef160108f5f7b03aefd8f8f18c4d04907a16c17 SHA512 90c853efde1d077c741206362bc14fe779627f1b20571246e99ed29980840e78c0377110431c59c35596a0d209e612f6fe77b385707eb4bdb1ea47bb797c9272
 DIST trrntzip-1.3.tar.gz 67297 BLAKE2B c77fd134cfd3ab30f46b66f4b3dd36b899ee6267b17100b1ad15bdf5c6beddaea94fe22d23f1a81de85522768d76401f0192d0deac2ff75edc816510c8069e2c SHA512 c21ed6ac4dacd652e2a67b700741d70dd9da699259bd299ca177c741111f92e70eef0b3ad2ced54b5635780cab2b4c46b3f9c258dfa18bdde24e2718c38339be
-EBUILD torrentzip-0.9-r1.ebuild 564 BLAKE2B c3b95f46af8c990519039ad89be0c054a6060184f1911cf8945247589b3095dc5af33513f5488f0119db7fe38cd917f54a8b0a1413bb4f8db819b4767dccf050 SHA512 8e503901307d1e9c3cba278f06ed4f03de7c70bec58ba88a8ddb96d00ba4bfe791ec02e31c53335a7b2d6ad94a2a7b7315b84b3a7c8cb472d0134aa776dca9ac
-EBUILD torrentzip-1.2-r1.ebuild 571 BLAKE2B ab0db9d4546bc123c64c091c964cffc44c07d532502368002f734b292bc5d28c99d5f4f5c0f62bc41354632da2464f0eec7f483d8e99f5e70d2b0feb834c2c02 SHA512 c7816cdbbdb4cf8825e0ef93a4b8b0fbec0ea0eee56463c9aa551b2829caf3c8ccd7da4ccd12447e0570d0cf9f790d27105384d51f9e6c40d7f2e9acf3e960fb
 EBUILD torrentzip-1.3.ebuild 896 BLAKE2B 722fcd384499449d217391aff9fb0dcf154892342b4ccf2016c60ce8bcd53270984fa93dbeffc33c754998fbba5042eb5c188ac3eee6b934f3ad0e8b86b9e3a5 SHA512 7650a25ae9480d95cded632bf44111e8d6b0d7bc4f6bbf20d13ed585fade3bcfa4fc60f2778b632a07e560934760846cc842b4a785e8f767f7365af6b0b73354
 MISC metadata.xml 928 BLAKE2B b0a650f0cd81be849f08bd6f078035ae7b56967034b3b9ba534da5d046936f7b27e819dc05ee94b2b8d95ca54ceafb8b521f7121eec0f4d5c4fdd0d8ac141ede SHA512 101e70ac70fdc24294dae2f18057c84e75dd0c776689883ea630f2dcd4ddd2b3da1f7e6643ffc5fd1aed2f5e355aa6700174bca0c16eb1fa84d9f531d7eba064
diff --git a/app-arch/torrentzip/files/torrentzip-0.9-autoconf-quote.patch b/app-arch/torrentzip/files/torrentzip-0.9-autoconf-quote.patch
deleted file mode 100644
index f1f15ced173e..000000000000
--- a/app-arch/torrentzip/files/torrentzip-0.9-autoconf-quote.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,4 +1,4 @@
--AC_INIT([TorrentZip], [0.0], [StatMan, shindakun, Ultrasubmarine, r3nh03k <http://trrntzip.sf.net>], [trrntzip])
-+AC_INIT([TorrentZip], [0.9], [[StatMan, shindakun, Ultrasubmarine, r3nh03k <http://trrntzip.sf.net>]], [trrntzip])
- 
- AM_INIT_AUTOMAKE
- AM_CONFIG_HEADER(config.h)
diff --git a/app-arch/torrentzip/files/torrentzip-1.2-checksum-detection.patch b/app-arch/torrentzip/files/torrentzip-1.2-checksum-detection.patch
deleted file mode 100644
index ac1ae14cbe03..000000000000
--- a/app-arch/torrentzip/files/torrentzip-1.2-checksum-detection.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 016915e16f32105590a6dc11a4adc988b2f8d9a9 Mon Sep 17 00:00:00 2001
-From: Alexander Miller <alex.miller@gmx.de>
-Date: Mon, 4 Mar 2024 19:26:21 +0100
-Subject: [PATCH] Fix broken detection of missing or wrong TORRENTZIPPED-...
- comment
-
-The commit listed below introduces a regression where in MigrateZip(),
-variable rc would be clobbered when its value is still needed. That
-completely breaks handling of zips that should be re-zipped because
-of missing or out of date TORRENTZIPPED-... comment.
-
-Rewrite the offending code such that it no longer touches the variable.
-
-Fixes: cf11c900079e ("Check for more errors while reading zip entries")
----
- src/trrntzip.c | 20 ++++++++++++--------
- 1 file changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/src/trrntzip.c b/src/trrntzip.c
-index e55d217..49f796e 100644
---- a/src/trrntzip.c
-+++ b/src/trrntzip.c
-@@ -379,16 +379,20 @@ int MigrateZip(const char *zip_path, const char *pDir, WORKSPACE *ws,
- 
-   CHECK_DYNAMIC_STRING_ARRAY(ws->FileNameArray, ws->iElements);
-   // Get the filelist from the zip file in original order in ws->FileNameArray
--  rc = GetFileList(UnZipHandle, ws);
--  if (rc != TZ_OK) {
-+  switch (GetFileList(UnZipHandle, ws)) {
-+  case TZ_OK:
-+    break;
-+  case TZ_CRITICAL:
-     logprint3(stderr, mig->fProcessLog, ErrorLog(ws),
--              rc == TZ_CRITICAL
--                  ? "Error allocating memory!\n"
--                  : "Could not list contents of \"%s\". File is corrupted or "
--                    "contains entries with bad names.\n",
--              szZipFileName);
-+              "Error allocating memory!\n");
-+    unzClose(UnZipHandle);
-+    return TZ_CRITICAL;
-+  default:
-+    logprint3(stderr, mig->fProcessLog, ErrorLog(ws),
-+              "Could not list contents of \"%s\". File is corrupted or "
-+              "contains entries with bad names.\n", szZipFileName);
-     unzClose(UnZipHandle);
--    return rc;
-+    return TZ_ERR;
-   }
-   CHECK_DYNAMIC_STRING_ARRAY(ws->FileNameArray, ws->iElements);
- 
diff --git a/app-arch/torrentzip/torrentzip-0.9-r1.ebuild b/app-arch/torrentzip/torrentzip-0.9-r1.ebuild
deleted file mode 100644
index ad564eefcc4c..000000000000
--- a/app-arch/torrentzip/torrentzip-0.9-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Create identical zip archives over multiple systems"
-HOMEPAGE="https://sourceforge.net/projects/trrntzip"
-SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS=(README AUTHORS)
-
-PATCHES=("${FILESDIR}/${P}-autoconf-quote.patch")
-
-src_prepare() {
-	default
-	export CPPFLAGS+=" -DOF\\(args\\)=args"
-	eautoreconf
-}
diff --git a/app-arch/torrentzip/torrentzip-1.2-r1.ebuild b/app-arch/torrentzip/torrentzip-1.2-r1.ebuild
deleted file mode 100644
index d526e0b88c10..000000000000
--- a/app-arch/torrentzip/torrentzip-1.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_P="trrntzip-${PV}"
-DESCRIPTION="Create identical zip archives over multiple systems"
-HOMEPAGE="https://github.com/0-wiz-0/trrntzip"
-SRC_URI="https://github.com/0-wiz-0/trrntzip/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2+ ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	sys-libs/zlib:=
-"
-DEPEND="
-	${RDEPEND}
-"
-
-DOCS=(AUTHORS NEWS.md README.md)
-PATCHES=(
-	"${FILESDIR}/${P}-checksum-detection.patch"
-)
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 8fda3ed91d67..a1577a50a073 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -6,6 +6,6 @@ DIST xz-5.6.2.tar.gz 2355785 BLAKE2B d2d5f9772714b5b5993ec26c313bd27dc10d88928d9
 DIST xz-5.6.2.tar.gz.sig 566 BLAKE2B 9b1f19d0449de18057eb5bd3cceaa073fc245e9a05fb19fabdac98b1d2e708b39c8070130c522b78ff75df724e207f978d8da65e2ccb1c6fa295aa892eda0d23 SHA512 f3d1055a2a6e96eec2fd5c0b733f2ab5e150bac9645f1fe9a7558ed6f34a241b4f57e17fd4504f311be26cf1e2b9b797f2e78b1b9d2db02e9cd0c1548cb6160b
 EBUILD xz-utils-5.4.2.ebuild 3916 BLAKE2B e5ed50ed6c54ba51fabcc3b77ad0a42a00e8b5aca66a3264e51c572300bcbdf0ce181b8548aad3cd2c917ba9f77960e069ee73392be9d6b43f399ce70c98d8a6 SHA512 15d25fb0df99907985f4cd94edff05f3db0a15afee067276f00616eceb46fb79de248cd3b2945ca4aded3a4ff079a72ddeee7b9f599934c4f0ff2f71db6284f6
 EBUILD xz-utils-5.4.7.ebuild 3924 BLAKE2B 664e833cf0da6953a1571e9843ec80870f00ba62b0f5a43342adaafa26e8ce91e377a169256927f5e553b9176cb5cd2f87784a4ef9acb9ac8f3bb5d2a26a5189 SHA512 7c18e7a278e5f316ae9b8fdc9116a167ae970bb8d52cfe4809a0218bfc2f0a1469546f037728cf3a21eb9e6869a583ad997a8dae19db65a22595abcc0826954e
-EBUILD xz-utils-5.6.2.ebuild 5274 BLAKE2B b19bccf0d7615f4883fd3544a18c6e8e5cbb7b9f4cda3e4fc76e41fb41ad3d792b6827f0f6fee4be2248be00336a4e426297fbf124a2e9f44124a72b771339ff SHA512 79918316ce580a502d5e547697db28d328917c8a0a3156ddf0eb0011a828e0a29ba40c41209e688927654ac2eb1c356bf179fee3819752de066a678f7208d84b
-EBUILD xz-utils-9999.ebuild 5274 BLAKE2B b19bccf0d7615f4883fd3544a18c6e8e5cbb7b9f4cda3e4fc76e41fb41ad3d792b6827f0f6fee4be2248be00336a4e426297fbf124a2e9f44124a72b771339ff SHA512 79918316ce580a502d5e547697db28d328917c8a0a3156ddf0eb0011a828e0a29ba40c41209e688927654ac2eb1c356bf179fee3819752de066a678f7208d84b
+EBUILD xz-utils-5.6.2.ebuild 5295 BLAKE2B 3379a08a62468ecb3ca9155192b6566f7ecbd91a943bd8f21304810558be2d352ed57847dd4b8cb3a2cc6f84b0cddb81cdd326d2712c3a8dab24c04eb5b16020 SHA512 61cb9451724c079eff85100b80f50fed53af002a60de717e0374f3420d5a043bfb997c1dc3ffb2a3fe849affb7b8fde20ebe49349075d65441fb9fe17db06de2
+EBUILD xz-utils-9999.ebuild 5295 BLAKE2B 3379a08a62468ecb3ca9155192b6566f7ecbd91a943bd8f21304810558be2d352ed57847dd4b8cb3a2cc6f84b0cddb81cdd326d2712c3a8dab24c04eb5b16020 SHA512 61cb9451724c079eff85100b80f50fed53af002a60de717e0374f3420d5a043bfb997c1dc3ffb2a3fe849affb7b8fde20ebe49349075d65441fb9fe17db06de2
 MISC metadata.xml 748 BLAKE2B fe48d0e6b5aac2c843670597f0daa0202af709c27fe81889da8e4ef6877e35b30009b72831bc737b1078954b6494b508fa1b59305fdaf795db8801d20d9a0638 SHA512 6e64f0053489389818430808acb32cc1d3b33013978adf4952fbf57ab555e0710a106623ac1eb67405f1dd91c33397c5c70bddc9c5015878f280266b29b4e189
diff --git a/app-arch/xz-utils/xz-utils-5.6.2.ebuild b/app-arch/xz-utils/xz-utils-5.6.2.ebuild
index 1a3ca64e6cc2..a5c27989d3cc 100644
--- a/app-arch/xz-utils/xz-utils-5.6.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.6.2.ebuild
@@ -116,10 +116,14 @@ multilib_src_compile() {
 	if use pgo ; then
 		emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check
 
-		local tar_pgo_args=(
-			--mtime=@2718281828
-		)
-		has_version -b "app-alternatives/tar[gnu]" && tar_pgo_args+=( --sort=name )
+		local tar_pgo_args=()
+
+		if has_version -b "app-alternatives/tar[gnu]" ; then
+			tar_pgo_args+=(
+				--mtime=@2718281828
+				--sort=name
+			)
+		fi
 
 		if multilib_is_native_abi ; then
 			(
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index 1a3ca64e6cc2..a5c27989d3cc 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -116,10 +116,14 @@ multilib_src_compile() {
 	if use pgo ; then
 		emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check
 
-		local tar_pgo_args=(
-			--mtime=@2718281828
-		)
-		has_version -b "app-alternatives/tar[gnu]" && tar_pgo_args+=( --sort=name )
+		local tar_pgo_args=()
+
+		if has_version -b "app-alternatives/tar[gnu]" ; then
+			tar_pgo_args+=(
+				--mtime=@2718281828
+				--sort=name
+			)
+		fi
 
 		if multilib_is_native_abi ; then
 			(
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index d7e97d8f4499..951c6520a9de 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 fb37924153b5..f027f28853d4 100644
--- a/app-dicts/myspell-en/Manifest
+++ b/app-dicts/myspell-en/Manifest
@@ -2,8 +2,10 @@ DIST dict-en-20230701_lo.oxt 6102145 BLAKE2B ecf95d76415317fb3dbe4c8e2d30fa37f9d
 DIST dict-en-20230901_lo.oxt 6102109 BLAKE2B d90bb0614217103ad0d4fb4bd411028925311c372047cd88d3075d8480ca1f7d10fa73b3099eea01e06edf22cd85e4cb7aee0e92da89e3e4887a2433ab10bbcb SHA512 76afc82b6d32e1204d36f1fdd602fd4a073b096f49676faab8edd1ab3322f305a4549d07c9e6740463ac4130948dc008181d741d6ebc110bdb87ff1465f03ba2
 DIST dict-en-20240101_lo.oxt 6105115 BLAKE2B 8d81a60fe73adc4b12b0023915aa131eeaf6bbd33f816b05dcb5d0ad40c7806f35c724be1b380904ed62c50c2f3c71925981fdc7bd653f155d7da11383e2ed1e SHA512 cbb6dec8486df96678e0c6c75297645af2455a41194c5232e71ac7a0edcbf2b15115985958529427c57b82a41ca853af86fa4baffbdc8ea50d23f9f48c868940
 DIST dict-en-20240201_lo.oxt 6105836 BLAKE2B 2978b36dfea07570b8be255c021e8f6cf9113f3ea342db0cc25d52e58a406f75015fdc5961556594756fde30293c21bcbf17c00b49e962e5a4f558be3f17b42c SHA512 92098925935ec23a3058db4a136e37f6dc3c24f0901de45bfd84e19efb5c3b207bb06e902368fd00c0851003b2e385719d850b3cced15e3d4a2b2d5143b5eafc
+DIST dict-en-20240501_lo.oxt 6107426 BLAKE2B 811ca6f8a82f348c391b8b4df832446a8d248ec9b6ec85a9c1320f7329679e4fa6d3d507d18d3d792d878fc6f369b70135fa25a75c86b858333e370816db5761 SHA512 3d4ae13c4d68a62970742bb7e8568bebf03cbfaa04051b2152197f2d2a9fb539642a6ff6032123716c31e5f340bd2bad428983f79a7d8c6679e9da48f272e65c
 EBUILD myspell-en-20230701.ebuild 1527 BLAKE2B 23f74ecca10154abce30811601e81395efe814965acc968ee6127b72af5c59fdc77eaaf7e28749d0ecca2173a245a3ad21d3a1a8755b3bbd32663672dbdb93e8 SHA512 ed19efe5312db774c0fc337db589eac7f8fe378607b95aab951620b8552fc5b9c75cc58c17d2a227fbcd267788517cee67026f2612c4bb77f04f5d250eed1279
 EBUILD myspell-en-20230901.ebuild 1527 BLAKE2B dee4562a80cd192291c251fb7935d51b2624a305426338fffb50b7964c396c1782b91e51066d0d0e0724d2b0f96a818c0edafe9d41dc2099d7d0f3f8feefe019 SHA512 6b2bcb91e74d2116604ad5d13b227ee26fa2c0e3762fa3e502bbbc182466675f44f9a6dd8a5a5b21a8f45acb0a5574822718c980ef57561ebfe0326ff564f523
 EBUILD myspell-en-20240101.ebuild 1534 BLAKE2B d53459be89b99b6a7616b29626fa2a5f0b0e06cccea113b824f5cc553a66b038f5b4901aedfcb5ae1837c8591fb1281c0c32e7b97701168ab846ce1d3484ff01 SHA512 70cc60c76573cd0eda97f54c3862158c7bcfcb1ce16c7e3166e002ae666361369f0aea269f08232db038ba6ebcf07a1c5cb777348d4974d701e99942ca2ff153
 EBUILD myspell-en-20240201.ebuild 1527 BLAKE2B 7117c4c52e3b4f00f2c2b9facc1c48e33ff84447cd69b30f07e1cd1cd02ea7fb8bcb2a13e2ef36275916a7f9617a465c00b17abf222b83ae6732bc2080a57d58 SHA512 a16729cee7711a1a9949be3f17beb386a43787b6f1d3404245702462023ec165076e3766f9ee35e4edcb820c5ac33ed822f42513dfde67fc1bbd1164209a1fb3
+EBUILD myspell-en-20240501.ebuild 1534 BLAKE2B 99a96cb7cbe7c841a055fd070f5305e0317b6f6ccadf91986fd0c6ca1ab532a70c1dde4169961d0a49d6af8e866ff2839a99b92e55e6706ae8b53ef490e367cb SHA512 481d04acbebdfcd1d2f0481c848df8db2ebb4608fcaa8142b20d8a7819adbbfc30920cad5f9e7be2ad36b5a4d951acb815835c047f567c8aaee0c5f1a5e8b415
 MISC metadata.xml 289 BLAKE2B 3b19ce0204dedac8876e4a00fa12dd23cadca14d8b422165467e4da65edfb91e3bb924505016333bad4ed1cb2612db674bb857f1a3dc9e1033b53dcdf20cb164 SHA512 9147be5e8b62a3de0ee8aafc33c61132f9856b28653a390be9ee7a89e3057cf06cc0b53149f08c525a6f01b2fac91e8ba6d1ed89ea46e33d8c279e76c22bec54
diff --git a/app-dicts/myspell-en/myspell-en-20240501.ebuild b/app-dicts/myspell-en/myspell-en-20240501.ebuild
new file mode 100644
index 000000000000..a09614bf817d
--- /dev/null
+++ b/app-dicts/myspell-en/myspell-en-20240501.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit myspell-r2
+
+DESCRIPTION="English dictionaries for myspell/hunspell"
+HOMEPAGE="
+	https://extensions.libreoffice.org/extensions/english-dictionaries
+	https://proofingtoolgui.org
+	https://github.com/marcoagpinto/aoo-mozilla-en-dict
+"
+SRC_URI="https://extensions.libreoffice.org/assets/downloads/41/1714540032/dict-en-20240501_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"
+
+PLOCALES=( "en-AU" "en-CA" "en-GB" "en-US" "en-ZA" )
+IUSE+="+l10n_en ${PLOCALES[@]/#/l10n_}"
+REQUIRED_USE="|| ( l10n_en ${PLOCALES[@]/#/l10n_} )"
+
+src_prepare() {
+	if use l10n_en-GB || use l10n_en; then
+		MYSPELL_HYPH+=( "hyph_en_GB.dic" )
+	fi
+	if use l10n_en-US || use l10n_en; then
+		MYSPELL_THES+=(
+			"th_en_US_v2.dat"
+			"th_en_US_v2.idx"
+		)
+		MYSPELL_HYPH+=( "hyph_en_US.dic" )
+	fi
+
+	MYSPELL_DICT=( )
+	for lang in "${PLOCALES[@]}"; do
+		if [[ "${lang}" == "en" ]]; then
+			continue
+		fi
+		local mylinguas="${lang//-/_}"
+		if use "l10n_${lang}" || use l10n_en; then
+			MYSPELL_DICT+=( "${mylinguas}.aff" "${mylinguas}.dic" )
+		else
+			rm "README_${mylinguas}.txt" || die
+			if [[ ${lang} == "en-US" ]]; then
+				rm "README_hyph_en_US.txt" || die
+			fi
+			if [[ ${lang} == "en-GB" ]]; then
+				rm "README_hyph_en_GB.txt" || die
+				rm "README_en_GB_thes.txt" || die
+			fi
+		fi
+	done
+
+	default
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 1ebe94163e44..3de38109d76e 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest
index 1c3ebab946cd..f7067b1c1b54 100644
--- a/app-editors/vis/Manifest
+++ b/app-editors/vis/Manifest
@@ -1,5 +1,8 @@
 DIST vis-0.8.tar.gz 404496 BLAKE2B eafb7098a6c8e0d8f277be66984d5fd298ac86d524a4219a7d7730599157ca68c040615622cd1680b101e1cd003eba03343496762d0d4dc2766a079116f21eea SHA512 ab4eda075034955411bdbc0ade2fe9149a48c644fa2f70add8d3b9d749f86b98a4e429745b5cae7fdbc0a1e07c8587539a055cd1c6734bb59e43c580c949e0aa
+DIST vis-0.9.tar.gz 456713 BLAKE2B 3e812e054c8d7f88e8866882500fb107cfaccd4f2680dd3ff3f68820bf4c76495dcc591e78916d0faef8390eb23cc14ead7ba4e35d2068bfc04964ad46acb3ce SHA512 64025569f6feb1a3b5aa8aaa79af319cdf8fc1fd5d1f5b29a6838ff00ea950cade1efb366d0a95d77e516f5605048bcb557fd7aa52b3a9510a15e69acaee147c
 DIST vis-test-0.5.tar.gz 99314 BLAKE2B 988d7e93d0f3c58d2fc8fbe9293049c6a3cc44dfcbfbd4f42f7992815cf33a604340b59171dcd880f7180ae56e3f73f46684b7aacd96438480db6c4592851f2c SHA512 c41b40f23a45a7ebd9c16aa853d9c3b517767cb88ff8dc268da44276a02aa8c77de0fc6aa243a1e4cdfbc27182870b82d0b9bc892bb87ea74d5275d76c554ed1
+DIST vis-test-783b7ef67aa360f0b9bd44fa5ea47e644bc49d69.tar.gz 102134 BLAKE2B c9c32cd7c01027853810b18eb418173d3e04947039bb5c103607602838a143bbff52754dcf806c35bb247c8c6be8b8bf86c3a73daa13a54894df525e6f2c0905 SHA512 dd86561e1eaf196c5b2d27e628eaababa721d26f7fab623ef7dd41e0d30352f5f9eb0e5006cdb1a896c5888304ea40f7fd291f3789d312a201403990bfbaf824
 EBUILD vis-0.8-r1.ebuild 2467 BLAKE2B 3aafb010f214b74cbbcad32c98ca2f0bf188b966ef9bc7f596dd1c603eff3dde9f64893b9d17e8e100657d8c1ae44d51feeef072e4869d5cf09a31eca47bb468 SHA512 aa24f0845370483d0f80102733cfbfad64a1a3ab27642156038cdf0be0042352f87350637e5217f211ec7b050a40d45ff051089defef787036bf79fb5d831682
-EBUILD vis-9999.ebuild 2463 BLAKE2B 410b8cc3c72f083f2be43066c865f148e09d4e408ba9529dcb43180c887e529319786352b4a6febe28e55161d3adc3e9591abe40fa278a8ac56b4feed7fc3bd4 SHA512 6ed6299d132d75a1542649be5a4c2186aabad379c0a7faa61ba985bdc89b2a81ce030f4ae0e3c5ad76f83784304d70b30f7756e2bc28f25ee73c272b2458f7f6
+EBUILD vis-0.9.ebuild 2265 BLAKE2B 5c439ce2ef4ccccbaa5db249f06529715d686d31c928fe5f9ad5458e1817da15af3a14d2f7733bf37311a3590948dd37b8b1f0010a1e85c48495f197c833e057 SHA512 c81e5c32de8cad8c3fd5c7e1627b1510143a0895291e376a5af988abe012f331df0211297aeac70e56d19b7905f5fd1c2c0cc5a358f35fc1e7d400be2b0ac331
+EBUILD vis-9999.ebuild 2258 BLAKE2B 37d676f4921d940896c38a537ee64d2d46bae7d6d3311bc384fd32e7468d2e077aefe5aa3612b87e9fb839210d2fe749560c268383781857763cb081f753ee05 SHA512 d39a7e787381bf8641c202c2a4f70f55fc387fa7676f64fb23035c14c56d462be07c023f9d277547817540579e5d8605e8c58ffb9414c9599d4b1726942d48b9
 MISC metadata.xml 698 BLAKE2B d09b6b1784d0845c80f097b0a3d27ed58a6ff4193c424ee856e1ec815aedecac8a480507e17046d4145cd0e20213b2165a8986c54bd4b3614f7cb30136e37508 SHA512 16134efe8760a57af6fcdd8adc93173d2a65e3f88d7b701b12a691b9899aaee341716fe29e2d7a89f3dc48ef127c736e63df7bdd586363023ce6a00f048f8864
diff --git a/app-editors/vis/vis-0.9.ebuild b/app-editors/vis/vis-0.9.ebuild
new file mode 100644
index 000000000000..dba3a4d7c4fb
--- /dev/null
+++ b/app-editors/vis/vis-0.9.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VIS_TEST_COMMIT="783b7ef67aa360f0b9bd44fa5ea47e644bc49d69"
+LUA_COMPAT=( lua5-2 lua5-3 lua5-4 )
+
+inherit lua-single
+
+if [ "${PV}" == "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/martanne/vis.git"
+else
+	SRC_URI="
+		https://github.com/martanne/vis/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		test? ( https://github.com/martanne/vis-test/archive/${VIS_TEST_COMMIT}.tar.gz -> vis-test-${VIS_TEST_COMMIT}.tar.gz )
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor"
+HOMEPAGE="https://github.com/martanne/vis"
+LICENSE="ISC MIT"
+SLOT="0"
+IUSE="+ncurses +lua selinux test tre"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# - Known to also work with NetBSD curses
+DEPEND="
+	dev-libs/libtermkey
+	sys-apps/acl
+	ncurses? ( sys-libs/ncurses:0= )
+	lua? ( ${LUA_DEPS} )
+	tre? ( dev-libs/tre )
+"
+RDEPEND="
+	${DEPEND}
+	app-eselect/eselect-vi
+	lua? (
+		$(lua_gen_cond_dep 'dev-lua/lpeg[${LUA_USEDEP}]')
+	)
+"
+# lpeg: https://github.com/martanne/vis-test/issues/28
+BDEPEND="test? (
+	$(lua_gen_cond_dep 'dev-lua/lpeg[${LUA_USEDEP}]')
+	$(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
+)"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	if use test; then
+		if [ ! "${PV}" == "9999" ]; then
+			rm -r test || die
+			mv "${WORKDIR}/vis-test-${VIS_TEST_COMMIT}" test || die
+		fi
+
+		# https://github.com/martanne/vis-test/issues/27 a Werror clone
+		sed -i 's;|| strstr(output, "warning");;' test/core/ccan-config.c || die
+	fi
+
+	sed -i 's|STRIP?=.*|STRIP=true|' Makefile || die
+	sed -i 's|${DOCPREFIX}/vis|${DOCPREFIX}|' Makefile || die
+	sed -i 's|DOCUMENTATION = LICENSE|DOCUMENTATION =|' Makefile || die
+
+	default
+}
+
+src_configure() {
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--disable-lpeg-static \
+		$(use_enable lua) \
+		$(use_enable ncurses curses) \
+		$(use_enable selinux) \
+		$(use_enable tre) || die
+}
+
+update_symlinks() {
+	einfo "Calling eselect vi update --if-unset"
+	eselect vi update --if-unset
+}
+
+pkg_postrm() {
+	update_symlinks
+}
+
+pkg_postinst() {
+	update_symlinks
+}
diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild
index 09bd443398c8..7887e2ae1f55 100644
--- a/app-editors/vis/vis-9999.ebuild
+++ b/app-editors/vis/vis-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-MY_PTV=0.5
+VIS_TEST_COMMIT="783b7ef67aa360f0b9bd44fa5ea47e644bc49d69"
 LUA_COMPAT=( lua5-2 lua5-3 lua5-4 )
 
 inherit lua-single
@@ -12,8 +12,10 @@ if [ "${PV}" == "9999" ]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/martanne/vis.git"
 else
-	SRC_URI="https://github.com/martanne/vis/releases/download/v${PV}/${P}.tar.gz
-		test? ( https://github.com/martanne/vis-test/releases/download/v${MY_PTV}/vis-test-${MY_PTV}.tar.gz )"
+	SRC_URI="
+		https://github.com/martanne/vis/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		test? ( https://github.com/martanne/vis-test/archive/${VIS_TEST_COMMIT}.tar.gz -> vis-test-${VIS_TEST_COMMIT}.tar.gz )
+	"
 	KEYWORDS="~amd64 ~arm ~riscv ~x86"
 fi
 
@@ -26,12 +28,15 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
 # - Known to also work with NetBSD curses
-DEPEND="dev-libs/libtermkey
+DEPEND="
+	dev-libs/libtermkey
 	sys-apps/acl
 	ncurses? ( sys-libs/ncurses:0= )
 	lua? ( ${LUA_DEPS} )
-	tre? ( dev-libs/tre )"
-RDEPEND="${DEPEND}
+	tre? ( dev-libs/tre )
+"
+RDEPEND="
+	${DEPEND}
 	app-eselect/eselect-vi
 	lua? (
 		$(lua_gen_cond_dep 'dev-lua/lpeg[${LUA_USEDEP}]')
@@ -51,15 +56,9 @@ src_prepare() {
 	if use test; then
 		if [ ! "${PV}" == "9999" ]; then
 			rm -r test || die
-			mv "${WORKDIR}/vis-test-${MY_PTV}" test || die
+			mv "${WORKDIR}/vis-test-${VIS_TEST_COMMIT}" test || die
 		fi
 
-		# https://bugs.gentoo.org/722014 https://github.com/martanne/vis-test/pull/22
-		sed -i 's;./ccan-config > config.h;./ccan-config "${CC}" ${CFLAGS} > config.h;' test/core/Makefile || die
-
-		# https://github.com/martanne/vis-test/pull/29
-		sed -i 's;cpp -P;${CPP:-cpp} -P;' test/vim/test.sh || die
-
 		# https://github.com/martanne/vis-test/issues/27 a Werror clone
 		sed -i 's;|| strstr(output, "warning");;' test/core/ccan-config.c || die
 	fi
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index a3959ba9898d..8d8634c8e9c4 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index 4ff41bc3330b..672896692057 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -4,17 +4,6 @@ AUX qemu-ga-systemd.udev 130 BLAKE2B 3bd450476eb4e7b31e3c21a231b83219def32481110
 AUX qemu-ga.conf-r1 452 BLAKE2B 546799fefad91644acc0cee1e5c3f4adfb3f12cf48831a6138bf23aaf9a7b36604a651107236f9cb08fb44b3a055b5bc01b34243dadd6dc6dde8c0478bdaa38f SHA512 c339ddad3e94e1cd009d9f6819b7fbaddda0c8d5ad7736704cdf8efd0f802df9b905c3529ecd2a1e5831bc8e9e6e7be94ac816097f97c92deb6a3816328dba39
 AUX qemu-ga.init-r1 624 BLAKE2B 79416a272a89349e4174a4238fc7763fc1f116c7c4a2e7c4d41ba2bb8d0a41a2db1abb2053e307a257519af3163e3d603280d45f20e259ec1a1a9b090a9891fd SHA512 820ae4b04b9eeb2c8ac6128544f764af67b4462cc98377ceb37708130a5cae118bd3ed892a945fb25234a8d73fb98e60dbf5da3a44861fc56f97b66a3f12532e
 AUX qemu-ga.logrotate 128 BLAKE2B 99035fefeccc6334c0cd5ae16e8550a07cfe4256d2374a0679a90805919aa4b7afac4f1d0c3bac72fcc5c7c0e0d87b227be8b1697338b827c890c56be77b07db SHA512 0fb39dd7ee528b36d8e837fbc53ba69476ba83947a4df10a9df03a02861a37d21f53865adbd3050c24aad72ec8a8bee1fb33f7382213d855884aff109f3c3789
-AUX qemu-guest-agent-7.1.0-configure-Avoid-using-strings-binary.patch 2707 BLAKE2B 56a98b8375bdc1ad636044e894a126c1704c27986a74b9088e14fa0e4c672c70d593a265da4efc0e43055d65b447e6adc2b1f03f6186a68ec03ad4b1fe747547 SHA512 6efe0228988bf5d23ad7a60531815b9f5c77886fc26ff65bccf33a0f19b9d6d6993b63327de2630fa802abb0c824b30646871d4cc25d48ee3c492d8b4992f42f
-DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 7746329d3e13782b7c346ce4052cc517cfc65cd9b2d514d199e4d5b8570ca79566ec04b0c114db2e97c84e68eb551e0d4cdce1b14b91a88fe08d2a5f682c1418 SHA512 ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4
-DIST qemu-7.1.0.tar.xz 121833004 BLAKE2B e05f91ce4993c7591a2df08b5fb017f8b8ec2141ab7bfd55d14730ea6b793ac1091de539992058392a5522d4e58beee92a87752707be58e3619b8213ef9f35bf SHA512 c60c5ff8ec99b7552e485768908920658fdd8035ff7a6fa370fb6881957dc8b7e5f18ff1a8f49bd6aa22909ede2a7c084986d8244f12074ccd33ebe40a0c411f
-DIST qemu-8.0.0.tar.xz 127835148 BLAKE2B 9b54aae10fe09691a26e68374723ded5fdda6409673b4de9461a25ee060cfd03968a16ddeadc21d48b9262e53aa6d4e5eb645376969f97c65807fad19607b04f SHA512 1f31d1e653dec2d35f1b7a5468ee3f471553b48eca8c8afafffcf9243c6b2260e78a5b73da3fe567f9b85d4133573eebd397747b3aec501fb24076263eb07b27
-DIST qemu-8.0.2.tar.xz 126707132 BLAKE2B f2b1a63e10c42aabfe39722c7732d0f04818ad367b769b3deb29c5bf9adcabc3aca1706f3c40fafeeb57ac1f7a61ded5066de32134c483e2fd27bc65b4b7d30a SHA512 4e915d33a662bf55b09247fb85150be376c92270d3764e3d6470c452cb70cc558f54e84de5610dd60a9eb3ea02d5d4277b1ec75c9804967d278fa8361c7f9b9a
-DIST qemu-8.0.3.tar.xz 126710536 BLAKE2B 071cc1a35209a02e8c5dd4f43cb112f110b4655adb0f870a04fdf9a6e2c761699574e8c9426f70f60787a99acf252d7a64d94a8e837cdfeda93d89428d7866f3 SHA512 18b2ccb65f7ec2ae92f0e04406539620c881e2b75f63816588c86043a07464bb99d16a83e792ed9508de393f4b694c46d52f4d07edf52741e85224c8b8d5d5c3
 DIST qemu-8.2.0.tar.xz 130008888 BLAKE2B a63667042e1e19c635568072d8dcc117320117e81e374a93cfb79e2363ebf505df3217fb098638e53c899eb6f83435221e8031f2aae003c27ec25af8654683b3 SHA512 92ec41196ff145cdbb98948f6b6e43214fa4b4419554a8a1927fb4527080c8212ccb703e184baf8ee0bdfa50ad7a84689e8f5a69eba1bd7bbbdfd69e3b91256c
-EBUILD qemu-guest-agent-6.0.0.ebuild 1674 BLAKE2B ad81005cee9c80175b2b2b1c0bad0138fc5f22428e9568df133c46ebf5ad27f53dc97161a1e88f37bde5b29874870173dd5813102745a31ef6367203a1024975 SHA512 7ce6fdd8a583059ed7cab97c5baba5e402e01019e05b16511afe89674d5a9fc06fc840c8b253bbf015beaa69ff65a9b557131bd1ce42af86f6b82e1ae282ad9d
-EBUILD qemu-guest-agent-7.1.0.ebuild 1762 BLAKE2B 0a87ea22d6d01dbbe283b95e1b602282d378679c9b9c4a2e7b6e86e21fcc5490264531b1988f1dac0846a2eb2037e8bb722284590e03f5d10d14d47792316b6c SHA512 5edc05685fce00571099c3e0e0725d039e724fa716f7f37bd407019ba78f148b5629487a0fe239e6388e656c2b9b27637b32cf60e8f88f3ca2d22f976fcecc9f
-EBUILD qemu-guest-agent-8.0.0.ebuild 1692 BLAKE2B 532b0091aa62e1aa1001ca1b2711654926208e27c20b3a3d32c4a416c7f174fced871445e9314fa08011e30d9bf1630d8a32a659dc57d2633cbbc2811592a17f SHA512 0f466650cc3551c199f1d66cbf0b85e8ff5f59f3a59cdd4814f367e13c7bb67f21b5b4615b8f18dd8e9be7a958c8fe4b72814d3a05ecf3d91eb33ca6992badde
-EBUILD qemu-guest-agent-8.0.2.ebuild 1694 BLAKE2B f6d8b5dc02434de24cf7bb3ba4ed66db623f911202b6341528d92f4b37415965beaccac21b97d427e73c1bf91f1623a651b64bca3529251d218b9d55d9349f93 SHA512 c96dd712b1693c6db2e9602fedb4da9833c7e47abe79d25e8b7e9871c88de0f0a3d38db92238265038eeac0cb544aac2c81bf29ec4a3aa6c40a68039bdfb04cb
-EBUILD qemu-guest-agent-8.0.3.ebuild 1721 BLAKE2B 3404b4e71345caf4b6ef1737dabfc060a139bce7c65379476a154cc15d8a9c5d861ed8c7eee4702b8228de2dbad7ec528cbd406752ed5a990d405da44806fa78 SHA512 e07bf60e0d4d0370abbc1c7227759e46f99c0fc7dab6a7647f6ca3abbf483e76e2a965e7461701a94416d265d1f0b6e168b00ebeb1b9bba900b125f2e186f7c7
-EBUILD qemu-guest-agent-8.2.0.ebuild 2050 BLAKE2B 83c1d2be1d0210d84a378d011e00cf0a350304979f849d792b228e42451cf72f0a162ea84d3a11c788cacf1779a50708f5dada298e107319bdbd7469f0eb29eb SHA512 c350c1d5920f14d26e9489fb6b86a3cc56ad8b5a89965359908406cd724562ec4d91684110eb41510443e633a148e47c5713495e81644fc30c0777d9247fc752
+EBUILD qemu-guest-agent-8.2.0.ebuild 2053 BLAKE2B 4474e50a807f1e4e4b5c8f38a1ea5e79f7a2341d05f1cb3b330e9404b34521044338e0f0bf03017a3c1d8fb3be1abd183575388cf6b712364261133f79d3e3bf SHA512 82c4e6f1734c1fa331b6e6eb935daa9679e1dc9c858f516d2dd356fe1763f8ffbee805e0c52b1b76914714758996f576dfa0711216ceb38b3f2aabb99cdb6036
 MISC metadata.xml 588 BLAKE2B 32aa23e19bdc88885534d8b58c9ad1aeabbcb94b4deb064c8cb10c72bc57999a677c8cdf9dd0fd389bd64a9b1a5dc379a20235a191e58f67ea671b5a7b92a1a8 SHA512 aee2dc28a40e0a68196eb4cff9450e6bc940565ee37d4405690e943c63ca9c05b66dcd6af69dbbdd6274cd4ac1c1b833ff15af4f3071ed0a2cd07358ac985866
diff --git a/app-emulation/qemu-guest-agent/files/qemu-guest-agent-7.1.0-configure-Avoid-using-strings-binary.patch b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-7.1.0-configure-Avoid-using-strings-binary.patch
deleted file mode 100644
index dff62304a5c7..000000000000
--- a/app-emulation/qemu-guest-agent/files/qemu-guest-agent-7.1.0-configure-Avoid-using-strings-binary.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 33ab5f24913db8d5590fe4155829bd38e7902506 Mon Sep 17 00:00:00 2001
-Message-Id: <33ab5f24913db8d5590fe4155829bd38e7902506.1666164897.git.mprivozn@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 14 Oct 2022 09:30:15 +0200
-Subject: [PATCH] configure: Avoid using strings binary
-
-When determining the endiandness of the target architecture we're
-building for a small program is compiled, which in an obfuscated
-way declares two strings. Then, we look which string is in
-correct order (using strings binary) and deduct the endiandness.
-But using the strings binary is problematic, because it's part of
-toolchain (strings is just a symlink to
-x86_64-pc-linux-gnu-strings or llvm-strings). And when
-(cross-)compiling, it requires users to set the symlink to the
-correct toolchain.
-
-Fortunately, we have a better alternative anyways. We can mimic
-what compiler.h is already doing: comparing __BYTE_ORDER__
-against values for little/big endiandness.
-
-Bug: https://bugs.gentoo.org/876933
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <d6d9c7043cfe6d976d96694f2b4ecf85cf3206f1.1665732504.git.mprivozn@redhat.com>
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
----
- configure | 35 ++++++++++++++++++-----------------
- 1 file changed, 18 insertions(+), 17 deletions(-)
-
-diff --git a/configure b/configure
-index f9ec050bf8..81561be7c1 100755
---- a/configure
-+++ b/configure
-@@ -1423,30 +1423,31 @@ if test "$tcg" = "enabled"; then
-     git_submodules="$git_submodules tests/fp/berkeley-softfloat-3"
- fi
- 
--# ---
-+##########################################
- # big/little endian test
- cat > $TMPC << EOF
--#include <stdio.h>
--short big_endian[] = { 0x4269, 0x4765, 0x4e64, 0x4961, 0x4e00, 0, };
--short little_endian[] = { 0x694c, 0x7454, 0x654c, 0x6e45, 0x6944, 0x6e41, 0, };
--int main(int argc, char *argv[])
--{
--    return printf("%s %s\n", (char *)big_endian, (char *)little_endian);
--}
-+#if defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-+# error LITTLE
-+#endif
-+int main(void) { return 0; }
- EOF
- 
--if compile_prog ; then
--    if strings -a $TMPE | grep -q BiGeNdIaN ; then
--        bigendian="yes"
--    elif strings -a $TMPE | grep -q LiTtLeEnDiAn ; then
--        bigendian="no"
--    else
--        echo big/little test failed
--        exit 1
--    fi
-+if ! compile_prog ; then
-+  bigendian="no"
- else
-+  cat > $TMPC << EOF
-+#if defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-+# error BIG
-+#endif
-+int main(void) { return 0; }
-+EOF
-+
-+  if ! compile_prog ; then
-+    bigendian="yes"
-+  else
-     echo big/little test failed
-     exit 1
-+  fi
- fi
- 
- ##########################################
--- 
-2.37.3
-
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild
deleted file mode 100644
index e1c778871839..000000000000
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit systemd toolchain-funcs udev python-any-r1
-
-MY_PN="qemu"
-MY_P="${MY_PN}-${PV}"
-
-SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
-HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/glib"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	tc-export AR LD OBJCOPY RANLIB
-
-	local myconf=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--libdir="/usr/$(get_libdir)"
-		--localstatedir=/
-		--disable-bsd-user
-		--disable-linux-user
-		--disable-system
-		--disable-strip
-		--enable-tools
-		--disable-werror
-		--enable-guest-agent
-		--python="${PYTHON}"
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--host-cc="$(tc-getBUILD_CC)"
-	)
-	echo "./configure ${myconf[*]}"
-	./configure "${myconf[@]}" || die
-}
-
-src_install() {
-	dobin build/qga/qemu-ga
-
-	# Normal init stuff
-	newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
-	newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
-
-	# systemd stuff
-	udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
-
-	systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
-		qemu-guest-agent.service
-}
-
-pkg_postinst() {
-	elog "You should add 'qemu-guest-agent' to the default runlevel."
-	elog "e.g. rc-update add qemu-guest-agent default"
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild
deleted file mode 100644
index 89b3517badc9..000000000000
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit edo systemd toolchain-funcs python-any-r1 udev
-
-MY_PN="qemu"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
-HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
-SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-RDEPEND="dev-libs/glib"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	dev-lang/perl
-	app-alternatives/ninja"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.1.0-configure-Avoid-using-strings-binary.patch
-)
-
-src_configure() {
-	tc-export AR LD OBJCOPY RANLIB
-
-	local myconf=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--libdir="/usr/$(get_libdir)"
-		--localstatedir=/
-		--disable-bsd-user
-		--disable-linux-user
-		--disable-system
-		--disable-strip
-		--enable-tools
-		--disable-werror
-		--enable-guest-agent
-		--python="${PYTHON}"
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--host-cc="$(tc-getBUILD_CC)"
-	)
-
-	edo ./configure "${myconf[@]}"
-}
-
-src_install() {
-	dobin build/qga/qemu-ga
-
-	# Normal init stuff
-	newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
-	newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
-
-	# systemd stuff
-	udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
-
-	systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
-		qemu-guest-agent.service
-}
-
-pkg_postinst() {
-	elog "You should add 'qemu-guest-agent' to the default runlevel."
-	elog "e.g. rc-update add qemu-guest-agent default"
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.0.ebuild
deleted file mode 100644
index 4b64963e345a..000000000000
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit edo systemd toolchain-funcs python-any-r1 udev
-
-MY_PN="qemu"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
-HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
-SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-RDEPEND="dev-libs/glib"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	dev-lang/perl
-	app-alternatives/ninja"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-)
-
-src_configure() {
-	tc-export AR LD OBJCOPY RANLIB
-
-	local myconf=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--libdir="/usr/$(get_libdir)"
-		--localstatedir=/
-		--disable-bsd-user
-		--disable-linux-user
-		--disable-system
-		--disable-strip
-		--enable-tools
-		--disable-werror
-		--enable-guest-agent
-		--python="${PYTHON}"
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--host-cc="$(tc-getBUILD_CC)"
-	)
-
-	edo ./configure "${myconf[@]}"
-}
-
-src_install() {
-	dobin build/qga/qemu-ga
-
-	# Normal init stuff
-	newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
-	newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
-
-	# systemd stuff
-	udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
-
-	systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
-		qemu-guest-agent.service
-}
-
-pkg_postinst() {
-	elog "You should add 'qemu-guest-agent' to the default runlevel."
-	elog "e.g. rc-update add qemu-guest-agent default"
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.2.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.2.ebuild
deleted file mode 100644
index cbca89288f83..000000000000
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit edo systemd toolchain-funcs python-any-r1 udev
-
-MY_PN="qemu"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
-HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
-SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="dev-libs/glib"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	dev-lang/perl
-	app-alternatives/ninja"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-)
-
-src_configure() {
-	tc-export AR LD OBJCOPY RANLIB
-
-	local myconf=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--libdir="/usr/$(get_libdir)"
-		--localstatedir=/
-		--disable-bsd-user
-		--disable-linux-user
-		--disable-system
-		--disable-strip
-		--enable-tools
-		--disable-werror
-		--enable-guest-agent
-		--python="${PYTHON}"
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--host-cc="$(tc-getBUILD_CC)"
-	)
-
-	edo ./configure "${myconf[@]}"
-}
-
-src_install() {
-	dobin build/qga/qemu-ga
-
-	# Normal init stuff
-	newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
-	newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
-
-	# systemd stuff
-	udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
-
-	systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
-		qemu-guest-agent.service
-}
-
-pkg_postinst() {
-	elog "You should add 'qemu-guest-agent' to the default runlevel."
-	elog "e.g. rc-update add qemu-guest-agent default"
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild
deleted file mode 100644
index 86f9742a3e18..000000000000
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit edo systemd toolchain-funcs python-any-r1 udev
-
-MY_PN="qemu"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
-HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
-SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-RDEPEND="dev-libs/glib"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	dev-lang/perl
-	app-alternatives/ninja"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-)
-
-src_configure() {
-	tc-export AR LD OBJCOPY RANLIB
-
-	local myconf=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--libdir="/usr/$(get_libdir)"
-		--localstatedir=/
-		--disable-bsd-user
-		--disable-linux-user
-		--disable-system
-		--disable-strip
-		--enable-tools
-		--disable-werror
-		--without-default-features
-		--enable-guest-agent
-		--python="${PYTHON}"
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--host-cc="$(tc-getBUILD_CC)"
-	)
-
-	edo ./configure "${myconf[@]}"
-}
-
-src_install() {
-	dobin build/qga/qemu-ga
-
-	# Normal init stuff
-	newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
-	newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
-
-	# systemd stuff
-	udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
-
-	systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
-		qemu-guest-agent.service
-}
-
-pkg_postinst() {
-	elog "You should add 'qemu-guest-agent' to the default runlevel."
-	elog "e.g. rc-update add qemu-guest-agent default"
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
index 3002f6df679d..8edae8bf7044 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit edo systemd toolchain-funcs python-any-r1 udev
 
@@ -13,6 +13,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
 HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
 SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
@@ -20,11 +21,11 @@ KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 
 RDEPEND="dev-libs/glib"
 DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
+BDEPEND="
+	${PYTHON_DEPS}
 	dev-lang/perl
-	app-alternatives/ninja"
-
-S="${WORKDIR}/${MY_P}"
+	app-alternatives/ninja
+"
 
 PATCHES=(
 	"${FILESDIR}"/qemu-8.1.0-find-sphinx.patch
diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest
index c33ff7e2ac92..e60b12851f18 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -4,14 +4,16 @@ AUX wine-proton-7.0.4-noexecstack.patch 223 BLAKE2B dff1867e2977bd14fcfab9dfa2c2
 AUX wine-proton-7.0.4-restore-menubuilder.patch 572 BLAKE2B 7ace97fb82498d8f19297cab205d8b9ca07c5293172a0b017b5d887ec1f5daeb3ed64eb0a322904e528a72f4a225813c27b544015587d71fce97c41b6b1463a2 SHA512 1384f06d4264e22d332eb12fabd7408b8e250e39c195460f876460fe40d35d617c73100815c395f481e3af66676ccaa1a14592c05f1e5b092bfafe2f87112106
 AUX wine-proton-7.0.4-unwind.patch 1694 BLAKE2B 954cb0a395c3b45afc7a3f39f33d34cf041b9cf5a6c77d0a217d296c4c8d1f6503322c4f77188c4729b98318913b9bc86d37b7573713643590550297a0ae372a SHA512 f958e811a4754614bc9e7223f727e2c581c18607dccf14c6d7014012ff29107bd850540a40ff7a62e7bae6b87ae1ac28fd104fbbaf9ce954bf3acb38ddbeb7df
 AUX wine-proton-7.0.6-mingw64-11.0.0.patch 849 BLAKE2B 26833ef532e7c5b8b0ae1442485c6c44f55a550c571942be2a894aada62ce87398973dfa5619f5a8d498b51479dda84eeae72803370539a7d28575a74310e173 SHA512 189bb20e8c399374567db308c2d3cf43a2b5e2d76b43970edaa3975c0c4ddb7fa245b9d05ed0f7a3452c8bf5264e743acff5a4830a94abd1c7df13664afc21e7
+AUX wine-proton-7.0.6-vulkan-libm.patch 429 BLAKE2B 437c37130a0bc64e135fe15f876d19f16afdb9586a12c3dd9010b8280333e880dd4125be32e42bd90a32349634daf9bee29d537280d83ebf6580f28f6b53e57b SHA512 12e331b39543b9fba089925ceee936e534612e625570cfe19653516cf95ebf9a2d99fc05373eafecd4ae4bbfc485c4aed9fba682f76219164117fd9f2879012f
 AUX wine-proton-8.0.1c-unwind.patch 1488 BLAKE2B 1a6d69484fb36f94f32d74679e809cfd7666363bede5dddedd2449e07251823b1ce86a717e06d342eec782aff501f27bc23433511c163da0b2a50c411df7ac53 SHA512 82ff0510fcab35471aa0db8f32f48cd62dbf78b3f5f36e3d191b86be55cb476df1ee689e5cd53c95d4f02199b5900eb0c8a45959693739a6c35e4c8b3cfa243f
 AUX wine-proton-8.0.4-restore-menubuilder.patch 382 BLAKE2B 04df3b2e495f49b4d66bc70a1198a3ab6c4dbb95c3ff145069b7086cf87de7233a1f5d6e56c861c0ff6f7e4b0869bb7ddf29a35ca9f32e47c05bf71fd0823ef3 SHA512 08bf5accb1ccf38519d5054c2d297da87aef0df5b5b5336d96e4b98a3af202ae8220c1e8cdf282c24b2706628e14a1afb7ff5f21f4a7a9f8e3f4f301f9e44c57
+AUX wine-proton-8.0.5c-vulkan-libm.patch 447 BLAKE2B 026b982714ce21ce6492d5e3b9932f2af4b8f1342fc47de045d86e596996dab11a3b73bf5090714dbc5c405345b8d1a08afc6a337ddb91e744ca83c980ad390f SHA512 46655d7c65975a11a585acf9112fcc56242b2a65917aa8dc9ad9515b2f5348ad3e8a9b72d53b38b1d51ae9b661f175f54dda8cd3f04a56de1d0a18a2c4d6136c
 AUX wine-proton-9.0-rpath.patch 356 BLAKE2B f988fefb9590d1c8735f480349172b7c7634256ef07bfe19bc5a7e04363d1832cc999d7c30b78dc5af2f4a1c9bfac1f4fa5458461b865864dc3bbdff4e9f71fa SHA512 f0de44022c856ed9b058e6c64146e464e375114d56bcc369a7e72df847a4de0ad31cbb06042df3f6836b681cd342b8a228cf514a51ed9796542a4d9ea42a03e6
 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5 SHA512 793bbe2b23042301a1b518717d78cfff01eaffa0388883d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
 DIST proton-wine-8.0-5c.tar.gz 48710071 BLAKE2B 99627baea6fb3d51231aa1e75a2734c3c1baba88326baf15b3d421d57a00472d25ba51c2140b51152c8aeae7dd240d3d77bb0d8835aa7eb3b745a51be120f8bb SHA512 0cf98d4e67866e55cc8cd5ea8da0d76aee8e37b130b3cbca604083c913e98ddf9038ecd6f9761d2e11443e282b372977400e251456c6d40e1365210c7578234d
 DIST proton-wine-9.0-1.tar.gz 49048661 BLAKE2B cf237c314e8b222bb36f52f316baae2351a30d22995d610c7977accc9588c474d0e598702000aa81b34fc2f3daeccd09f54ef53b7a2250c0b012ca47d69628eb SHA512 d7d3e4725a86ca120d059e5b8f9760bce45a5db0ae814cd76aa51dc361bb67af9c2834917ddad3858fc324a1d048acdd9942492c77d0f396aae7d537c70e3ca1
-EBUILD wine-proton-7.0.6.ebuild 12671 BLAKE2B 6e4c3f290f1527c69fe1aa0e0e2ce59d9856891f49799f4e5cadba7d604fa6d811d14395c31df51b2d2108131eab4b02f17f22797e6dc8bf4ecef1874192c1ba SHA512 4c7ca134ffce8afb634394b1b572eb5bcf8632240221144d7b30b01c4037b17315d3738c921233503b59b6303380d4dc41fa09e5d3ece55330d5076faef0cf49
-EBUILD wine-proton-8.0.5c.ebuild 13285 BLAKE2B fd6e353f7d4c2a629d180b102ea77f296161a1488c893e17b9eb6fd287f019190295162c6535cdffd67adbda28386a1a27371ae9eaab4cb007631ed54eecdd1d SHA512 53c6218381f2eb2ffdd6eb7aa6d0fd10de7a94c00ee44e19c9530775a07be3eeac961611791e4f1efd39cd17131bcac549d2bdf59281ff882df972269c59d567
-EBUILD wine-proton-9.0.1.ebuild 14186 BLAKE2B b121a3b9fca641ba5d7371336eadad93d48ce624d222654fea32872db744dc2e94300cbe6e38e7a3db5cc5ab1ee5ce27af58c087b642024230a1873ea2030b95 SHA512 0fb23ade559976daa0ca422904617a3a5dde6e7251b7c07716433536edba76eb35b691c0ef1b4878542481b8ef01fb4e11803644358b78dfe92de241a85a771c
-EBUILD wine-proton-9.0.9999.ebuild 14246 BLAKE2B d026a1ad6e7139f82428702bc088e04d437a12cd15da208049d525c52dc8de92df9403423e7376ae68f5fc641d7f3301074389a7ef25f8dcadf225d7af14d6a0 SHA512 f4b140ad1a63bb04b7bfcf4f695f4f3c4e4d90e6bd00ca7aa975e8423c79fb0640a307f8bad916d475551d3e2c3a24665a6417c584b3875a5ecacb3652e31801
+EBUILD wine-proton-7.0.6.ebuild 12716 BLAKE2B 0a8ce5cf58303c15c04e559a48efc84875cc993ab3fcc7412894fc8b85387d756bb1f6a4be49ab66f7cca2e911729d75dee274cf7f70a4589c340abbbb57e938 SHA512 77c12ad4abac47afcc2a50e8165af499a2ada6361a9a0f323889bab9ca6fe4fa8d022aba5fa0d03a35e3389e29868a33e55fb689a7c36284b76db180a461c3f8
+EBUILD wine-proton-8.0.5c.ebuild 13331 BLAKE2B 3cef3d1c03720064f77fd2bbb7ff0d67b35f30fbd1685aeec3e2c1c2635bf7ae86d7cb1ec4a9005b3795b0a0f07168f2069dfef0ce31ed2c8ed739decb64e3db SHA512 3ae33940a06a9a345088bd93d0eb78ef0e62ae725ee1363babeeec5a37d5919973ab5bd52cf13c65148926b74f4a4986ba41f8da9aaa5cc04053de4426c2a2ca
+EBUILD wine-proton-9.0.1.ebuild 14232 BLAKE2B 06c18599deb66d4577c113650ad33538851dffa913d5c961bfcbf5351e29efc56f719cffbdf025f678807b22efab9c210f070376b735be8ffb7e210de052d687 SHA512 13a541f5b6dfb4a90662399d009c778d0ca89a0bc65f198432540d6eb6c178964d9541d1348bc8693f76b29337a552b4de31b9f6c6887c59d210d0352119068e
+EBUILD wine-proton-9.0.9999.ebuild 14292 BLAKE2B 8e6ce8935d569d1fef298ba2767a74430e9e454a39c2700140173dc4a12948504d77f4c9bd2bfb7df353d4959a8ba9c14476c58beefbebb4c07379a1d51dcf74 SHA512 8999fa3750a1fa9840ff9bce8fa00cc01b43dc718f6e44843d96391ddfd7ef4bfb66463bf72bbae28f20fd354595b7384c8884d142dedd296c48fa7dcc0f9028
 MISC metadata.xml 1593 BLAKE2B 2e07980ce479dbb737394a5b74576925da936ca2ef5c0767b036cad7f56460ae0a6c73e8a416679f512a5195d037329ce9d3ace9808f68e024baf8640f462d94 SHA512 9f99896328a6337e7a2228977a3b7d853e78aef50a19ee40c43d18f657ead529553d7ea788bae1d408bd074f240cb555ba42558a54cd3ff8ab530b167e813d55
diff --git a/app-emulation/wine-proton/files/wine-proton-7.0.6-vulkan-libm.patch b/app-emulation/wine-proton/files/wine-proton-7.0.6-vulkan-libm.patch
new file mode 100644
index 000000000000..b81778fb957c
--- /dev/null
+++ b/app-emulation/wine-proton/files/wine-proton-7.0.6-vulkan-libm.patch
@@ -0,0 +1,12 @@
+Valve's patches add use of "ceil" without using libm, it works
+by accident with -O2 but fails with -Os.
+
+ld: dlls/winevulkan/vulkan.o: in function `fshack_vk_queue_present':
+vulkan.c:(.text+0x12f46): undefined reference to `ceil'
+--- a/dlls/winevulkan/Makefile.in
++++ b/dlls/winevulkan/Makefile.in
+@@ -4,3 +4,3 @@
+ IMPORTS   = user32 gdi32 advapi32 setupapi win32u
+-EXTRALIBS = $(PTHREAD_LIBS)
++EXTRALIBS = -lm $(PTHREAD_LIBS)
+ 
diff --git a/app-emulation/wine-proton/files/wine-proton-8.0.5c-vulkan-libm.patch b/app-emulation/wine-proton/files/wine-proton-8.0.5c-vulkan-libm.patch
new file mode 100644
index 000000000000..c3d9794fbbfe
--- /dev/null
+++ b/app-emulation/wine-proton/files/wine-proton-8.0.5c-vulkan-libm.patch
@@ -0,0 +1,12 @@
+Valve's patches add use of "ceil" without using libm, it works
+by accident with -O2 but fails with -Os.
+
+ld: dlls/winevulkan/vulkan.o: in function `fshack_vk_queue_present':
+vulkan.c:(.text+0x12f46): undefined reference to `ceil'
+--- a/dlls/winevulkan/Makefile.in
++++ b/dlls/winevulkan/Makefile.in
+@@ -4,3 +4,3 @@
+ IMPORTS   = user32 gdi32 advapi32 setupapi win32u
+-UNIX_LIBS = -lwin32u $(PTHREAD_LIBS)
++UNIX_LIBS = -lm -lwin32u $(PTHREAD_LIBS)
+ 
diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
index cdab45831b77..29b0e02ef24a 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -124,6 +124,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.0.4-restore-menubuilder.patch
 	"${FILESDIR}"/${PN}-7.0.4-unwind.patch
 	"${FILESDIR}"/${PN}-7.0.6-mingw64-11.0.0.patch
+	"${FILESDIR}"/${PN}-7.0.6-vulkan-libm.patch
 )
 
 pkg_pretend() {
diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index 83417e7c34f7..cecd79a0c1f7 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -124,6 +124,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.0.4-noexecstack.patch
 	"${FILESDIR}"/${PN}-8.0.1c-unwind.patch
 	"${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch
+	"${FILESDIR}"/${PN}-8.0.5c-vulkan-libm.patch
 )
 
 pkg_pretend() {
diff --git a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
index 1dd72b877060..227f0cf4916a 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
@@ -134,6 +134,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.0.4-noexecstack.patch
 	"${FILESDIR}"/${PN}-8.0.1c-unwind.patch
 	"${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch
+	"${FILESDIR}"/${PN}-8.0.5c-vulkan-libm.patch
 	"${FILESDIR}"/${PN}-9.0-rpath.patch
 )
 
diff --git a/app-emulation/wine-proton/wine-proton-9.0.9999.ebuild b/app-emulation/wine-proton/wine-proton-9.0.9999.ebuild
index f43dad37ae8e..caa389a5712f 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.9999.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.9999.ebuild
@@ -134,6 +134,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.0.4-noexecstack.patch
 	"${FILESDIR}"/${PN}-8.0.1c-unwind.patch
 	"${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch
+	"${FILESDIR}"/${PN}-8.0.5c-vulkan-libm.patch
 	"${FILESDIR}"/${PN}-9.0-rpath.patch
 )
 
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 3cd07feed33e..91e877520cf2 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/afflib/Manifest b/app-forensics/afflib/Manifest
index 7d94b306696f..f1ab2b8f81a5 100644
--- a/app-forensics/afflib/Manifest
+++ b/app-forensics/afflib/Manifest
@@ -1,6 +1,5 @@
 AUX afflib-3.7.19-search-path.patch 1132 BLAKE2B 8314c7591277658c704f0e82105ecb2af7e70761aaab1e9329aa72f400a4b3774e2ba3ccc6e271b4a1be78b0935cbac058acb3e5dbc8e16123e9d3f21b4ef018 SHA512 80551435c89a7dbacfbce5c9d73a47e89d31600511abffab9a8235b60b0b398bc26d10a144676c99e5f11b680a994a2ffc8eab3409a332f708f5cdd5782985fb
-DIST afflib-3.7.19.tar.gz 540165 BLAKE2B dea0998741121d2c1ae0e42ced9652ec46816282128469af75e0a32f9e4e2d09ac4afb4888ee7925366a03a867932f2446bfcd3800ab4dc021939ab6c38c797b SHA512 6e0df7477bf7dbd3814099d94e3fce122e0cf9b714a425521b7458f4eedc6e8b8e7283fd37926b7c992cdf21d3adec620df29a79a6a5311bf1d1b5d4930768bc
+AUX afflib-3.7.20-c99.patch 876 BLAKE2B 6a1a1a601770f71eb8f6eed0f59756511a235fc053de4d706b97bcc7b013ca2349a1f52066f78bedd150034204672a059bb97920d4bb4228802d81c013225881 SHA512 2775e96628434397cead2c2390368157eaed0d05be4485177621dae5ca088d4f15bd51fc455b9e515e7196d9d949e945ef54031ab5887b40a107dd22f03dbf12
 DIST afflib-3.7.20.tar.gz 560441 BLAKE2B 6934efc30566b4b72e55e5727c46657362237872acae9d161f2625439d3d6e12da702b3ed82e3442b7015d8cb707097152cc73a6d0cc31d1ad61467f4022f7d4 SHA512 1ac623cb8462fc929a8ad1c014e92d319a3ebf5226ef07aa0777e4cbb77a9ee20adf570f39c960c9186ac2a477e861dfd5565d3364fdff22f9870f8c9ab30479
-EBUILD afflib-3.7.19-r1.ebuild 1614 BLAKE2B ffbefa9d7189c08cf9ce9d8b58c48aaafaae308a7874917d7c35d03b9f2cee92cf2b68bdddccee3761c48e03b38e319af3d4f65c28877cec52a7024a49d29e17 SHA512 71bdef8bb1ef8e2dadb8880e272f0eba3425a390a7065c56bf91842f559f553bb232ef2f1db7cbc363cb3da7ddf79ba623af81dc11c752c08835242de3081f71
-EBUILD afflib-3.7.20.ebuild 1659 BLAKE2B 7fb58e5bff061b995b1cec717deb6b28a0b245412f9c46f10aa7c7452acbc96fe46d2c44515415bc04306f9f1e2717d87787db09461e4babcfae1cd766987fc7 SHA512 70f48908737ee3fe51974ef1bd1406a0a27294ffa4e78b74291d913a0b5cbc26e3b98be049cda017c0f7dbf33537f319139ee6fdaeb20e1fa2e836e3b768dc96
+EBUILD afflib-3.7.20-r1.ebuild 1698 BLAKE2B 1febc786244efe5107e285f540b8be9189058d32c71f7274f95e1f865a3bbe28138599a015a51ef45757d6daf3e80764fc5e9767bddca06fd63f9fff3aebdfc8 SHA512 7b5c48ff387b726a8e1bf5c9c34c0364752510778691e4d5b3ff16bd500c83291ea66b4544a001990d0b5ffc6399c86e818ac48959bb5a9169b80a38975fb63c
 MISC metadata.xml 429 BLAKE2B be342119faa9c24cda33611a66e94a2bd2490b642fa3fcae47af7ae88690fd3059fa4df33fa7856179b8ce5704e042a2dfa831da6055d771f2dbef9b236fa3b1 SHA512 1240b7941d35a219be5adec75a3fae222dd17d1f5e9bb1a0476b779ac4869f9d7d1c985a60a20580d8cb375297ec9dea39e4597a4c462cac31faa5039be3d34a
diff --git a/app-forensics/afflib/afflib-3.7.19-r1.ebuild b/app-forensics/afflib/afflib-3.7.19-r1.ebuild
deleted file mode 100644
index 00cbc11a8892..000000000000
--- a/app-forensics/afflib/afflib-3.7.19-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit autotools python-single-r1
-
-MY_PN=AFFLIBv3
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Library that implements the AFF image standard"
-HOMEPAGE="https://github.com/sshock/AFFLIBv3/"
-SRC_URI="https://github.com/sshock/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc x86 ~x64-macos"
-IUSE="fuse ncurses python qemu readline s3 static-libs threads"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-# Tests don't play well with sandbox
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/expat
-	sys-libs/zlib:=
-	fuse? ( sys-fs/fuse:0 )
-	dev-libs/openssl:=
-	ncurses? ( sys-libs/ncurses:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]')
-	)
-	readline? ( sys-libs/readline:= )
-	s3? ( net-misc/curl )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.7.19-search-path.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i '/FLAGS/s: -g::' configure.ac || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Hacks for automagic dependencies
-	use ncurses || export ac_cv_lib_ncurses_initscr=no
-	use readline || export ac_cv_lib_readline_readline=no
-
-	local myeconfargs=(
-		$(use_enable fuse)
-		$(use_enable python)
-		$(use_enable qemu)
-		$(use_enable s3)
-		$(use_enable static-libs static)
-		$(use_enable threads threading)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/app-forensics/afflib/afflib-3.7.20.ebuild b/app-forensics/afflib/afflib-3.7.20-r1.ebuild
index a8d20b77ec2b..9c200d896a8f 100644
--- a/app-forensics/afflib/afflib-3.7.20.ebuild
+++ b/app-forensics/afflib/afflib-3.7.20-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit autotools python-single-r1
 
 MY_PN=AFFLIBv3
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.7.19-search-path.patch"
+	"${FILESDIR}/${PN}-3.7.20-c99.patch"
 )
 
 pkg_setup() {
diff --git a/app-forensics/afflib/files/afflib-3.7.20-c99.patch b/app-forensics/afflib/files/afflib-3.7.20-c99.patch
new file mode 100644
index 000000000000..faee6c48dd82
--- /dev/null
+++ b/app-forensics/afflib/files/afflib-3.7.20-c99.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/921727
+https://github.com/sshock/AFFLIBv3/issues/53
+https://github.com/sshock/AFFLIBv3/commit/01210f488410a23838c54fcc22297cf08ac7de66
+
+From 01210f488410a23838c54fcc22297cf08ac7de66 Mon Sep 17 00:00:00 2001
+From: Phillip Hellewell <sshock@gmail.com>
+Date: Wed, 14 Feb 2024 00:43:56 -0700
+Subject: [PATCH] Fix #53: incompatible pointer types in pyaff.c
+
+--- a/pyaff/afflib.pxd
++++ b/pyaff/afflib.pxd
+@@ -2,7 +2,8 @@ from libc.stdint cimport int64_t, uint32_t, uint64_t
+ from posix.fcntl cimport O_RDONLY
+ 
+ cdef extern from "afflib/afflib.h":
+-    struct AFFILE
++    struct _AFFILE
++    ctypedef _AFFILE AFFILE
+ 
+     enum: AF_MAX_NAME_LEN
+ 
+--- a/pyaff/pyaff.c
++++ b/pyaff/pyaff.c
+@@ -1478,7 +1478,7 @@ struct __pyx_obj_5pyaff_affile;
+  */
+ struct __pyx_obj_5pyaff_affile {
+   PyObject_HEAD
+-  struct AFFILE *af;
++  AFFILE *af;
+   int64_t size;
+ };
+ 
+
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index ebaea3d45458..27ab8cedd760 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/fcitx-chinese-addons/Manifest b/app-i18n/fcitx-chinese-addons/Manifest
index dcd397e743eb..66c7f346c83c 100644
--- a/app-i18n/fcitx-chinese-addons/Manifest
+++ b/app-i18n/fcitx-chinese-addons/Manifest
@@ -1,5 +1,5 @@
-DIST fcitx5-chinese-addons-5.1.4_dict.tar.xz 885456 BLAKE2B 239b2092d9b4ca77d7c0373a85e7a0e5b03e223c477b8704e36657349cf3ba006791e77a064826cd452eb6e5e81d33831feceabb9a51a8d26275f70deb04658a SHA512 99f3cc101532879c126e2699d338528a25531b782a5c1f1e93cd363437567c1ba7b0173aca56f887089d4379e86aecf7977139b5b5c44d54e0bd9a416b01e976
 DIST fcitx5-chinese-addons-5.1.5_dict.tar.zst 1007840 BLAKE2B dc7cfe09789a6d7ed5d820ebdae133648748478746b3da7ec93a7e1bf31db34d212459dd64e1887bb7cb4ab15f2846fab1d97cf4a17082129c9f4a6cbf819e76 SHA512 50559f1f2ffa89eb24ce58a14c3ca21f3c1092961ce90b925fcf89a029d65c0aee3601d89003be5e92f9f1697e72d5eb2dade06863256a9a615f8be9ec2b2fe5
-EBUILD fcitx-chinese-addons-5.1.4.ebuild 1488 BLAKE2B 077940de82ba0e09f522382bd27043f3de32efa76353133f91386628fa3a48e8d4cc6f8e2fee09b8a16e546e58f5ef4c566d5fabd5b356d2f1200c166417ab97 SHA512 38abe8a0d6a5e940b760bc128e5fe4cb6daa98d54b9bdc179dbc8cc6dbe559257e7815ac133d40ba72a5a3231854c73d0835b1228b975c1f8645487002916dd1
+DIST fcitx5-chinese-addons-5.1.6_dict.tar.zst 1005756 BLAKE2B c3b3c12c3b269c71c7136ba140fa833fb28d4ff2698213aa47bdb3fe50ee65830a99c9591180ae0bfd2873c7d84013f26df895f2574372a64cdea9ea887cb052 SHA512 f130f4492977662916a1591048832a37ec306f3664a2c5bc5225ba220ea5ffebc3ef78022b2b6d2d8475b556285a0d45508eaf00473f5b636d2e56a7c73d2f38
 EBUILD fcitx-chinese-addons-5.1.5.ebuild 1497 BLAKE2B 6291f4dd3c08f9d88597f079d6a5907a150174d4accb2a176aa93ddae27aad0857becbffb87d89fe49f2560fd7cc00e1165ba0d407ab38a272ac3c35d8a4621a SHA512 2ed5301bf77e6c46a19f164248c53e5224e20e46a1ee910b4fd3b4cc8b538619e077ea2a909f0d36f004aa7ef3f18bcd3b2d864e08dcb451a47a62743c854f69
+EBUILD fcitx-chinese-addons-5.1.6.ebuild 1497 BLAKE2B 6291f4dd3c08f9d88597f079d6a5907a150174d4accb2a176aa93ddae27aad0857becbffb87d89fe49f2560fd7cc00e1165ba0d407ab38a272ac3c35d8a4621a SHA512 2ed5301bf77e6c46a19f164248c53e5224e20e46a1ee910b4fd3b4cc8b538619e077ea2a909f0d36f004aa7ef3f18bcd3b2d864e08dcb451a47a62743c854f69
 MISC metadata.xml 993 BLAKE2B 034a9f1ca3966a67fb884f3e0ce6baeb83c3ccfb2b7d7d99d41e54ef30087c94d5a0c9729902e08eb8b781deeb71daf57b27f3d238beebf6e356e690aae7723b SHA512 05140cdf9695922cf2ddad40744d51d197fc3beab99ca7ba5d19b38a7c22762195f2e3a3c2e2ded46f253e1efeab06259429725830328c5f2001fe0752cd2b26
diff --git a/app-i18n/fcitx-chinese-addons/fcitx-chinese-addons-5.1.4.ebuild b/app-i18n/fcitx-chinese-addons/fcitx-chinese-addons-5.1.6.ebuild
index 009b5efe7416..22638f079ea1 100644
--- a/app-i18n/fcitx-chinese-addons/fcitx-chinese-addons-5.1.4.ebuild
+++ b/app-i18n/fcitx-chinese-addons/fcitx-chinese-addons-5.1.6.ebuild
@@ -5,15 +5,16 @@ EAPI=8
 
 MY_PN="fcitx5-chinese-addons"
 
-inherit cmake xdg
+inherit cmake unpacker xdg
 
 DESCRIPTION="Addons related to Chinese, including IME previous bundled inside fcitx4."
 HOMEPAGE="https://github.com/fcitx/fcitx5-chinese-addons"
-SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}_dict.tar.xz"
+SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}_dict.tar.zst"
 
+S="${WORKDIR}/${MY_PN}-${PV}"
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
 SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
 IUSE="+data +gui webengine +cloudpinyin +qt5 qt6 lua +opencc test"
 REQUIRED_USE="
 	webengine? ( gui )
@@ -21,8 +22,8 @@ REQUIRED_USE="
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=app-i18n/fcitx-5.1.6:5
-	>=app-i18n/libime-1.1.3:5[data?]
+	>=app-i18n/fcitx-5.1.9:5
+	>=app-i18n/libime-1.1.7:5[data?]
 	>=dev-libs/boost-1.61:=
 	cloudpinyin? ( net-misc/curl )
 	lua? ( app-i18n/fcitx-lua:5 )
@@ -46,8 +47,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-S="${WORKDIR}/${MY_PN}-${PV}"
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_BROWSER=$(usex webengine)
diff --git a/app-i18n/fcitx-configtool/Manifest b/app-i18n/fcitx-configtool/Manifest
index 0ba94f449838..e1c27012e0a8 100644
--- a/app-i18n/fcitx-configtool/Manifest
+++ b/app-i18n/fcitx-configtool/Manifest
@@ -1,8 +1,8 @@
 DIST fcitx-configtool-0.4.10.tar.xz 50440 BLAKE2B f2f2241d3ea139f6f3de9b8c6ffcc71c789dfa291efe4c551596eebc8a04f13f9fe698cc25d8349a174399044d15ddca2aeab952ac2bc7f0f4e9e47d453329ca SHA512 1c1267e9de694bbd5f258b5bba1e7514c4f8556cdc82a1cce5eafd8a4ec571955285dade0acd02f128eca01f867a30c5c6264ee7e91d32a333eba6e4d275fe8f
-DIST fcitx-configtool-5.1.4.tar.xz 110356 BLAKE2B 942cd0b68d689f865bb46796543cea7746a0409bead0cb0d79f30ca23b988f93ac81ed862855f521c5e36541d210d12f898d45f195dc2afb2181198c846a8b27 SHA512 95ac4a8b8c261ae990d30d34ffa02f14f00916197f8f9f81ca4dd8a33c609124b1cfb25ce3ff8ccb653409879606f7f97dc0fd01e8e1d7f2ddba8bdfc51ac6eb
 DIST fcitx-configtool-5.1.5.tar.zst 148724 BLAKE2B 5bb8c819e0bbf7f962b4e7e91b9e4ba39f0637b478fb7d0d386e6f807c6f46be5ef1e4b52fd4c006dcfee944e33fd928119efb6b332fe16f1bfe17c31d751b11 SHA512 da418ad709dd5074bb413e8a042a53c055d151d27e487933481276980bbb1a971f4d1909f43b7cb5bb3983c190cba4a3fc12d6f1a1984dd9babf4607bec7334f
+DIST fcitx-configtool-5.1.6.tar.zst 149667 BLAKE2B 2536258eb92c04623b2f1aa77c99cf91919cd4f1d23c0bdf7f87ab8528b2b1305ed6771ee93b25d67ace24dfc5b14413d96d13f5487fe58efe93b36c452ff67a SHA512 1cedd3b5eae3c069774da3456799e26ab36cf8b8a6515cf008fe6e9822bfa7d0992ed69c4ef9671484082778cd5560ee6255446be3ebbf00f305143b20531aeb
 EBUILD fcitx-configtool-0.4.10.ebuild 851 BLAKE2B 97d7acbf9f2984de63df3c6e603fb7d5c4bb8d5828d70d3840b8bc8fb8381388112978c2967f404f485ddc441daaa14b8ea972cad92068dba17cc6758063f7b0 SHA512 e7de180936ec303bfc23e02b77f0d367e94c30253b55dae9bd47ea2a0eb60df7da2360eb25b0c5b6930d08239109629e75179d502e930140b46385bc1a262c7a
 EBUILD fcitx-configtool-4.9999.ebuild 818 BLAKE2B d034a75bf15f37b71243d5d1c15a8ec6114ca559d715101f031d434b1a9478c39298f95b022c7c4f8cd08ad2701eeefb4cef628a4795f5fd15567723b0c71362 SHA512 42b150975f7293dfdb67c6d6479803526438adc80032adbaadf6f03927f6adaafd4469d145d07a21f8b929cba6eddf20e21d2374085c8791d77046ed0f496659
-EBUILD fcitx-configtool-5.1.4.ebuild 1573 BLAKE2B d098b3a8f8890f08b31caa938c6c877f22ec5658acf82abfa3f06c7e7217747a25cff19fce73740a90689e3141ab78fd4fe2f30a522a1c3c29b84a567933d74e SHA512 2579af773516fe339a25771f2eb5fd13cb8a40d88032125e682c71b85d2b1384417a17b27874e7911d9d19cd3d79cd1cd45aaab53ddd0510e142b2cb65fd94ac
 EBUILD fcitx-configtool-5.1.5.ebuild 1583 BLAKE2B cbe08ad6c326ba90266119497fa8ef5cb46a19e40c3e27a397ab95a65b89299258e604bf6b35e44d26471aefaf64a6a2aadb64d3cdda3224e5667766c726aff4 SHA512 9338eefaa1885cfe06b14db5b0a4aa0216c0863d3090fd880f7af2a86d417af5e945e83e63c982ca36591f0efa1ba0c762ead1a3c20eba372fa62316dbb7c23f
+EBUILD fcitx-configtool-5.1.6.ebuild 1583 BLAKE2B cbe08ad6c326ba90266119497fa8ef5cb46a19e40c3e27a397ab95a65b89299258e604bf6b35e44d26471aefaf64a6a2aadb64d3cdda3224e5667766c726aff4 SHA512 9338eefaa1885cfe06b14db5b0a4aa0216c0863d3090fd880f7af2a86d417af5e945e83e63c982ca36591f0efa1ba0c762ead1a3c20eba372fa62316dbb7c23f
 MISC metadata.xml 951 BLAKE2B f3f59dbca74fc02c4deeb07675ade6a56ccafb8b0ed4388ee0afc7cecc1a0f470a350e95a2c6be6e32dd7a85f763daac6d31e8c876107c32a7d2438db212ddaa SHA512 3cd5ce6c71a2d386c5927f8e0289b470bbb16559fb8a0deeffdba8c50bbe7cfa642dfaa1d0d35ea931c3a774bc20f97b1e8f8c3e5d01fb926d9f9104837afaa3
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-5.1.4.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-5.1.6.ebuild
index f58d2433cd8f..da44e902b68a 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-5.1.4.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-5.1.6.ebuild
@@ -5,12 +5,13 @@ EAPI=8
 
 MY_PN="fcitx5-configtool"
 
-inherit cmake
+inherit cmake unpacker
 
 DESCRIPTION="Configuration module for Fcitx"
 HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5-configtool"
-SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.xz -> ${P}.tar.xz"
+SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.zst -> ${P}.tar.zst"
 
+S="${WORKDIR}/${MY_PN}-${PV}"
 LICENSE="GPL-2+"
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
@@ -56,8 +57,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-S="${WORKDIR}/${MY_PN}-${PV}"
-
 src_configure() {
 	local mycmakeargs=(
 		-DKDE_INSTALL_USE_QT_SYS_PATHS=yes
diff --git a/app-i18n/fcitx-rime/Manifest b/app-i18n/fcitx-rime/Manifest
index 51d47f5f7a48..53e8bface747 100644
--- a/app-i18n/fcitx-rime/Manifest
+++ b/app-i18n/fcitx-rime/Manifest
@@ -1,6 +1,8 @@
 DIST fcitx-rime-0.3.2.tar.xz 40960 BLAKE2B 1c9185dd9d2912e74b9916916fed09a01c30e0867d93fe94e04d5324883783dddbdca0f553d80aa19e2e59d2ec8fd2a50a7f89118c22cb09310296292a566760 SHA512 8c6d845b0899d9b8b9b41b895abd5c1b8916856b71f529aabd08d1c27a2b09bb5a9343912d088da460c2e22da0a3ce759a34fd13099a149bb8cd1ff4eafe29f1
 DIST fcitx-rime-5.1.4.tar.xz 49508 BLAKE2B e9846a0217b741d21c45ad4d6bd216f7d6afaec23ca71af3ab1dfffeeeba62eb85836592d53e70d0ce07217442164ccdecaa94eb36458d70778eb3d7e3bd1ada SHA512 1dc20c801e1ce4fa5e63f06554340af4616b044964d4235995e51dc6074223e30e66da74f354b2b05f77d2e0041af1e720bf2f2b214492ae4516d30761b2e092
+DIST fcitx-rime-5.1.8.tar.zst 61573 BLAKE2B a406603aa66146735e3009837e050d0c46446b449e865429a95cfeee361768d5ba0b77cdd5b674f3b90e63912222146c115ac07fd0ce88cf6aa04bcac3e4a602 SHA512 75b8be80bd5ddc509bfa631f8ed093d89afee2588665b2b7604745b7c0b52376c4d55b36e33b53086c9b63992bfbeaae6292fa3096ec8f9ff9222647ff52e98c
 EBUILD fcitx-rime-0.3.2-r1.ebuild 922 BLAKE2B 5e33653b8c5bce450cf880fe627bb82c2babb3c13df193b54344132b796875a67636daf0ebdde111e3c66b6326f021d8ed44fba9694342be6fbe2a4ca440e552 SHA512 62929e4e4bb72528997715ec8d5bfc4a0d08f80f30a7ac023603b917d022b20ed780e96b9b44a56f157349d641bcba558b2438c6043bdead598df18244575d22
 EBUILD fcitx-rime-4.9999.ebuild 1198 BLAKE2B 14457aa4036c72d14e70d9e69963a891c4b5763e2e4d2cbb7f3431816e8b6c4a0efc3abc6c4bb46098b69ca92073de94e8e3a5997b845a93d36117426288d9c5 SHA512 b4d9905c750da4635e67adcadf5b92ca154f8a116d8439d6c173a28a988c397aed29b3d3c5936ef0d353aaa379ec4e757a09d99537384382d94fb9cc26f9efd3
 EBUILD fcitx-rime-5.1.4.ebuild 695 BLAKE2B 2346770ec5576e04e90bdd176fff6fa95e8e16739afc1e5408f3c96c070f3732299a0e730f9a5e8517f1a4f299342152438025a79225997be169a3b409c1de63 SHA512 e5d4cfcd87ec20658e572b8fc1526bd573e5f04c849c0ae7e30a161c62fd54f7aff4ea8b91a4a2bcabd15fc31cb69030cf7fcc392b8a6ec1273d008f6af9f342
+EBUILD fcitx-rime-5.1.8.ebuild 705 BLAKE2B 4ebdc04d4cf12e8f29f0e4c2cb206a8d10cb07b6284a9bca6c2b43a4fb65bf4f3a4b8b261b1eabbb7e3e3b438cb44c03f5371b7af8335984e1c9e55c4d2be392 SHA512 7e60fd29e838fefb1581d357fa4aad74b020b5a989a482f3d2b51e69ed63a320b3daebebc115759d398ec02512b88a36321e5e3751ea80f0e7264040126b13fa
 MISC metadata.xml 1077 BLAKE2B 762313960f3129b8d5b073ab755f5bc589c02c9f35287f33334a4e35fc9dfb8e05f1580f2da66d790dbf8734824af8a32a7894c729e5b06f18083de0b9c6c45e SHA512 fc07c97eab3f227fe9c09557854d91c24e6b13bf5b3d8d8cd630fb9b5c989af8adfd8e6012cf8de2c21cc7f2a1a5eeba560a084084c428a017964a254f42977a
diff --git a/app-i18n/fcitx-rime/fcitx-rime-5.1.8.ebuild b/app-i18n/fcitx-rime/fcitx-rime-5.1.8.ebuild
new file mode 100644
index 000000000000..7ad6c6710180
--- /dev/null
+++ b/app-i18n/fcitx-rime/fcitx-rime-5.1.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake unpacker xdg
+
+MY_PN="fcitx5-rime"
+DESCRIPTION="Chinese RIME input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5-rime"
+SRC_URI="https://download.fcitx-im.org/fcitx5/fcitx5-rime/fcitx5-rime-${PV}.tar.zst -> ${P}.tar.zst"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+LICENSE="LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+
+DEPEND="
+	!app-i18n/fcitx-rime:4
+	>=app-i18n/fcitx-5.1.2:5
+	app-i18n/librime
+	app-i18n/rime-data
+	virtual/libintl
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	kde-frameworks/extra-cmake-modules
+	sys-devel/gettext
+	virtual/pkgconfig
+"
diff --git a/app-i18n/fcitx-table-extra/Manifest b/app-i18n/fcitx-table-extra/Manifest
index 64e84ca34194..fb20ca12ce11 100644
--- a/app-i18n/fcitx-table-extra/Manifest
+++ b/app-i18n/fcitx-table-extra/Manifest
@@ -1,8 +1,8 @@
 DIST fcitx-table-extra-0.3.8.tar.xz 3700736 BLAKE2B b8ce4b3aa04eba8b594b86958bb83e348758c30688828a4834643cf7bdd62852c2ca89bc4f75f0cb1b16ce969b0454c58e3abadff9c78318dc0953e0905c75fa SHA512 454798e9bd25c630ce98e2daf7296e82ba5fbc98027171038a5a7b9ac3169c153302a6703d9416718ec3a0b76db6d732caf3f03c6e6005841c9d7798702542df
-DIST fcitx-table-extra-5.1.4.tar.xz 7506768 BLAKE2B 62082946e5e399eda6d4d44e3aaac7e96975da9ec39031735d775f526e7879718dae0fb8020364c65ca684bb186affcd1956a1fb87da9971d0135d9acd025da2 SHA512 c26007209706263d29f189a6bb8088d5bde81c322649b6dba21df76fda3dc1a6926066c950bdbd09f3392216bbf61aec8657f8182844b5656e4111554b5025bb
 DIST fcitx-table-extra-5.1.5.tar.zst 13837962 BLAKE2B 52d546636fb0520826d9b4e8df3a68a163edd71a57ac7cc720916ebdd7141d6a4ce194ecb3aa205a568b10a99ae611e607325c652ed293ba16bb783bfd64bfd3 SHA512 19cc8f45c26f4841b3c8a4724375f8926741a153757626d4f5a598abc9ea0e12133b0ef13c3a1893675360102f69dd91b8c9861849d8f1677242339f11f475fc
+DIST fcitx-table-extra-5.1.6.tar.zst 13837895 BLAKE2B e28c413dc911b37ca20cfcb130a10034550c4c602a4a4e0039861f571654e8c3a2c308757b4e5e21035b783e8ceedd0fd751a41054db7d61ac06aacb4a76d2a9 SHA512 feec1363c9d1b2cb1a91e020bb3c83d9f77d78237d26ec55716c8864a8150b4cd5eb3c47c24fc24641ca4d99b2bba08c7de3bc39bf732a89fddb13222469b27a
 EBUILD fcitx-table-extra-0.3.8.ebuild 799 BLAKE2B 6fc1349116575e7e3d321cecc4ddc79291fb21f6c029ed79dd37fb82f4ae43be065c1c8497400276bc6b8dded972d35c96533271a9cf8d774115d247e3be2ac8 SHA512 42fbd0c40568c75a9e0f765b1dc1a5667c5878b5d1d9abdbcb445ca134a40d3f2f2e97b652ca8115e19f59243ddb7283074b975034de1b28f201c53ef8cfbf3a
 EBUILD fcitx-table-extra-4.9999.ebuild 773 BLAKE2B 1debb5da1822ed6e17c62a3a37f2f80e079166b9434cd2f9840f8d0a9f747affbd556040bf7088951fd1a5851e7dbacc62d4f98c3d9961a7f28488b41d65d5c6 SHA512 fd3b5d55e45e0712211cf7ebb8808fde09ba373d7f3ae13a9c43b871fb5287133fc4bb26429f2916d0ca1883406a49003f7b3b400d1e2c2a85dccc281034ac26
-EBUILD fcitx-table-extra-5.1.4.ebuild 669 BLAKE2B 5363fc9937218092d7085f9d49c02cbc556eed3ce03e52cea8647be58851b6e6c5514026616216a50391e738859906307fc449bb1da92a9e7d50dc561212a8cb SHA512 b6641d7e965a33d5fe00873785a709c1a2b92385d1cd944342576bb1533b85873d1ee0507d65563bb92fcd2555c6057935874339a4f068c18e6cada74ee700ea
 EBUILD fcitx-table-extra-5.1.5.ebuild 679 BLAKE2B deb5996d1af66e943898411aa9552decbf64f9dec9518cb609a1faeda1ebd2ba7159cabcd19f68d7d336e6916013c65c9f0e7c867cd5fbacdb83239d189b377b SHA512 a89c4b9792064d4fa818f3a65c865680c061668969ac422e79a0950e175b9edbfb3cff9702abd587164eeebdab6962ee5ff4d1fea39873bb96fca9a8d5156012
+EBUILD fcitx-table-extra-5.1.6.ebuild 679 BLAKE2B deb5996d1af66e943898411aa9552decbf64f9dec9518cb609a1faeda1ebd2ba7159cabcd19f68d7d336e6916013c65c9f0e7c867cd5fbacdb83239d189b377b SHA512 a89c4b9792064d4fa818f3a65c865680c061668969ac422e79a0950e175b9edbfb3cff9702abd587164eeebdab6962ee5ff4d1fea39873bb96fca9a8d5156012
 MISC metadata.xml 794 BLAKE2B fbfb8bd1017ea97c3b91ad0c4c026a4bd69be61335c0d7a0848171b0747846a54c20db9c074db0ffd57d83b38950813224bba60f4a5c9c06ebbba5537af988e1 SHA512 f9ba53ade10f716760b7a751fdd2388b40dd9abc7336c280d31b20e52f114f4a5b23e8d29d616caaa6ec677d15fca1213756d8066a1838b85884b521fa46d59d
diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-5.1.4.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-5.1.6.ebuild
index 13ba0b2957b7..9a28c8eae2d4 100644
--- a/app-i18n/fcitx-table-extra/fcitx-table-extra-5.1.4.ebuild
+++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-5.1.6.ebuild
@@ -5,12 +5,13 @@ EAPI=8
 
 MY_PN=fcitx5-table-extra
 
-inherit cmake xdg
+inherit cmake unpacker xdg
 
 DESCRIPTION="Provides extra table for Fcitx, including Boshiamy, Zhengma, Cangjie, and Quick"
 HOMEPAGE="https://github.com/fcitx/fcitx5-table-extra"
-SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.xz -> ${P}.tar.xz"
+SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.zst -> ${P}.tar.zst"
 
+S="${WORKDIR}/${MY_PN}-${PV}"
 LICENSE="GPL-3+"
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
@@ -25,5 +26,3 @@ BDEPEND="
 	kde-frameworks/extra-cmake-modules:0
 	virtual/pkgconfig
 "
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/app-i18n/fcitx-table-other/Manifest b/app-i18n/fcitx-table-other/Manifest
index f5acb5551452..56b6c751869a 100644
--- a/app-i18n/fcitx-table-other/Manifest
+++ b/app-i18n/fcitx-table-other/Manifest
@@ -1,5 +1,5 @@
-DIST fcitx-table-other-5.1.1.tar.xz 284308 BLAKE2B 7dee4d9ba5debe19568ff3fea7ce025f6b27d0641fd5207fc67e726b61621975d5553478de4136b72ccc930675df4c5096ec340da16471351ef00f107ce94e1a SHA512 13e4139a0ed320f7bae1d9e6ac68eae624235fb00446dc3db7b01913f130324cc1353115c1d8c9b34e04507b9956ef5875ec59a398eec6dfdbda281b67dafdc7
 DIST fcitx-table-other-5.1.2.tar.zst 532035 BLAKE2B de699a15b50eadd4a4693b38ca4ba44ae98ff8c31373305a7d8f83c5ea7c24c811c718f217831bebc3e5fe126d010b866d53929b20b2e7e401ed1bf3252b815a SHA512 d09bba6c60f625a9a9c2aad3599305438809c0bc5b7d5354502cdfb928822cb670f391a14b150637050322021c379b8e07e634bc9a016751755759e0dbd97596
-EBUILD fcitx-table-other-5.1.1.ebuild 636 BLAKE2B 8a1b2a3c1b7487577c1df9167f3dd2955fbb85eda35446bd1c1588bfad13dfe74863c0fbbb86a5aba6876aa0765f14fae64eda69a90a9be415d43fd2a844f1c1 SHA512 a350350a2c8772f8a6a1a997f44630519063886c1d6c1ffb7553533e9edfc51536cf40a026d1f39f647d05ce5c1b450975c6f66d64104dc5809673e34b420d60
+DIST fcitx-table-other-5.1.3.tar.zst 532361 BLAKE2B e966d5b259e96e60bf7f7744653fe6f6111a573ce9f10ccbd7fbd99028d6f38d607a6d51133f3492734b211ac5db214bafcfc0d21069f93da2ca6881e00d67aa SHA512 847e731c23e42b7a34bf145b489636a62812265c8b7d9fe0197f25f953d9683e0f8c96fccc3c6bdbb0a31742ab79258e3fee5b0b7a94e82b392d4d8471897415
 EBUILD fcitx-table-other-5.1.2.ebuild 646 BLAKE2B 3bb02372acb7e6c399f615bbcbdf11f25d28a715d3312d47318275edd9597148e52a8ca7bb1fa15e05f7f78657bae87e378b14cad0cf4c11345cf6adef891138 SHA512 0d8ba2648d224102899ede4b2f5d0840127976ce0a1e6d5cc9d443bcf7c09b6deafd9667ae604e445c779db8d254b9bea06534c843a84ad2d32a76ce86b686b8
+EBUILD fcitx-table-other-5.1.3.ebuild 646 BLAKE2B 3bb02372acb7e6c399f615bbcbdf11f25d28a715d3312d47318275edd9597148e52a8ca7bb1fa15e05f7f78657bae87e378b14cad0cf4c11345cf6adef891138 SHA512 0d8ba2648d224102899ede4b2f5d0840127976ce0a1e6d5cc9d443bcf7c09b6deafd9667ae604e445c779db8d254b9bea06534c843a84ad2d32a76ce86b686b8
 MISC metadata.xml 583 BLAKE2B 9e27f3a3ffa0da1affef2ccabd3535f69a10a13b1a79f1eec74005ae1b97b8b3b89be1a90117ff00b7d6e903acc6a6e8b1d1c10f5fc1b7e7274edf6bd40d80e0 SHA512 2705b85869a5827543d897de9861ce7630ffe67d6e9d51e2b571924aa39d05efe3f8b4296fe80fcbe427783bec673427c0e96ad87bb8535ecdbc7f1f8b100bfe
diff --git a/app-i18n/fcitx-table-other/fcitx-table-other-5.1.1.ebuild b/app-i18n/fcitx-table-other/fcitx-table-other-5.1.3.ebuild
index a0137688d848..f057fd74ebac 100644
--- a/app-i18n/fcitx-table-other/fcitx-table-other-5.1.1.ebuild
+++ b/app-i18n/fcitx-table-other/fcitx-table-other-5.1.3.ebuild
@@ -5,12 +5,13 @@ EAPI=8
 
 MY_PN=fcitx5-table-other
 
-inherit cmake xdg
+inherit cmake unpacker xdg
 
 DESCRIPTION="Provides some other tables for Fcitx, fork from ibus-table-others, scim-tables"
 HOMEPAGE="https://github.com/fcitx/fcitx5-table-other"
-SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.xz -> ${P}.tar.xz"
+SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.zst -> ${P}.tar.zst"
 
+S="${WORKDIR}/${MY_PN}-${PV}"
 LICENSE="GPL-3"
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
@@ -24,5 +25,3 @@ BDEPEND="
 	kde-frameworks/extra-cmake-modules:0
 	virtual/pkgconfig
 "
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index c9b3cb79577f..820153d49524 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,7 +1,7 @@
 AUX fcitx-4.2.9.8-enchant.patch 857 BLAKE2B 2de4fa00bf532b3b95af0ca0fe4b2fc61af4e6883d5b272682346751e66b83c5a6c9ce3323a6540c10474873afc4df0c279ec4dd1f1c57090a0e0f551abc46de SHA512 908501484c535ba88e4b4179752edb4b456e2294031fe4476d6b5ca972edd3568d992822622a293433690dd15fdac6e834fa979ea1cb6a1f8f7754eb0fbf5f01
 AUX fcitx-4.2.9.8-xkb.patch 796 BLAKE2B 8325574736faebd7938d8fdb19bb149586a8c83ba2342f454d3c665a22e6de642ac36cbf90a4e23a87fd2a9759fd51a42e96930fb429b98fde82cebb6dfa23e8 SHA512 321b73519c442e0595866a692a30e9cfb0464817d79162a7075b00711a73bc4c33fde5ec760bd48ca53ec842d62f98e8d8e8fed2474523d15ca4477dccfa8a2b
 DIST fcitx-4.2.9.8_dict.tar.xz 8737888 BLAKE2B 2de3ccbf1b37a9bcf1a3cb257d7837669e946765722c3d6f442ad071d7d81a6e8178e47051fc3aa53b9b4771d3aca602c2e22fa7a3d117a9e1f2779497e02c52 SHA512 50a954c3178f53fd2d441cdaf81fb44a7fe8dfb263fa6d8dd4ee4884fc7ae8321880c726c9366d11e2a4ac8da2233268d06e5d0800d4527ba0bdb1a1430248ed
-DIST fcitx-5.1.8.tar.xz 7498828 BLAKE2B 48aa2d6f81cbba17b2614c9f50491391ab5c55bf9e4e0915f2e34a120f158260b2719cb46f11436b58a5345655ef9d7067523b27cc1b02a1a90bd1b5d8491433 SHA512 4472b49cbc3fd20f066bbec4e107eafb5444fffd22feee7b4f5b637d324b03a16e82c950e95624629b984f72a5a62fca73087a032946c4eedb86d8a528c52a43
+DIST fcitx-5.1.10.tar.zst 8309913 BLAKE2B a63f5c747dd1d7a519873f00f234ae43d1ab5458e57b809f01e2b6cefc3e3921ecd7fff27cf4b21d59842f11e8d397760d90cf6572b42f65d226b21acc18fefc SHA512 196bc26f7dd50596da90e6b4b0a8b4886b57ec928c182427fb8763507f1f4cb39a252bfddcbd6eccaa0cc920070b7b9fda03f18fd444f84154ddd925678ad7d4
 DIST fcitx-5.1.9.tar.zst 8307560 BLAKE2B 4dcaabdf155f11297cec0cab2353b3e6ce9bcdd76bc31d8efeafe8653e9f06f0ed7bf16ecad19fe298ceb59daae98437214f0c0f5736326ac56fe6eab53f7e9c SHA512 b4964eb48acf224f5bda66a5d81c673983e8e20822b28a37afae00c9319fff9bf5f684e417b799afd92ee51f3d44822d9954640f63ce75d846dbb4868c4a4a22
 DIST fcitx-data-en_dict-20121020.tar.gz 630491 BLAKE2B 2df897b1c9fb3a2ce186ee590e5f3ccbc7930f047218bf0fefa317f74b3287fc0be9c393d3310fe07208379118ec4c46608a1c703ef37b3aee65b2d790cb7f0d SHA512 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
 DIST fcitx-data-pinyin.tar.gz 1608886 BLAKE2B 3b7e72559bb838b4f2245e6faf2d627df17e9383ef8fe382e10333c1a95d79409ec042caa7d77c9bcd956b1c5d5456dab9d82208cd89d90e2be759c76f56f3d1 SHA512 1ee19eed3ee58be6cd6562ec363fe3bf630fff5e8820b3bfdd6d4618fceb082695e888dec5366a3685d58706f720e19319d891c223227237aed12674ea982131
@@ -10,6 +10,6 @@ DIST fcitx-data-py_table-20121124.tar.gz 186822 BLAKE2B d696413f2e88f1ca87938d63
 DIST fcitx-data-table.tar.gz 4144686 BLAKE2B 696845bb234915a364d614d47cc3baf8421a12ca1778611b0843e52e651da98b5ed9f3e0c9895a829b67f1bcceb1f982a7f6606c8a2d383af8c4573a150c71ef SHA512 99e1d69c679355fcf3e117a1ef39b131cbd3af841387d2335757247d840b90ff6b7323e16fca98cf7a043033faf250d2e9c6d47b96845d18c278a0cf6f30fec9
 EBUILD fcitx-4.2.9.8.ebuild 4516 BLAKE2B 36287c47d7b88761335a7c0693a718a334bf9ae42ad7def5631b512f131a785e3e085a62a747dbe219f7a91c2a80f712a21b563770c1df2dcb54e4d19d631900 SHA512 1e990dfb1add9635e62ec2de6ea9845c753b71c5813799759cc432d5dc2aefa65bf97e59d68e190180821f509c687111ea7d91fa1eb23884d40906bfbaaab74d
 EBUILD fcitx-4.9999.ebuild 4427 BLAKE2B 7e341a0c33852dce669b4adda68e1677cd7a947140d571aba8f8bbdf965ee3737badc9fdd5fc0e76ad7fe647648d74a40b22b3821b435716bd64431a9ba40abb SHA512 4ab850f1a6a315107bdd0c194eb65c1ba9975c2de227b7e623fa3835274aba5b20fa8e3282523ec89aba2343a6f4286eb6d70ff13b9b625155e4dd2f7f3b5cf4
-EBUILD fcitx-5.1.8.ebuild 2493 BLAKE2B c7bb4083c311f373547d907e806049fb95cba5c4821cdd10cdf8403c03c30302310d7ec07909fb65c4d174b99a0bb554abd5e576379be153e10a66bb1a1a7d05 SHA512 8b73942228fb594ae659a50cecf0c2b7446d78dcd841e6fc9446bfa6acb6a87af29a4e6ac20eec1285369779768796a596873d2289b569507bd0e0ef732a03d2
+EBUILD fcitx-5.1.10.ebuild 2504 BLAKE2B ddcfc8147db0b5d0e9b684cf1072f0f11b98ed10cd079d67570e9e73257f466403eccc837910c18bebbcb3a7882918cbaf77e2c53ddfb57cc9d52bb4077b93cd SHA512 322adf776be5288ee02935662ea6e0325e854db8351d6681eda829e23e6985ef1f4b36ddc5cb04fbc0fadbda66ca5f8b02d4f3b3195cf8f082c4618ac1bd8b38
 EBUILD fcitx-5.1.9.ebuild 2504 BLAKE2B ddcfc8147db0b5d0e9b684cf1072f0f11b98ed10cd079d67570e9e73257f466403eccc837910c18bebbcb3a7882918cbaf77e2c53ddfb57cc9d52bb4077b93cd SHA512 322adf776be5288ee02935662ea6e0325e854db8351d6681eda829e23e6985ef1f4b36ddc5cb04fbc0fadbda66ca5f8b02d4f3b3195cf8f082c4618ac1bd8b38
 MISC metadata.xml 1817 BLAKE2B 23b8efdb7c6dcf2eb7429de4f3bb0961884703131eb7d05a68bd99c5d43b62dfe6b3c60690e1b12edd296fb0643334aa93bf0a1b14f9aaf678602ed04fa875d9 SHA512 aaccb606992c91aea5141849cfe70db50c4bcad3f67764827bbc2fc3bfda0469771c052ac918222530cb3dd8ac823fe04fce797aab9bc4f27e94c1e78a53fc64
diff --git a/app-i18n/fcitx/fcitx-5.1.8.ebuild b/app-i18n/fcitx/fcitx-5.1.10.ebuild
index 3e0b4a144558..5d1c1f236db9 100644
--- a/app-i18n/fcitx/fcitx-5.1.8.ebuild
+++ b/app-i18n/fcitx/fcitx-5.1.10.ebuild
@@ -5,12 +5,13 @@ EAPI=8
 
 MY_PN="fcitx5"
 
-inherit cmake xdg
+inherit cmake unpacker xdg
 
 DESCRIPTION="Fcitx 5 is a generic input method framework"
 HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5"
-SRC_URI="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${PV}_dict.tar.xz -> ${P}.tar.xz"
+SRC_URI="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${PV}_dict.tar.zst -> ${P}.tar.zst"
 
+S="${WORKDIR}/${MY_PN}-${PV}"
 LICENSE="LGPL-2+ Unicode-DFS-2016"
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
@@ -20,6 +21,7 @@ REQUIRED_USE="
 	X? ( keyboard )
 	wayland? ( keyboard )
 "
+
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -72,8 +74,6 @@ BDEPEND="
 	kde-frameworks/extra-cmake-modules:0
 "
 
-S="${WORKDIR}/${MY_PN}-${PV}"
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DBUS=on
diff --git a/app-i18n/libime/Manifest b/app-i18n/libime/Manifest
index cae21d04d308..19b83679c517 100644
--- a/app-i18n/libime/Manifest
+++ b/app-i18n/libime/Manifest
@@ -1,5 +1,5 @@
-DIST libime-1.1.6_dict.tar.xz 36441068 BLAKE2B b10fff3c145fe96be0537c9934ffbbe2f0cea70df0bd4a3d517cfb74cbc976202846b14396c4f04097ebd24d268b3df7208113dbcd4dc0cd39fee7918381ec2d SHA512 adb7570c4d62ea94c8c38ab79a2a26700882088b518b6b7d6e16b0808d30ec751ee78d5084270adcacdeb4f3bace60332c4d67388eebfbf73627d22b30651bc4
 DIST libime-1.1.7_dict.tar.zst 37060247 BLAKE2B 1d81110e40844ad4e8b78445afbea7c7310150e75723e011bbc67e6cf75993197569f17192e4b4134e5bd99b0e5947d49fd6a622f02cd6df17cb176b23d31510 SHA512 67b69fe33e2a55cf9f82c668f3c97929fe8a0531e1540fa593ef15535ba66e079171928a54b268638a1d5fd14901f47500d1a6f79ad0e28f7f81e426f1384b42
-EBUILD libime-1.1.6.ebuild 936 BLAKE2B d09eb5bf17e1a396a50fb4f4287368b8811e3355c0f4960bd07cd96381c183d5a170b2fa38319bde82b36ea3f3301e290ba4f103307622e56b96ccbbe84dd363 SHA512 58640c2710071a85a3cc1cf4888c401672d96ee293cd4566bf7b0f975eb81cb8d7d1fdc36db28f596a484d817096c70deee51afd2d4720ee8dbb404389959404
+DIST libime-1.1.8_dict.tar.zst 37061630 BLAKE2B e76ee4d403bdc2ef9c9eab663f6da3f1421d5aeb7761a1ccca21acf07626f27a9f00c0a8d83cf121a782c03252bd5f0aeccb81af639ca93902bb28716a1a3afb SHA512 5fa6683dcaa92d754b87ed01989a7a98eee9d4ee642720b1ac1b0b58416a6202ca929e2593dfe59ae361afb7d311d8e238a188530ba99db7aaa3164713c95a4a
 EBUILD libime-1.1.7.ebuild 946 BLAKE2B 04d1e70581f0426a039e8994f4a4efd4db537792dd5bcbddef8991204171cf5c67116374797eb7004e003312176d3d9e3796107457e183388dc3e82d1c5f78d0 SHA512 9d03ce6b8a66bc3ac8667cc906e510089a631c9d93c6eb19d3ee58cc9acfcc3c419b6e5e1d5fd4f68016d0554f02158a0cbce958c7de1b460170289b7ce27a74
+EBUILD libime-1.1.8.ebuild 946 BLAKE2B 04d1e70581f0426a039e8994f4a4efd4db537792dd5bcbddef8991204171cf5c67116374797eb7004e003312176d3d9e3796107457e183388dc3e82d1c5f78d0 SHA512 9d03ce6b8a66bc3ac8667cc906e510089a631c9d93c6eb19d3ee58cc9acfcc3c419b6e5e1d5fd4f68016d0554f02158a0cbce958c7de1b460170289b7ce27a74
 MISC metadata.xml 624 BLAKE2B 7c0e1d29bf86d256ac8ace1404f3ef8e017171cf461f861b2b681c9bb6c7c3bb639b13cbdccc506a07805ea9e23f449e22bba1ac16d3f40ecdd10b894ea0632d SHA512 8449b74e190a0acf83f4e5b0c0ed023e5a37e203a4e514074b9e8165616c43659d993e165bb170aa8902865166a7ceaf65bec04645be7b1390ddc80c2e43066a
diff --git a/app-i18n/libime/libime-1.1.6.ebuild b/app-i18n/libime/libime-1.1.8.ebuild
index 93be98f71519..fd371c42c371 100644
--- a/app-i18n/libime/libime-1.1.6.ebuild
+++ b/app-i18n/libime/libime-1.1.8.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake unpacker
 
 DESCRIPTION="Fcitx5 Next generation of fcitx "
 HOMEPAGE="https://fcitx-im.org/"
-SRC_URI="https://download.fcitx-im.org/fcitx5/libime/libime-${PV}_dict.tar.xz"
+SRC_URI="https://download.fcitx-im.org/fcitx5/libime/libime-${PV}_dict.tar.zst"
 
 LICENSE="LGPL-2+"
 SLOT="5"
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index 7bdadd3796dd..ad6602f8e3a8 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/tuxedo-control-center-bin/Manifest b/app-laptop/tuxedo-control-center-bin/Manifest
index 549280167174..c8244cc2a814 100644
--- a/app-laptop/tuxedo-control-center-bin/Manifest
+++ b/app-laptop/tuxedo-control-center-bin/Manifest
@@ -1,6 +1,8 @@
 AUX tccd.initd 673 BLAKE2B 418e8a473ca8592c7de313a4a18a71172555ed3a79cb7c5f22dca8932883ae0190c091d0585773d3a5ceec6637611740744fdaa4542b00edecbc04e00a39eab0 SHA512 d08f4e4b11e9a1b62c5694fba862cd6fc223e2461a93272fd7085daf7f7942cf15dad0f9370257d19f9252e2d38c82c15de4d311cc037326edf6dc4f05e2bebd
 DIST tuxedo-control-center_2.0.2.rpm 80479580 BLAKE2B 7c83fd64ee8d7ca8b50e3634d36567d3a930656c5e34f23fd7b703bc560d35376701df081aaa5d09692df61689a5a81ec87a8a4a8d55db2cc2577c638d02731b SHA512 e9c9abfc2c0d0e226038f49d388a31625120f6780558b7606e719be61a4563c698e4c46d6f0d6a3e774179a5f5785dc07ff243901578da474dfa80cf71fe0394
 DIST tuxedo-control-center_2.0.8.rpm 80495472 BLAKE2B 30ff8c5073b42299b4def5958254393727957b4289958bf486520fc6bad83184f3f8fc5baf97d2040ecfa551cafe8b2225b15cbbc8a6012113a9a64471a13aa6 SHA512 6f24394d1eda91e5a58fae29926f42271350917c9222062d99967f42f465e8769e6c50510967923612eb54d5c2921512adc4e6a5c743b922197e2603d6bc5c9b
+DIST tuxedo-control-center_2.1.8.rpm 81160628 BLAKE2B aa50c9b2fd6e6a0b0a996fcb0243c57fe5cd3d82e5e0d372c46a409a3bef51c52e45c0ccab30cb430907cdb8dce28019297d5bb6f359a9bfeafd804d4ae48295 SHA512 0caf10c24b54e943dd465a9f87b74916da5f2424ddf57a2a50d6a3f38b19d83d0b2512982b36db2cb8d07b632fc16b999904a2b447f80507b6af33a40a01c22e
 EBUILD tuxedo-control-center-bin-2.0.2.ebuild 2206 BLAKE2B b2a69cdea975ea148911434fd209acc90c7a952635532fdc27eb9f97371ff89f6d9040928ec3020550d4f3ab9b6a2d4a233b96f9faa3b3b22762a8cb534c1799 SHA512 ccc8091d53a6e1ad87caed0118615c3bd86bd31d504f884bc14c2bafaea76980e4538b05dd17a860b77956d7e788217f0be852d1565a9ee9427429d10d0569b2
 EBUILD tuxedo-control-center-bin-2.0.8-r1.ebuild 2535 BLAKE2B 71cecfcd25c0f54cbbd2a6635f7f6ba841c5e950d0ffd7e10a0a90ccbc69419dbfa70ef20d18ee49e560d09737699d72639ad44531326553a41de612c93a8d22 SHA512 81c451f1b0d06bea9162382cf6839a9a26d37bfa88b1445057be6a062854584e3440bd43e0d7e6021c5b9d6d93119a733104eb05b6a53e3bf8f1973f65f2655e
+EBUILD tuxedo-control-center-bin-2.1.8.ebuild 2536 BLAKE2B 5b019081bd8f87729b84e981b1acb428879304e432dec587c2eb0c9eb77c6cbab43690ccde32ca51fc7b893a6fb9847de1a71456e2f4c665e4eabebbec6cb594 SHA512 d403c6b52a7956931c4beafe169e647de65258395796f60c3c1fe0cd87898cfbbab2da553fa99b3322304529c6615e2f2118fe20088afa084d59641746364b2c
 MISC metadata.xml 353 BLAKE2B 47a9f99d0e75bc84826b971868085f87ea41b27b43ac799022ca946a95bd2ec17709c4f8a3348da857be5868dacf4c0054370bea19b58c97fa18ac692266a1db SHA512 23a55745ddd0bff3320be5c5fbd81d2db654b06a5b899a71b12aa1d11d6b17e6a7ac209237cbd4181b1586e33305bd45397b843f608dbc93c4dd12516f23c88e
diff --git a/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-2.1.8.ebuild b/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-2.1.8.ebuild
new file mode 100644
index 000000000000..374b1c614f5a
--- /dev/null
+++ b/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-2.1.8.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit rpm systemd xdg-utils
+
+MY_PN="${PN/-bin/}"
+
+DESCRIPTION="Tool to control performance, energy, fan and comfort settings on TUXEDO laptops"
+HOMEPAGE="https://github.com/tuxedocomputers/tuxedo-control-center"
+SRC_URI="https://rpm.tuxedocomputers.com/opensuse/15.4/x86_64/${MY_PN}_${PV}.rpm"
+
+S="${WORKDIR}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RESTRICT="strip splitdebug"
+
+DEPEND=">=app-laptop/tuxedo-drivers-3.2.14"
+RDEPEND="
+	${DEPEND}
+	app-accessibility/at-spi2-core
+	dev-libs/nss
+	dev-libs/nspr
+	media-libs/alsa-lib
+	media-libs/mesa[X(+)]
+	net-print/cups
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3[X]
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libdrm
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/pango
+"
+# See bug #827729
+BDEPEND="app-arch/xz-utils[extra-filters]"
+
+QA_PREBUILT="opt/tuxedo-control-center/*"
+
+src_prepare() {
+	default
+	rm -rf usr/lib || die "could not remove usr/lib"
+	mkdir files || die "could not create files dir"
+}
+
+src_install() {
+	insinto /
+	doins -r usr opt
+	find . -type f -perm -a=x | while read f; do
+		fperms 0755 "${f/./}"
+	done
+
+	dosym ../../opt/tuxedo-control-center/tuxedo-control-center /usr/bin/tuxedo-control-center
+
+	insinto /usr/share/dbus-1/system.d/
+	doins opt/tuxedo-control-center/resources/dist/tuxedo-control-center/data/dist-data/com.tuxedocomputers.tccd.conf
+
+	insinto /usr/share/polkit-1/actions
+	doins opt/tuxedo-control-center/resources/dist/tuxedo-control-center/data/dist-data/com.tuxedocomputers.tccd.policy
+
+	systemd_dounit opt/tuxedo-control-center/resources/dist/tuxedo-control-center/data/dist-data/tccd.service
+	systemd_dounit opt/tuxedo-control-center/resources/dist/tuxedo-control-center/data/dist-data/tccd-sleep.service
+
+	newinitd "${FILESDIR}/tccd.initd" tccd
+}
+
+pkg_config() {
+	ebegin "Reloading systemd"
+	systemctl daemon-reload
+	eend $?
+	ebegin "Enabling and starting tccd.service"
+	systemctl enable --now tccd
+	eend $?
+	ebegin "Enabling and starting tccd-sleep.service"
+	systemctl enable --now tccd-sleep
+	eend $?
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	elog
+	elog "You need to enable tccd and tccd-sleep service before running tuxedo-control-center"
+	elog
+	elog "For your convenience, if you use systemd, you may just call:"
+	elog "  emerge --config =app-laptop/${PF}"
+	elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-laptop/tuxedo-drivers/Manifest b/app-laptop/tuxedo-drivers/Manifest
index d0d6172abb5b..ea0d23176467 100644
--- a/app-laptop/tuxedo-drivers/Manifest
+++ b/app-laptop/tuxedo-drivers/Manifest
@@ -1,3 +1,5 @@
 DIST tuxedo-drivers-v3.2.14.tar.bz2 55567 BLAKE2B 4104c76f9bb7d1f5887caad8a4bec90531a85397b642baced65130159e91e304c68896ea2dce173ee0ec31742e2786b976411a75464d9560e338ea16f18a9766 SHA512 edf0c1a4161a4a4fc09882d0905556299ec62358d9c32e716b1ad0daf230b8de9ec026daba97a964fe4a1e757eb860669840b4e9219ede42043e39eef2fc2ec8
+DIST tuxedo-drivers-v4.5.0.tar.bz2 57633 BLAKE2B 3796aaa7504c21c444f86dadb4b6cfd2e07a916fb105043fc9252693bb15aa763b9dea3f0d27326098159fc79b1be01dadf4adf975b9bf9ff53da90248b3e781 SHA512 e86afb855958ce74662649b948632f08ec1cb597f150d603bbef3cd8ef351cc219c798c4e884196f4f8611bb08e5ca4faad6307b0db243fd38da2f5008815cee
 EBUILD tuxedo-drivers-3.2.14.ebuild 750 BLAKE2B 1a739611ef4399596af03f97d14597d834518f2619542721fcb3deb571307f7db694255eda75a4477d6c93b188873e8e07c632f5e11f888c2fabe29817ffab38 SHA512 4cf334873eafd495d2dbaca7039becf9a94e1c55a439e0b02a80cdd9b4733084d2958a725da29a57944a9539f39ecd91c200d1825be987b83a941ff4ca302287
+EBUILD tuxedo-drivers-4.5.0.ebuild 1603 BLAKE2B 286f18e449fa3e480729aee5fec87ea40d865f4177b08fd7b8139d909b8ddf3961321b19e2a67f5e97504408f3b0fa11455162c876bff6e287f728351c132141 SHA512 315ad1c732be1c0a15ac10887945033d3b948ae905637248b4083a80dcba4d3b77b1d2c0d1dd5a3042629ce45da7ba0b03b862cc9f25cb167bf7b86c1293a2cb
 MISC metadata.xml 377 BLAKE2B 71b506a1855b9c50eadf9900181f42e9e07190fd9a420fcf3f79f2672dea73997c4cd5cbd61e4a1ee8491190e5cf788fc74999179334c20230ae2b9aa10776b0 SHA512 41f5c9c71ac682008251a2d6b7a0349f32d70b42ddf215617ac1144710fcc5e591864f1a5c3f6b5b54c1e36f311469d1d1d4cbc6840e89097ab95c828ed78d1e
diff --git a/app-laptop/tuxedo-drivers/tuxedo-drivers-4.5.0.ebuild b/app-laptop/tuxedo-drivers/tuxedo-drivers-4.5.0.ebuild
new file mode 100644
index 000000000000..cea02b685550
--- /dev/null
+++ b/app-laptop/tuxedo-drivers/tuxedo-drivers-4.5.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+CONFIG_CHECK="ACPI_WMI INPUT_SPARSEKMAP"
+
+inherit linux-mod-r1
+
+DESCRIPTION="Kernel Module for Tuxedo Keyboard"
+HOMEPAGE="https://gitlab.com/tuxedocomputers/development/packages/tuxedo-drivers"
+SRC_URI="https://gitlab.com/tuxedocomputers/development/packages/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=( )
+
+src_compile() {
+	local modlist=(
+		clevo_acpi=tuxedo::src
+		clevo_wmi=tuxedo::src
+		ite_8291=tuxedo::src/ite_8291
+		ite_8291_lb=tuxedo::src/ite_8291_lb
+		ite_8297=tuxedo::src/ite_8297
+		ite_829x=tuxedo::src/ite_829x
+		tuxedo_compatibility_check=tuxedo::src/tuxedo_compatibility_check
+		tuxedo_io=tuxedo::src/tuxedo_io
+		tuxedo_keyboard=tuxedo::src
+		tuxedo_nb02_nvidia_power_ctrl=tuxedo::src/tuxedo_nb02_nvidia_power_ctrl
+		tuxedo_nb04_kbd_backlight=tuxedo::src/tuxedo_nb04
+		tuxedo_nb04_keyboard=tuxedo::src/tuxedo_nb04
+		tuxedo_nb04_power_profiles=tuxedo::src/tuxedo_nb04
+		tuxedo_nb04_sensors=tuxedo::src/tuxedo_nb04
+		tuxedo_nb04_wmi_ab=tuxedo::src/tuxedo_nb04
+		tuxedo_nb04_wmi_bs=tuxedo::src/tuxedo_nb04
+		tuxedo_nb05_ec=tuxedo::src/tuxedo_nb05
+		tuxedo_nb05_fan_control=tuxedo::src/tuxedo_nb05
+		tuxedo_nb05_kbd_backlight=tuxedo::src/tuxedo_nb05
+		tuxedo_nb05_keyboard=tuxedo::src/tuxedo_nb05
+		tuxedo_nb05_power_profiles=tuxedo::src/tuxedo_nb05
+		tuxedo_nb05_sensors=tuxedo::src/tuxedo_nb05
+		uniwill_wmi=tuxedo::src
+	)
+	local modargs=( KDIR=${KV_OUT_DIR} )
+
+	linux-mod-r1_src_compile
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 2ba8e166fffc..dc159c6f89f3 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/grc/Manifest b/app-misc/grc/Manifest
index bc8cedc8a4e3..a30619204e12 100644
--- a/app-misc/grc/Manifest
+++ b/app-misc/grc/Manifest
@@ -1,3 +1,3 @@
 DIST grc-1.13.tar.gz 49224 BLAKE2B d2c32d42ad1bd20c7d2b2aa68da114410e625463d30f0b93644cec4ddc69241d7f3c7a5f7edaed9fe42a1d21e8a0e5668403491d09679995558c94649b9d6fa8 SHA512 d8a7e78f84f5cb925a0205a81a9564ffe3d688eaa1f90d335a6f40e17757866374b6927f223e888a358586830b3feb4779f60faa01097b0c9703793ceea3de43
-EBUILD grc-1.13.ebuild 1374 BLAKE2B c802fdbefee5a53f067712f2ed1c28b28e1f1afc04a4906662993cd4510f0756fe9b0f31016a126269333764a1978fcaded3d9c81b0c7b0e6f8762b449b6a690 SHA512 1e55eab82c310d9d1d3748cb5594fab20655b8378966e75c206b0fcfbcf23f49fa80e6a33a94429a6c8b95afcd7110612342e7d940c2b52288d8c7046de301d1
+EBUILD grc-1.13.ebuild 1375 BLAKE2B 514247d61eab0ff737b728d28ce8f2e9a2d6fad4790a2e1f95be0dcdc13a71e6f192723ba3aa478197b4b18b51646146c3b7ec302049363268542a0c960a6aa1 SHA512 a91d95910143de4fbe1414edb309b5e52a7a576eb80ff7c80de993b51f3fefe09148babe9f1e2c28fc130bbde1baf3f53002ed926426ae44ba14c123ce607243
 MISC metadata.xml 366 BLAKE2B 0abe5b9109335434db8f89e50fa987ec443c70a6b0c9073808c162b795a76357129bde9ca716dea7df51a5511db75639c3e1be2c1d1a35b3f0a4f412cd2340d3 SHA512 b44e11c62ae90d0c3bfdaf3d206dc40720dc6a611aa786734e46a5542bc666d29977828285f4234581546f554d32abbc3b6fe10cc009ce39ff1f80672df775d0
diff --git a/app-misc/grc/grc-1.13.ebuild b/app-misc/grc/grc-1.13.ebuild
index 3a0a275e7c4a..911cd77fb1a5 100644
--- a/app-misc/grc/grc-1.13.ebuild
+++ b/app-misc/grc/grc-1.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit python-r1
 
 DESCRIPTION="Generic Colouriser beautifies your logfiles or output of commands"
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index 2bb4fb03072f..f660876db60c 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1,3 +1,3 @@
 DIST hivex-1.3.23.tar.gz 738076 BLAKE2B b536e1b4b930b88b4bbbf8a4434e5ed7d407409acdbe68f7da67fa8198e1813bf84e918505eca7d341f15b41daeb0bbcfc974868a68f999e26941db759557fd5 SHA512 068fe81a442c8045bf9d98f0c6b782330141d8f1e104a0f191c04a2cff25ee6396c2c4777c107d595a471eb4bcbee903400c9f7946cae036165ac201587f861e
-EBUILD hivex-1.3.23-r1.ebuild 2833 BLAKE2B 3e78940756f570c1e7956631f12b3764aaaf9c53bb1f3e02d33c205db2e9d9969e68058e44c67437f5313ebb51c4be2ee2ae24b3ba1819f6062047641ac058a0 SHA512 235968bf692f6005961076c4354020a013fa4eb4e824efc9630732c495b530eecf705410366c4d7eb32ef41c035c01087c490aab3e6894226168c9183c41b0b0
+EBUILD hivex-1.3.23-r1.ebuild 2820 BLAKE2B e2638d3d64eae9023bac3ff3280d458e485e663d68197419b36bcf67e71d71830efce52e6454c1495d54bcb679b7fba2ff2414b5c32528a61fb3edf70592acca SHA512 5ebea5aafbe5a3baeda369ff3d4390b1d3496fd71673fc6c51778eaa440503b0efdb9feeeea72ee64ef148b551fdbc553da10a8fdbbc8b67f18903b699011cc7
 MISC metadata.xml 249 BLAKE2B 6f4e10a8e257d2bb0d3eb8396ec0a4cf29d381ab118c8ef082dff01403cd79db12de157a1e35f0823aead216efcdcf7eab982cf326ad0fe149e9e0cabc205159 SHA512 b32d21b3e68e122d51c5c344f88095410c2b7e9cba5714579c087a2348bb45b0cb542abfec0f6902b205a60e045595c9ab5474694c1ea4bbb0610d4c5a89867f
diff --git a/app-misc/hivex/hivex-1.3.23-r1.ebuild b/app-misc/hivex/hivex-1.3.23-r1.ebuild
index ef1a1dd17ef1..91e11388b727 100644
--- a/app-misc/hivex/hivex-1.3.23-r1.ebuild
+++ b/app-misc/hivex/hivex-1.3.23-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32"
 RUBY_OPTIONAL=yes
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit perl-module ruby-ng python-single-r1 strip-linguas
 
 DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
diff --git a/app-misc/piper/Manifest b/app-misc/piper/Manifest
index 860bf6b15ffa..513f5335692b 100644
--- a/app-misc/piper/Manifest
+++ b/app-misc/piper/Manifest
@@ -1,8 +1,5 @@
-AUX piper-0.6-fix-tests.patch 3225 BLAKE2B 17c04a07581ee097ab828bcff67dac74d236ba6b3f6f35307fb51bbbd6b5331f4d2bb49a1605f5bb92c1dfe03d0815c66d449c579d59f66511f6b42faa099168 SHA512 5767a9a4745c9ff8c0d44f69d10c843d8494eeff2c1281809d356d6854652a73e2d713c3376733de9afc2413b5c6faaaf6995a1092f777ddcbb7341f42700342
 AUX piper-0.7-fix-tests.patch 3238 BLAKE2B 289ef09b85964cee3085403e1f26dca52ee29e685c67f46cebf393798712e24b68eec1e325ce506a0961501064e888d7babd4c2a2159b8a5cbc8674fe08531c9 SHA512 0075e11f27172b753977eec0f94a3197a9cd68e3f55c6e18b91a0577440555bc940bb61eae56a778fa943e2a3c54ef21dee8c619efde49653b71fc436c5b1ce8
-DIST piper-0.6.tar.gz 254653 BLAKE2B ea621e556e2ee6a98e334f2e61df70d700a9cb371dcd5bddc690b4a4c97543a6957bc339bddbde2cf91ac3b201d3bd70fe336974f17e36cfdcbb4895257af993 SHA512 9d76cbc5f3a91c68d10355a1b429c05873effcaa80086fb51c7d4a7bdbbb3e0faf42ec8ccad611a15f5c954d3014a8416e4a497c86167c227818771a24d108a0
 DIST piper-0.7.tar.gz 271658 BLAKE2B 8d3d411cc771a286ae0d7654b6d70f394e11edb182924619195b947d0d54df4db308e94aceebe0754ddd446538f1dce2ccb88dbf1cd44595b614d852e7394698 SHA512 fcbc30a4954ea6b0aa67c66052eab1e6b2d3039c927eeddcfc8b03d00f1c91e8f0ae80788ba0e4f053a612b03f594e74fd119dd11f52dd47608c99602e7e4940
-EBUILD piper-0.6.ebuild 1307 BLAKE2B ee3b8d47a1e3eca421244319196af651bf7cd8735332349100bb80cb0f40306a3ad8f01867ca3bbc81322fbb886737e29114415e6a4dcab657892c6f0e7e1e2e SHA512 f439dc02bf480a173409bd1cb0f5828b6546724a51de24721d7cc38e551830d9d5f6bf6412cace499fb4c5e9e7a9ca12c07116f5f00e5541692ad5a44fa97a50
-EBUILD piper-0.7-r1.ebuild 1505 BLAKE2B fa7d49c3b254523cca097faca0bb9e9d2677753b6224a45109d065ff6eec1daf7ae70a12fdea821f6d8628f4db6a5e21de04ca7a898b5df9ce2d7e6d619517e2 SHA512 60a98d1e9dd2a424ac889587d9b859e9d46d6e2fd9782dd24348fb8ab7a006e77e86a04fb0105002e517a059116bb46f8ff4815d93ec76f2d855e7439c1ae927
-EBUILD piper-9999.ebuild 1405 BLAKE2B 84dbe91fc7e295d35fdecb2e09bc37d66990b5ae545f92f1a2530855a16b401415d1ea8ee678398d1f3493cee7cf15a5845967e7c6a6b490d25f404ea734b18c SHA512 1ffb37ac0a22dd30ff7c68179fd2311f8decdb40f9d16ef39e58e738c342188c3f1bc40d0010a56d83420ab74302384db8a3619b6ddf549180469474623ddda6
+EBUILD piper-0.7-r1.ebuild 1505 BLAKE2B 92ccae5f689fb0fbb733da2435f288b1c707ea83911064af3e720249430e98b6d5ecac8712e36ff6b2f136f5c8081ca6121dbe7e4e2ca4124ea26f96dd3bdc56 SHA512 6b14cee36f57bd0b2f1ba9a647304009d9ecd31befdad84e956f4cff6a3328aee11543fc696b031a68119ef957311227cf2755c47d63aa364ed9b1a8ecf4b0de
+EBUILD piper-9999.ebuild 1406 BLAKE2B 43d8334feaa6eed0e53480947609f73117de3e32a5801f190bf864f2d61b8703dd7f4033b7779d2b8e90a6cb53efc862cc323f9eba3eeae7da3f60f8651277ef SHA512 f3d9be4fc0b1e739c6d67dfc483268ee09e4a3a273f21ba2dc50e6b7b2d3407c148746514f5780edf73853a35dd2fea468485b0f1653c87b7a79d4936224d3cb
 MISC metadata.xml 1076 BLAKE2B 4c00bb84f4267ec8cad1f915ca0ed6ef35144aa8039eb8fde7a0674dde5320eb29ffc0ed840dd8dcf68af5663ab9816e779f05b492863bdc73305e878cf90e71 SHA512 44c9ef8d2171a168a116425d05832b58bd8490348e00d3d875fca2a957008cbc154fb7b66add99a4b1ff323aaf4cca716e25d47e3376b12188c85c67971ee70e
diff --git a/app-misc/piper/files/piper-0.6-fix-tests.patch b/app-misc/piper/files/piper-0.6-fix-tests.patch
deleted file mode 100644
index e4a358e0ab59..000000000000
--- a/app-misc/piper/files/piper-0.6-fix-tests.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Upstream commit https://github.com/libratbag/piper/commit/603d68726364cea5e71ef1f0153e3641ec889063, backported to 0.6
-Bug: https://bugs.gentoo.org/827510
-Bug: https://bugs.gentoo.org/834967
-
-From 603d68726364cea5e71ef1f0153e3641ec889063 Mon Sep 17 00:00:00 2001
-From: Tobias Kortkamp <tobias.kortkamp@gmail.com>
-Date: Mon, 1 Aug 2022 15:57:28 +0200
-Subject: [PATCH] Fix tests for out-of-source builds
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When the build directory is not _under_ the source directory then
-flake8 cannot find the local config file and it will try to check
-piper.in which fails per 1ed66262b77ebd9fe188894d36842527da39508a
-
-To fix this I propose to
-
-1. pass the config to flake8 explicitly
-2. remove piper.in from the args list since it is excluded in the
-   flake8 config anyway
-3. check the generated $build/piper.devel and $build/piper too per
-   1ed66262b77ebd9fe188894d36842527da39508a
-4. merge the --ignore in meson.build with the config
-
-Steps to reproduce:
-
-```
-$ meson ../build
-$ ninja -C../build test
-...
-[17/18] Running all tests.
-1/5 piper:all / files-in-git             SKIP            0.01s   exit status 77
-2/5 piper / validate appdata file        OK              0.04s
-3/5 piper / svg-lookup-check             OK              0.10s
-4/5 piper / check-svg                    OK              0.18s
-5/5 piper / flake8                       FAIL            1.00s   exit status 1
->>> MALLOC_PERTURB_=32 /gnu/store/yhhvrj6bns3ws85d338ah3bsc8jv4x64-profile/bin/flake8 --ignore=E501,W504 /home/tobias/ghq/github.com/libratbag/piper/piper /home/tobias/ghq/github.com/libratbag/piper/piper.in
-――――――――――――――――――――――――――――――――――――――――――――――― ✀  ―――――――――――――――――――――――――――――――――――――――――――――――
-/home/tobias/ghq/github.com/libratbag/piper/piper.in:11:19: E999 SyntaxError: invalid syntax
-――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――
-```
-
-diff --git a/.flake8 b/.flake8
-index 8f1ba6f..170b294 100644
---- a/.flake8
-+++ b/.flake8
-@@ -1,3 +1,3 @@
- [flake8]
--ignore = E402,E501
-+ignore = E402,E501,W504
- exclude = .git,__pycache__,build,data,piper/piper.py,piper.in
-diff --git a/meson.build b/meson.build
-index 180a552..a4c73a1 100644
---- a/meson.build
-+++ b/meson.build
-@@ -135,8 +135,9 @@ if enable_tests
-     flake8 = find_program('flake8')
-     if flake8.found()
-         test('flake8', flake8,
--             args: ['--ignore=E501,W504',
-+             args: ['--config=' + join_paths(meson.current_source_dir(), '.flake8'),
-                     join_paths(meson.source_root(), 'piper'),
--                    join_paths(meson.source_root(), 'piper.in')])
-+                    join_paths(meson.current_build_dir(), 'piper'),
-+                    join_paths(meson.current_build_dir(), 'piper.devel')])
-     endif
- endif
diff --git a/app-misc/piper/piper-0.6.ebuild b/app-misc/piper/piper-0.6.ebuild
deleted file mode 100644
index 5b9840cc142a..000000000000
--- a/app-misc/piper/piper-0.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit meson python-single-r1 xdg
-
-DESCRIPTION="GTK application to configure gaming devices"
-HOMEPAGE="https://github.com/libratbag/piper"
-SRC_URI="https://github.com/libratbag/piper/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/flake8[${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/gobject-introspection
-	>=dev-libs/libratbag-0.13
-	gnome-base/librsvg[introspection]
-	x11-libs/gdk-pixbuf[introspection]
-	x11-libs/gtk+:3[introspection]
-	$(python_gen_cond_dep '
-		dev-python/evdev[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	')
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/libevdev
-	virtual/libudev
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" )
-
-src_configure() {
-	python_setup
-
-	local emesonargs=(
-		$(meson_use test tests)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_optimize
-	python_fix_shebang "${ED}"/usr/bin/
-}
diff --git a/app-misc/piper/piper-0.7-r1.ebuild b/app-misc/piper/piper-0.7-r1.ebuild
index e4a385f02dd2..ec2d208c5f69 100644
--- a/app-misc/piper/piper-0.7-r1.ebuild
+++ b/app-misc/piper/piper-0.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit meson python-single-r1 xdg
 
diff --git a/app-misc/piper/piper-9999.ebuild b/app-misc/piper/piper-9999.ebuild
index 108c83fbd968..0631b1a08ae6 100644
--- a/app-misc/piper/piper-9999.ebuild
+++ b/app-misc/piper/piper-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit meson python-single-r1 xdg
 
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 94c4ed16ec81..68ce45888312 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 439717f53920..d65bdad5f620 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -2,9 +2,9 @@ DIST gentoolkit-0.6.3.tar.bz2 3186163 BLAKE2B 0f9befac53faa2b578b461a55c7113934a
 DIST gentoolkit-0.6.5.tar.bz2 3186457 BLAKE2B 7f873385b183e51b03e1c4be0edbabc89556e1b3a1dce2be71584c9ea927dd09185ba1022e570de0ed2a46cbb764c67f6eaccf97dc5892f4f355244bac7c0545 SHA512 cff9e7b1b8122941b03f7e156f25b5b416c5e4bbf1b759ecf006c271758f2548323bf59ba94a14f3268eea43081ccbba3ab63e118123af870c0257aaecbb9554
 DIST gentoolkit-0.6.6.tar.bz2 3187351 BLAKE2B f8add246e9d968c57a8d0e5c842a40a7646e92cc165ca611df35988ba55bd0221a26eefb351680f53e81adcf608a20eab604d0a9b9e52f936ebc7c20575c597c SHA512 73fc4b8d98dc118d3c505c49d94dd248c92d2bde883c130c65dcf814d200a165084e9c94713e93341e7c54b59b59db83279538440e0822902de688c135b8949d
 DIST gentoolkit-0.6.7.tar.bz2 3187598 BLAKE2B 54c576fa7ded310fae24100171e069bfc79c0f908199384d33cac34d49f62e5cac4bda3e7f93db1866f8d4cf75afb465d82038eebb4df27070e14e73fba65feb SHA512 a5fb73c9b43e74541ccbb0537f860b6623284b84feb8922c95b5b5dd1dbd3db5117cbc3f899483c1a99086fcd8ddf49f71b81475e29af9e8bcdd1255553501fe
-EBUILD gentoolkit-0.6.3-r1.ebuild 2917 BLAKE2B 1a0900a830b07288501ac28afbf865713bb9ef3d57a3c39217ba0285ee8d989df10714ce87af84a4688c0f20c6604bac4e426e914248c093cb508dca7243fa50 SHA512 6cef14ee2210941974246a5c68584e33892ed5fc9184dbd1e9acf750949850e2b16f9de59eebf5368382c04ff10507ec7ca797773dfd73a8eaa7859aad37cc06
-EBUILD gentoolkit-0.6.5.ebuild 2917 BLAKE2B f0419b47d5afca82187a066ed976dfbb09e9aa88849419fac1ec24e5faa3d1bf558e2f4684160c61e4536d9b162553a192ea1448d51c09278e72c346268b6358 SHA512 5d2bfb7b6ec0a4bef66d1a476b685f70d18142da150e9e9d47c0c34adcf49f2ef246fca2a8ce355abf660221b3d2c0e47f2401bdd28918370de4e9d281224892
-EBUILD gentoolkit-0.6.6.ebuild 3040 BLAKE2B 1101e213780706aa53f0192dbb827781351b9f7e2df25e7edccb043b1aa6365d42dc3bbf82f5de90cb942e3230f5f3090c5982bd8878d076ce9a47752397b523 SHA512 bcddfd1c5ceed9ba353c04c8081994c318a9a934142da0752c120264694697992e88b5c2f2e54d4725aa1c5520ff7a1735590eda227301b7c4d89712142f8942
-EBUILD gentoolkit-0.6.7.ebuild 3040 BLAKE2B 1101e213780706aa53f0192dbb827781351b9f7e2df25e7edccb043b1aa6365d42dc3bbf82f5de90cb942e3230f5f3090c5982bd8878d076ce9a47752397b523 SHA512 bcddfd1c5ceed9ba353c04c8081994c318a9a934142da0752c120264694697992e88b5c2f2e54d4725aa1c5520ff7a1735590eda227301b7c4d89712142f8942
-EBUILD gentoolkit-9999.ebuild 3040 BLAKE2B 1101e213780706aa53f0192dbb827781351b9f7e2df25e7edccb043b1aa6365d42dc3bbf82f5de90cb942e3230f5f3090c5982bd8878d076ce9a47752397b523 SHA512 bcddfd1c5ceed9ba353c04c8081994c318a9a934142da0752c120264694697992e88b5c2f2e54d4725aa1c5520ff7a1735590eda227301b7c4d89712142f8942
+EBUILD gentoolkit-0.6.3-r1.ebuild 2882 BLAKE2B cdb424adeadfa09664fb4d4402c0b232bf572ce29f0e69e2010f66a86aecc3038ddd099930a1cbf445fa202aa781a41c5886043f62d3c6c0dc8b6dd557c035a2 SHA512 73c1d50ddaa39ad7523a0851c6be9c426058dc4bc160d5bb284d5c1ad7fe1cbec79aeaacfd3b274c564b6574257c0541b76bded39c318dfc64a786b3f11c030f
+EBUILD gentoolkit-0.6.5.ebuild 2882 BLAKE2B 0fc5bc941e2c240bb0eff83068ddf87995f8affd6b8f7b83e46271b0e0302a20092ffa00a537a1b216fe5b44525d90bfdd536e8ac496cc632033b77ebe23b66d SHA512 74a5a94402ae06114bc4509e39c42aef376808068ecb8995992c51999c2c17d3fed865b258e68a232cf9b6269a5d70156e8eef795244cd272ac82a964631a6b2
+EBUILD gentoolkit-0.6.6.ebuild 3005 BLAKE2B 921ac48c126c9202866fee650e46b802123ebb933405a165338092e549cd41ed2c56121a6b8b7e384dd9b337f3309c35c807e585ef15ae555695d6bedb1fd2df SHA512 b218339fd79b8892acbf22647250fbd89ef83e8eb5e60ecf25657647af42e61746bd99e2a4143c7bb66c4faaeb561fcae09b96138e0410e5999667ec52aafc41
+EBUILD gentoolkit-0.6.7.ebuild 3005 BLAKE2B 921ac48c126c9202866fee650e46b802123ebb933405a165338092e549cd41ed2c56121a6b8b7e384dd9b337f3309c35c807e585ef15ae555695d6bedb1fd2df SHA512 b218339fd79b8892acbf22647250fbd89ef83e8eb5e60ecf25657647af42e61746bd99e2a4143c7bb66c4faaeb561fcae09b96138e0410e5999667ec52aafc41
+EBUILD gentoolkit-9999.ebuild 3005 BLAKE2B 921ac48c126c9202866fee650e46b802123ebb933405a165338092e549cd41ed2c56121a6b8b7e384dd9b337f3309c35c807e585ef15ae555695d6bedb1fd2df SHA512 b218339fd79b8892acbf22647250fbd89ef83e8eb5e60ecf25657647af42e61746bd99e2a4143c7bb66c4faaeb561fcae09b96138e0410e5999667ec52aafc41
 MISC metadata.xml 737 BLAKE2B 4145e08f0b544b2bd32a5322944bad4d019d5a693e23ace8d7b0592230c6660bf7ef4d1df4f8852745af7939c8e88e58aa04233d3a69a6e7ad624349b8e335f0 SHA512 28ec82f6a523f69d2c908b4e2cf9823ff8825e39a01187b74d37f90ee78cec751002cdf0786b177df048a5cb1c728bb29fc9f2f743b18200bf307eccdf052ce8
diff --git a/app-portage/gentoolkit/gentoolkit-0.6.3-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.6.3-r1.ebuild
index 36bae9f8dac2..12c98846bbf9 100644
--- a/app-portage/gentoolkit/gentoolkit-0.6.3-r1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.6.3-r1.ebuild
@@ -95,7 +95,6 @@ my_src_install() {
 	)
 
 	meson_src_install
-	python_fix_shebang "${pydirs[@]}"
 	python_optimize "${pydirs[@]}"
 }
 
diff --git a/app-portage/gentoolkit/gentoolkit-0.6.5.ebuild b/app-portage/gentoolkit/gentoolkit-0.6.5.ebuild
index 06657eae3abe..10786b3e8d2e 100644
--- a/app-portage/gentoolkit/gentoolkit-0.6.5.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.6.5.ebuild
@@ -95,7 +95,6 @@ my_src_install() {
 	)
 
 	meson_src_install
-	python_fix_shebang "${pydirs[@]}"
 	python_optimize "${pydirs[@]}"
 }
 
diff --git a/app-portage/gentoolkit/gentoolkit-0.6.6.ebuild b/app-portage/gentoolkit/gentoolkit-0.6.6.ebuild
index 5eb3d884baf5..d00878e10f08 100644
--- a/app-portage/gentoolkit/gentoolkit-0.6.6.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.6.6.ebuild
@@ -101,7 +101,6 @@ my_src_install() {
 	)
 
 	meson_src_install
-	python_fix_shebang "${pydirs[@]}"
 	python_optimize "${pydirs[@]}"
 }
 
diff --git a/app-portage/gentoolkit/gentoolkit-0.6.7.ebuild b/app-portage/gentoolkit/gentoolkit-0.6.7.ebuild
index 5eb3d884baf5..d00878e10f08 100644
--- a/app-portage/gentoolkit/gentoolkit-0.6.7.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.6.7.ebuild
@@ -101,7 +101,6 @@ my_src_install() {
 	)
 
 	meson_src_install
-	python_fix_shebang "${pydirs[@]}"
 	python_optimize "${pydirs[@]}"
 }
 
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index 5eb3d884baf5..d00878e10f08 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -101,7 +101,6 @@ my_src_install() {
 	)
 
 	meson_src_install
-	python_fix_shebang "${pydirs[@]}"
 	python_optimize "${pydirs[@]}"
 }
 
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index a2d6106358a4..880b2dbe95d1 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index 3c8b6bb510d6..1044b0d88c73 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -6,5 +6,5 @@ DIST atril-1.28.0.tar.xz 2093588 BLAKE2B 6e5b2f63ce1a0bd1f419b0e9ccb29887086c180
 EBUILD atril-1.26.0-r5.ebuild 2894 BLAKE2B 93ba39922ef5dc3588c4812bf0cdfea2147aa909172198384e9d9ff0027a3096e5407436ed8090824e8d004477181c12293edc94c3ec0f690d97006ff46b5b65 SHA512 67cbee8fe997b25cb947c14a7b61f0803e0537a7a6358be9389a12c18eb5522389bff256a50e70195e9421fd7765ddfb501d5669c86486bcc80e30dbe9e22d75
 EBUILD atril-1.26.1-r1.ebuild 2985 BLAKE2B 51053becb10079db57c6289db1948f7ba1acd2b0a2c21eb15386cf92190516794c20d6fa596e68e4476cd49410128065e515b0138ec132455bc9ca19cf50c52b SHA512 19d843e90dee185e95ccaaf500c70048b9872ce9f193e4d7b7f475aec977af6bf7bc037f1d8291cf2ac7dd5e0102499c6e9bbe2dae3ee36b250fe77fd623b031
 EBUILD atril-1.26.2.ebuild 2894 BLAKE2B 4a001b7b9d82b69657d741ea7fe9e6c79b3afa003511af1c9733d5aaedc4c9c7ebf5d774f5aa30c6d1b159e04dad3f214e689b72998ef64cd873bb865770ba20 SHA512 ebc61afd3405e57dfb7873e3766bdc2c801787df6adf318815d9db2ffba87728a76ab0c08b1439efad8b4cb46cc07ac3e147d8796948a41d50723e18bf631827
-EBUILD atril-1.28.0.ebuild 2722 BLAKE2B 9e767392fa51d2cd5555cedb4cb77c325d2e05ceb751a608f52c43258c7511d6fcec7f9eaf61f3d3ae4ab941c840fe78184bd1c2c05e5fd912ca3dd3c006d9de SHA512 8064e6e5683c4d1c01507bd4790f3fb2700c756bc50dc592ab94565a179ef06cc9c271e558e630db37374cc78479beea3553cb2f46b8141a9cc8dd7a2d04bb2b
+EBUILD atril-1.28.0-r1.ebuild 2739 BLAKE2B e97d5e6d31cf96cabf840aa07c36e70782e21e8dddf298489042923b21056c21508c29e93cc79c00c51f8701ce3fbcfadf5584b8ca39d3de094ee6b13615890f SHA512 74e66f6d0a5355ca7696e3e5f78f49c643fe442c534958b065b11682ddb6bc3783d4b33835efd69288d98917dabe73c42f6f83ba6b1179334404268b139e44ea
 MISC metadata.xml 1152 BLAKE2B dcbfca525bbef6927cf653ad12484b2b12fd2b2e7d6416b4b9a88943f03469f23d5d3c5ebeb98d4c5070918b79166a081204597b84fb0617889c4e74e6627d3c SHA512 84a75f031e3523202d3c8a4485b742e7412d7466ff87171805ea418a455eb9c86dc5fe3b899c3cced7769c86aa0dc6ae6c122eb06551f38b5eeeecb76d529391
diff --git a/app-text/atril/atril-1.28.0.ebuild b/app-text/atril/atril-1.28.0-r1.ebuild
index 189aa88ef920..7a6e77d69bed 100644
--- a/app-text/atril/atril-1.28.0.ebuild
+++ b/app-text/atril/atril-1.28.0-r1.ebuild
@@ -52,6 +52,7 @@ COMMON_DEPEND="
 "
 
 RDEPEND="${COMMON_DEPEND}
+	gnome-base/gvfs
 	virtual/libintl
 "
 
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index d36bc606e73e..7c5877e1b11e 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,6 +1,8 @@
 AUX all-completions.patch 2037 BLAKE2B 92a706e0dce6a6dd316b168fd4a93a8d6e52f80ceb5bdd5e762399125aea7cf9bbe3a36df519ceb97391309776c832cd0e5ddf414e144c17e79eb70109d3ef2d SHA512 11ee08eb7cccdc6f1470354dae28ebf20c083b9ff96899694ba67d21306a169768a2e50bb6a0a41939d2770f5962217edea5ef3afe9bf3bfa38e9f9abe55d48f
 DIST lesspipe-2.11.tar.gz 171212 BLAKE2B aa7cf35f00d9db4ad7cb48ae89089a4d0c5d6c6e41ec902bc7ba6d4fd218f8ea90e1fdf3d6fcbac1dd1f86eb841a0daa6838b0086905fd4b0535d91040ef85aa SHA512 ed75d8529bd24876b11a50d0ada476299569d0fe716c390de84a0630ae475594f96370ffbed64fc5d9e2417dcbaa7b2f68630e32f665dff799667c2653b0265f
 DIST lesspipe-2.12.tar.gz 171915 BLAKE2B b1181cc5ca6ec8ca918bff31def6d6fde5f6bcfde9d48e0a23a088ee9ff178e3e9ff330b1c27a3d74b63d227c94292141414bec8c25d0035f9fec01c6760b8b9 SHA512 9c6945b0f5a5672e3b9b0035ebc63ab3197c1b3d1dfc3d4a2280c1f11421d98ccc5c016273a308a96f61a47f4da6d6658502534284fff81fd75365a4ba91c27e
+DIST lesspipe-2.13.tar.gz 173413 BLAKE2B 06752c71822233bf7f5f9f55b416222963a05cb9b7ce60d204b989d5d7052e5d24ca26f0ddc9e2520789e89cf8e2be456a77f616adefe65e637d0761948a734d SHA512 e4e2448f9d001c1da3ca2d9ad029598cc51bd3ce381f77d4b77093d8df8162111726af09690611f91542b2f8f437dcc448b95505adfc92a724bff151490ddd3d
 EBUILD lesspipe-2.11-r1.ebuild 1925 BLAKE2B e63508fc246a9848ccdb92429790c6bf6dce42b3325815f33e771ab3040bfd0510ed64b3fe8b2efe65d8bf1d3c4fa775eaffa636805fab8704be4bdace3e5450 SHA512 afe904b57613c25d56b5d2632341da27b45fee8a38637d0ccbd66b4a26c3091588ae0e367d6faa23f80f97a490912eceb3021269eedfd7d3ac7bc4e5046fb8e9
 EBUILD lesspipe-2.12.ebuild 1758 BLAKE2B ca5ecd566c8bcf89a6690a30d6946d73a3a6fff0371ff5959b93e3c06c59af3ea1304cf12d9a8046af542396700f5f0bdcb8c5ee065b02d587d6d28a4f9c3769 SHA512 c5eaca6e2ac1138f4d7986bf6278377109d4135506fa9cf687457284f6d902377fd675b5b95082e434093e1d7275406146b97e45fa7078719bb4ef1af88233f9
+EBUILD lesspipe-2.13.ebuild 1758 BLAKE2B ca5ecd566c8bcf89a6690a30d6946d73a3a6fff0371ff5959b93e3c06c59af3ea1304cf12d9a8046af542396700f5f0bdcb8c5ee065b02d587d6d28a4f9c3769 SHA512 c5eaca6e2ac1138f4d7986bf6278377109d4135506fa9cf687457284f6d902377fd675b5b95082e434093e1d7275406146b97e45fa7078719bb4ef1af88233f9
 MISC metadata.xml 304 BLAKE2B bb5be96b5fd22ce82d800f6bd5ed3ceb04b955182eaadc1f34b6f4b633c21efd6148013fc29b5567f7ada4da5de6efd7e0e420fa63a2976a5cf6bcf719c34f2e SHA512 2c217e67c6c487f7f7f98588a50086daf434bc25ad229b68d37bc12f7ecc4f904b5bc4a3b7b6db4a1daa0267c7e13fde8538de1c16d11e95be6b8071ee675105
diff --git a/app-text/lesspipe/lesspipe-2.13.ebuild b/app-text/lesspipe/lesspipe-2.13.ebuild
new file mode 100644
index 000000000000..9b06994b07f0
--- /dev/null
+++ b/app-text/lesspipe/lesspipe-2.13.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo
+
+DESCRIPTION="Preprocessor for less"
+HOMEPAGE="https://github.com/wofr06/lesspipe"
+SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+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 ~x64-solaris"
+IUSE="test"
+
+# Please check again on bumps! (bug #734896)
+RESTRICT="!test? ( test ) test"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Text-CSV
+"
+BDEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	test? ( app-editors/vim )
+"
+
+src_configure() {
+	# Not an autoconf script.
+	#
+	# PG0301
+	# By default, only completions for installed shells are installed.
+	# Unconditionally install zsh too.
+	edo ./configure --prefix="${EPREFIX}"/usr --all-completions
+}
+
+src_compile() {
+	# Nothing to build (avoids the "all" target)
+	:
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+	einstalldocs
+
+	# The upstream Makefile intentionally installs to the wrong directory, then prints:
+	#   In bash, please preload the completion, dynamic invocation does not work
+	#   . /usr/share/bash-completion/less_completion
+	#   Or consider installing the file less_completion in /etc/bashcompletion.d
+	rm "${ED}"/usr/share/bash-completion/less_completion || die
+	insinto /etc/bash_completion.d
+	doins less_completion
+}
+
+pkg_preinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
+		elog "The latter is the Gentoo-specific version.  Make sure to update your"
+		elog "LESSOPEN environment variable if you wish to use this copy."
+	fi
+}
diff --git a/app-text/pastebinit/Manifest b/app-text/pastebinit/Manifest
index f7987db64771..d77fec7d2c8f 100644
--- a/app-text/pastebinit/Manifest
+++ b/app-text/pastebinit/Manifest
@@ -1,4 +1,6 @@
 AUX pastebinit-1.5.1-distro.patch 379 BLAKE2B c843acae6267fe2408945cabc0951f9d8cf01cbec1e472658369782a7ded31670eda5a4778df0d89597b5579cf647e47140842cc35b6c3f16eb704d3fb3eefd1 SHA512 bf75d156035e2e08752d7ecd371f5a92b4eb88ea834b4c7a23a533b6c650069d68d0069220e1f0eb04adf8e399c7cf2cf49c93047b42b6fd9d0d2e529dd1dda1
+DIST pastebinit-1.6.2.tar.gz 53444 BLAKE2B 1e8853f0f37ac98eb1537dcc01f7c2ee33a3cf72fb5b10fc18b3f6b1662f3e15acf29c1674c2a34e234c6636ac70f59b265862a48c0860d1ff3725eabe11d7c4 SHA512 a04863bc748340bd8bc9d6170dedb2b234b53996cbaf5d1fdd0a078d0d6f03c4c558d2a5029359eb95d25c1339af25d74dbf247af1de0ae278a7664869e8841d
 DIST pastebinit_1.5.1.orig.tar.gz 51448 BLAKE2B a5cfa13c770e234d6e08d4f0b662c09398a5f20ac4e3f7c10ab086261923851239a3e6c1bda78ba6ba810f95cd90e6517b74aa41c5b5e3d50bca5b8c100aa594 SHA512 02b7faa54862d240eac3a8edaae2edb895cbb476cbf89dc71514a5a0a42aa2b0d26f07e5485627d1deb61f62e37018459e4d072bd4aacc886f259fced35e352c
 EBUILD pastebinit-1.5.1-r1.ebuild 1507 BLAKE2B 273d73391a9f5be527c323a539bdc3f07c222fc9bc266be82bbe4ff695c5ef9657b41cef810c9132bdcf82f6c456d5056cc76d2bbb9bf8a5c3ac84cfaa543062 SHA512 f1f769347d704bff655f0ed4285f4a439a242f8d70f0a25e14dba2cac06acb30ca2d38aa7e9199b64cabf5cffb44791db988ef7a9c7845e45741135585def50e
-MISC metadata.xml 268 BLAKE2B 30d2caaa23f9dcdf03db51ba606d174f25821f83a68e7f83a91d9ce89b4b94b5d635f90cc9c7a4f8497eea4699bbf98dc0e488b82e7277b99eba7331f752a0e2 SHA512 79de8c690c5e7ff5b228bc59e098859599a79d1d2abf8709d6623decc385b95444125c60122f69c0a6a3d6b5940b1eb929e872010887bf70dbd99b12598ca1e2
+EBUILD pastebinit-1.6.2.ebuild 1319 BLAKE2B 21138fd01ea65555664714f9c5c5309152ee919effbcc1ba2325bc7d0fd31e0f002aa16ac1041cf46f1348f277cc31cddefba69580fc684e7e6204e08a0aa992 SHA512 f86603a6233c3e2e734626a1550fe7c16c03fad3fe2f6fccb9e092070f5fc6ef288c1f4dc0c88ed7a49a08e99589d6457eb784cf0a052c93c20702d9b8b40449
+MISC metadata.xml 329 BLAKE2B 231c5095d0163f6e8d88a96db132c8d8fe6e51b8c6e4ab02103c16c777096676d7b3b2a0b304840dd7b3ebcd5498d8ea94395be1075ae70ae3e7783623a7f855 SHA512 3130c3eb7d1c11976d3f3704ea7e520d9e82c676bce2e6207482a1660c9da5b0c55cdc7df1a7b744106c3b925760df168c0b02d5475a3c406e231d058ef4079c
diff --git a/app-text/pastebinit/metadata.xml b/app-text/pastebinit/metadata.xml
index 946d7034d93b..dcc7ed11569a 100644
--- a/app-text/pastebinit/metadata.xml
+++ b/app-text/pastebinit/metadata.xml
@@ -5,5 +5,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="launchpad">pastebinit</remote-id>
+		<remote-id type="github">pastebinit/pastebinit</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/pastebinit/pastebinit-1.6.2.ebuild b/app-text/pastebinit/pastebinit-1.6.2.ebuild
new file mode 100644
index 000000000000..9ea08d834305
--- /dev/null
+++ b/app-text/pastebinit/pastebinit-1.6.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..12} )
+inherit optfeature python-single-r1
+
+DESCRIPTION="A software that lets you send anything you want directly to a pastebin"
+HOMEPAGE="https://github.com/pastebinit/pastebinit"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="man"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+BDEPEND="
+	sys-devel/gettext
+	man? (
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)
+"
+
+src_prepare() {
+	default
+	python_fix_shebang "${S}"/${PN}
+}
+
+src_compile() {
+	emake -C po
+
+	if use man; then
+		ebegin "Generating a manpage with xsltproc"
+		xsltproc --nonet \
+			"${BROOT}"/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl \
+			pastebinit.xml
+		eend $? || die
+	fi
+}
+
+src_install() {
+	dobin pastebinit utils/pbput
+	dosym pbput /usr/bin/pbget
+	dosym pbput /usr/bin/pbputs
+
+	einstalldocs
+	doman utils/*.1
+	use man && doman pastebinit.1
+
+	insinto /usr/share/locale
+	doins -r po/mo/*
+
+	insinto /usr/share
+	doins -r pastebin.d
+}
+
+pkg_postinst() {
+	optfeature "pbput and pbputs scripts" app-arch/xz-utils
+	optfeature "pbget and pbputs scripts" app-crypt/gnupg
+}
diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index 63dd397db0f5..5ecd331c8346 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -1,4 +1,6 @@
+DIST pdftk-3.3.3_p20231025.tar.bz2 2246135 BLAKE2B 641a8947d7be2a219b1deb4619f8ea201b8c0616ca50cc1cc1b4363050d16a7b622437f2b75236373f27ed2539f975c081f4f95a09163656d0e130969a5f4b7e SHA512 7745a161e788af2538a1e45e49c3342b8d1496cfec1079b51d4efed66440ce07a27657623ffb59d3078aa9ee964e77cbe3f8258d7d699938c59e9c6a2980f51b
 DIST pdftk-v3.3.3.tar.bz2 2205902 BLAKE2B 7802554cef4389670392ca2fda3dc4c041943ad21ecf47cfcd333dc1f0899796fabf9538388586f4e64a8a1fa5d7278a93f9e88c19a1ec510b24b85027888ad4 SHA512 48173d0c4698bc984221b56dff3e6434df7cf144dddfdbf684f8fa28b9eacfd0ebf9ebca0b87df3f9534a1ed13caa4c0866bd3e7a8cd06a21b46dfaedda9ea21
 EBUILD pdftk-3.3.3-r2.ebuild 1873 BLAKE2B a751ea87e638814712bf28c3ff6fe70040f214739165727160eccc8e8931ee5d090338ba6e6e56d651d0a02e27cccd218d6122032a33714280e32ac258109b8a SHA512 90f8cb1931e29591658818a47b1a8c8a961c3734a0587e506b49a8e8f309c9744338ab489bfb11a766ec1fa1d8ff0c9b135dc1816f70b546ddccda52e178a985
-EBUILD pdftk-9999.ebuild 2015 BLAKE2B 86616bdc94ec8c804061c8866f1e3aeed9d4c53e6686766d8b282699850415ad3ae5436d88fd057905d127d92474b4825a1bb4ece7ab96026eb0871527d20dd3 SHA512 762d6f5aad18159e9f8fea419379624484724703ee2932adfe22fe3dcffb149d851f3c4f8f7445322061f7ad16756209ec47bc7d60b0e4cb2515cb66e630f3d2
+EBUILD pdftk-3.3.3_p20231025.ebuild 1794 BLAKE2B c67ba6abce9776842eadca8371c334b3416118f3772a01c3e690513ce61257576e8da1cd9ccd79bed7c10d3c16436f2e389307e1dba4a64a0122b8b418700d0a SHA512 ba15bfd128e45f2d60cd36fe1280a4a440f87b8074c8e55e4aa360b970e1d73dd85aabf4d82eee8c3673a1defeb2408adff56892986e80609c923fcb8f4c81bf
+EBUILD pdftk-9999.ebuild 1937 BLAKE2B e18af0b0036c87ae1b32760eb82b640a40a23a5e91ca7831068886eb5999ee6663ff1e30b645d33f4744f54995bf254fea0842021892268904a5d98b69b07990 SHA512 036202e7d9f1a7370b5d0d6fcaa1c92ba1af78d63c357f962bd73add6b9177861e6043ac79bb409906cb60c1da1d16b7e2a8bd9133ced950be3381efd81b42a6
 MISC metadata.xml 427 BLAKE2B d839579ab02144cd303ff7094601b4db0473bfd39479cd24183e4012469fb2ccd4320c1c0d6bf36e1ed08a6ea51469eaabe19712a3d3a1e21c45a2b066cd3e79 SHA512 a015f4405e987d543783d3fcf36876b6d8d0bc986570f47baaf2ab12eb08be77024ad75450b98867d9e9a625168af51542ffe90214fd4f997dbb6c25b1f9324b
diff --git a/app-text/pdftk/pdftk-3.3.3_p20231025.ebuild b/app-text/pdftk/pdftk-3.3.3_p20231025.ebuild
new file mode 100644
index 000000000000..03d5de31a055
--- /dev/null
+++ b/app-text/pdftk/pdftk-3.3.3_p20231025.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.gitlab.pdftk-java:pdftk-java:3.3.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A port of pdftk into java"
+HOMEPAGE="https://gitlab.com/pdftk-java/pdftk"
+MY_COMMIT="3f1918c831c919d0a8fcf18c36cf40118398b995"
+SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+S="${WORKDIR}/pdftk-${MY_COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/bcprov:0
+	dev-java/commons-lang:3.6
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	test? (
+		app-text/poppler[cairo]
+		dev-java/system-rules:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+JAVA_MAIN_CLASS="com.gitlab.pdftk_java.pdftk"
+JAVA_RESOURCE_DIRS="resources/java"
+JAVA_SRC_DIR="java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,system-rules"
+JAVA_TEST_SRC_DIR="test"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	mkdir resources || die
+	cp -r {,resources/}java || die
+	find resources/java -type f \( -name '*.java' -o -name '*.sh' \) -exec rm -rf {} + || die
+}
+
+src_test() {
+	# some tests seem to need special treatment
+	einfo "Runnig first test"
+	JAVA_TEST_RUN_ONLY=(
+		com.gitlab.pdftk_java.CatTest
+		com.gitlab.pdftk_java.DataTest
+		com.gitlab.pdftk_java.FormTest
+		com.gitlab.pdftk_java.MultipleTest
+	)
+	java-pkg-simple_src_test
+	einfo "Running second test"
+	JAVA_TEST_RUN_ONLY=()
+	JAVA_TEST_EXCLUDES=(
+		com.gitlab.pdftk_java.CatTest
+		com.gitlab.pdftk_java.DataTest
+		com.gitlab.pdftk_java.FormTest
+		com.gitlab.pdftk_java.MultipleTest
+	)
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	doman "${PN}.1"
+}
diff --git a/app-text/pdftk/pdftk-9999.ebuild b/app-text/pdftk/pdftk-9999.ebuild
index 5054bbcc6777..de47cd90e2c1 100644
--- a/app-text/pdftk/pdftk-9999.ebuild
+++ b/app-text/pdftk/pdftk-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -57,7 +57,6 @@ src_prepare() {
 	java-pkg-2_src_prepare
 	mkdir resources || die
 	cp -r {,resources/}java || die
-	rm -r resources/java/com/gitlab/pdftk_java/com/lowagie/text/pdf/codec || die
 	find resources/java -type f \( -name '*.java' -o -name '*.sh' \) -exec rm -rf {} + || die
 }
 
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index cf6046d89483..199fd33542e6 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/jedi/Manifest b/app-vim/jedi/Manifest
index 5835cce2f0ee..8cb95662434b 100644
--- a/app-vim/jedi/Manifest
+++ b/app-vim/jedi/Manifest
@@ -1,5 +1,5 @@
 DIST jedi-0.11.0.tar.gz 41606 BLAKE2B 146f60f43a3fc764c66e2ca94c2b4051be3e25b5a94ca3f6d82533b624433946013c7df38e61262e6ac40a00de9d3b9b0e647e794191b6deb8ed09124d2accc7 SHA512 a151fdf4d58adc36dbe9ede8e091ae00c8bd8237b66c512b4addfb6e7e436651848da2b3a0dbcbbef615bcc394e7e28a6e127e53f2205dc61f4d46a2ff0faa12
 DIST jedi-vim-0.11.2.tar.gz 42704 BLAKE2B 375cdf4742eb6328f5dc601b7a0b529a3d18b70711f93ab860e2827275f36454281c9d4ec85de0cfe280115fadde3a45f1bf74bfb4a4f1036b603eaa6051bf56 SHA512 b5711a963bcd61e03af0ad9936de37bf0391fcf1edd5b881b45612469e573cfc91bd012e7f12c5a9c8e51242dd26381bfa08bbc7853fbfd4a30897eeefbadb7c
 EBUILD jedi-0.11.0.ebuild 2045 BLAKE2B a63c81a0b81f129480057ecf99a566df6181bcef4fc4d5b787498db9152dde38fb22e660b45300c7614e6fff4129cd9a8769318093fbc6974262073104b5f8c5 SHA512 f09801ee0093d88e5eaa50e1f0b99030ef6b3c5e50e617414a51ea4f5bfe358662d76ebeec84a3777e1b2a8923aa458b958ca5709336f3e42be0415839637f9e
-EBUILD jedi-0.11.2.ebuild 2056 BLAKE2B 19bc957819a42c0e3a2b0fe0fb94dc0e423553f02d323749351dd5e3c764a5833af3fa12bdc693c2ab81f666d08ed7cf2faf515b7dfb1ef88c22913ca228e905 SHA512 90b1fed36dd6abe6db17456bdaadc700576dd5467f1f2cdda37f504416bd7805ed970b55a648a28d93f175dde4e3103fee35262cb703be9b011c2c2d28ee9460
+EBUILD jedi-0.11.2.ebuild 2057 BLAKE2B 5b8013272c2c06137a251778adc2e6c52198d19d0d75614994c5d184585c6955e3b7b4c1bcba48c14aa5a9dc21a044bf470c0bc522f1325126e5b861fea93ac4 SHA512 fb04b05d2ed4f2032fe3757fbe32ea4a4225b6879b2620169df266d819632ae76f17975310813ee063dab66fccf618ef03e0b88641f70c2171ec8b2f2fb5ce2c
 MISC metadata.xml 534 BLAKE2B 1002067cd20ca220cd553e1aa1ed73818fab0ccff5b43f660f57609a509d30ea4d7cb8bc98683c6aa63843282dee0c04f29035066a48c8c1f1bc0e721855098d SHA512 b25359916be65830103512f7498dcb374f897d6003062b6940079d0b5f1ba9bf1e7161472690318650c876366c555bba8381b034b55bdd6ae9dd61a18e44dd63
diff --git a/app-vim/jedi/jedi-0.11.2.ebuild b/app-vim/jedi/jedi-0.11.2.ebuild
index 521b71e674d7..0bd6e02ec6c7 100644
--- a/app-vim/jedi/jedi-0.11.2.ebuild
+++ b/app-vim/jedi/jedi-0.11.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit edo vim-plugin python-single-r1
 
 MY_PN="${PN}-vim"
diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index d4c8f277c4b7..85d4e9957260 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
diff --git a/dev-build/automake-vanilla/Manifest b/dev-build/automake-vanilla/Manifest
index 10598bbf5f19..15e775d5850a 100644
--- a/dev-build/automake-vanilla/Manifest
+++ b/dev-build/automake-vanilla/Manifest
@@ -12,5 +12,5 @@ DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d15
 EBUILD automake-vanilla-1.11.6.ebuild 2653 BLAKE2B faba55f37ba49fe507d39176ca0e5309287e1a4f9f1ef99fc67430ff9304555037e7de8a212e5c1b743033f062916b46b06369bc4401179cd7b6c434722e1071 SHA512 0f9ee30bd82878882815ab513136084981178751f580d6ab7e9c91492c78a4757fa13feb3d00c4bc81df96195071887825a95514adc5bb6c5f771bf024fd553b
 EBUILD automake-vanilla-1.15.1.ebuild 2863 BLAKE2B bc9e597712f137ea0014e6ea820625040b4cb133fc13f5e51381534fabe9ed07758495f4056a20739773be27411a9ec614a6ac673fdd3733fdc402f50d7db3d5 SHA512 1f9a933b151fa17b76e42ca5d91696e83080fc718b44b8700853bed647c0406c222067c152acc7fe304d65ae82ca1f3e7b3fd5092a3fde084b1d9f797f0521d3
 EBUILD automake-vanilla-1.16.5.ebuild 3410 BLAKE2B 714828d62555d292f1096fe4fcdb3bdc01f9b4a418555e17f10c77d461af6b19cc3cfff28f41f280ce088942948c2bc8c72dc1ed26d151e03fa01554f9d25dd6 SHA512 930947e563034b1d4285c75d4afd4d61f32b2af1820b2da9ae098f1d862caa377bbdff8a0889ce61566762ebb51472b2d0e778fe5b7b2ed45040af49c820c07f
-EBUILD automake-vanilla-9999.ebuild 2947 BLAKE2B e5f143458817be3a6cca8f342990164b9457ca855861a086f37ff83d1a5da158bbe8d14a9093607e7cff7245afbe628468e810d9cbb5a7acef3ed1dc70561fdf SHA512 dc186c2ce6d126b41c3158be2841e0d77551bca3b33207a69a99d8e914a88d951b513dbe2fae93f99aa14ff72a49498880f8b2f60295ec5f26176ea5187d3732
+EBUILD automake-vanilla-9999.ebuild 2947 BLAKE2B ecfaf45366e75d9962e44524127f063510b5f405ef8412277cfe4fc97fee2f4e53230cf88a170761cd4c2768ad62f43fd4daad8efa21a678aaf974d224328307 SHA512 6e658d82c4b16895588fb36762db5a25747b04e8454aa4f7b75e983e3061eb9bb18db9079399c3ec9856e3f72318551ae9e48b1e1e2f297fa7336f73b711e97b
 MISC metadata.xml 363 BLAKE2B 7cbff34d075f5fb5d8391bbc978f9236a6aa1903a697fac7bc52bdf98baebf7053ad4fb4231f4d2b327decce840e47fccf11a28411e9cd12647fa5ab7698f0f5 SHA512 c40b7d0d1986ac70deafd644669caa695279b4bba94b2bd5ab9a9dc8c14cb246b83dc6f19811210559fb9e0e85c7703a2599d910c8fe7a31bff01be10f6dfed7
diff --git a/dev-build/automake-vanilla/automake-vanilla-9999.ebuild b/dev-build/automake-vanilla/automake-vanilla-9999.ebuild
index f8bc9f1579a5..21168cdee797 100644
--- a/dev-build/automake-vanilla/automake-vanilla-9999.ebuild
+++ b/dev-build/automake-vanilla/automake-vanilla-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Please do not apply any patches which affect the generated output from
 # `automake`, as this package is used to submit patches upstream.
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit python-any-r1
 
diff --git a/dev-debug/Manifest.gz b/dev-debug/Manifest.gz
index a61d79363efa..51ebfc7a2d26 100644
--- a/dev-debug/Manifest.gz
+++ b/dev-debug/Manifest.gz
diff --git a/dev-debug/gdb/Manifest b/dev-debug/gdb/Manifest
index 309febd3a45e..d1797c07f3a3 100644
--- a/dev-debug/gdb/Manifest
+++ b/dev-debug/gdb/Manifest
@@ -1,7 +1,9 @@
 AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d217c4d977aed0847fdf125bb13ebc004906d9afb8e3f629c41efccca88df0040015e7799c1fd24de5fb50f62f5bbd90 SHA512 c2bb013e4fcabefddcd8042bd3cbb53471f83182cc8769fe0d19eed80ccc4a83bd84d120006fa25b3b7d0310dc2f2ec6b44a6ff74909cd312b7e491f371777a3
 DIST gdb-14.2-sim-modern-c99.patch.xz 5348 BLAKE2B f8039cdf1b49d12eead0dae7db88dbfad4c47eda696ee26b0bd140605d1d62d4a88557518d4e18c86fffb3c6194782d16e459f4392df71d2ec1af271ccb2838d SHA512 f44239871c584f5d6de98db8d6a6766103a8a6fc92dada7d37f04bdc53efe635cca7dfaa778d620348559814f4784a33e5f72a8dd376dc96fba8ec27032ab389
 DIST gdb-14.2.tar.xz 24111936 BLAKE2B 65765dfd1ed08e19bb881fc7ae98d6ee4914f38a9a2bb0d0ca73bef472669664f807fe9c04e8dffd7025be98e736ac52f88ff5851ceddbb01a361885b18befc8 SHA512 7e07941f1fe661288cc571b4964012ceabc1760624fce20320db2f470c01439b2386f859b5288da13204b758e2e3b22a74c68c012178db93b9529b06f1e22ede
+DIST gdb-15.0.91.tar.xz 24278716 BLAKE2B 8fbbabf40472e6414ef180a9a072db5fa12c9663e723f763c5ebc9583d160d0ca3dc5910e043dba8b12a494a12c202ad095e36e0a0ea2ba1e8e548c3ba1e5221 SHA512 a946b5a074cec93b06b175276c55614b306cfcabb1f467dc0c2f60085cb6853c6d62511a9570ae9ea778c05bad245d8e6e17b15a29b85d48e60d9c8a72086e2e
 EBUILD gdb-14.2-r1.ebuild 9188 BLAKE2B d017f8282ab46255e3bfb2ad429af43a0fd4859ba142c8d31e779c6facb9e27ad069f09198a1503d2630e6d3be041923bace1b4b10fb4a7a79199fe121664f62 SHA512 fc9257a1cb6e4d0e2b7847adba86155a64dfda41beb32b6918060f8db1cd63e30bcde191197a1cdcfdd581da638fc224f30b8441ddc5cbd715e3f62996531f41
 EBUILD gdb-14.2.ebuild 9059 BLAKE2B 4adabb256e5367d71b8d239f75e58ea848df77edc4858316eb2ecb4a2f88e96494179bda9f011b8d1906c3d1a4aed84dcc213f4ea356e1b408db8a3d908b4bec SHA512 e76abe561878e0a776b0e47a79a91165e34d875513a5df0077c2e7a68d432b6c64fef45216d4e3ffd201a8df6f593dfbe51d418004e6e2483a2b162e8a73f46b
+EBUILD gdb-15.0.91.ebuild 9067 BLAKE2B 648034794b0b4c70c5645337e7c859d640e8fdd0a9d1a92656dba01adc5f4c3416524804b4776bc10d1698b28f3b88e37ffe10798129491ab000000daad5570b SHA512 dbe86f068a52c3220c1a9d5ab1b3f181e7f5dfa8fa681d7be1b10750fc78b0f546491b0b6831409775b803531719aabfe236b49d930cb6bb1a671df33322f0ab
 EBUILD gdb-9999.ebuild 9067 BLAKE2B 648034794b0b4c70c5645337e7c859d640e8fdd0a9d1a92656dba01adc5f4c3416524804b4776bc10d1698b28f3b88e37ffe10798129491ab000000daad5570b SHA512 dbe86f068a52c3220c1a9d5ab1b3f181e7f5dfa8fa681d7be1b10750fc78b0f546491b0b6831409775b803531719aabfe236b49d930cb6bb1a671df33322f0ab
 MISC metadata.xml 1348 BLAKE2B 61eb80efbf21b4d0ededbe138710ef7ce69d4c2c137448d780a0a18db13b1b80ccfc41adf9cd825358bb952dae3a627f07d2cb89845ca52383d05fe32c494b49 SHA512 b50fe1fd5fccf7eddac4eff4fd7be955e02227763725b8e00d8e3606346afa978079ed8b754948b9a3ee065441acba4787b48c2b2d55535e0f8b9405fb4f2e90
diff --git a/dev-debug/gdb/gdb-15.0.91.ebuild b/dev-debug/gdb/gdb-15.0.91.ebuild
new file mode 100644
index 000000000000..541bf7f8915a
--- /dev/null
+++ b/dev-debug/gdb/gdb-15.0.91.ebuild
@@ -0,0 +1,322 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# See https://sourceware.org/gdb/wiki/DistroAdvice for general packaging
+# tips & notes.
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit flag-o-matic python-single-r1 strip-linguas toolchain-funcs
+
+export CTARGET=${CTARGET:-${CHOST}}
+
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+case ${PV} in
+	9999*)
+		# live git tree
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		SRC_URI=""
+		;;
+	*.*.50_p2???????|*.*.90_p2???????)
+		# Weekly snapshots
+		MY_PV="${PV/_p/.}"
+		SRC_URI="
+			https://sourceware.org/pub/gdb/snapshots/branch/gdb-weekly-${MY_PV}.tar.xz
+			https://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${MY_PV}.tar.xz
+			https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/gdb-weekly-${MY_PV}.tar.xz
+		"
+		S="${WORKDIR}/${PN}-${MY_PV}"
+
+		# e.g. 13.1.90_p20230325 is a snapshot on the stable branch, so it's fine
+		if [[ ${PV} == *.[123456789].9?_p2??????? ]] ; then
+			REGULAR_RELEASE=1
+		fi
+		;;
+	*.*.9?)
+		# Prereleases
+		MY_PV="${PV/_p/.}"
+		SRC_URI="
+			https://sourceware.org/pub/gdb/snapshots/branch/gdb-${MY_PV}.tar.xz
+			https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/gdb-${MY_PV}.tar.xz
+		"
+		S="${WORKDIR}/${PN}-${MY_PV}"
+		;;
+	*)
+		# Normal upstream release
+		SRC_URI="
+			mirror://gnu/gdb/${P}.tar.xz
+			https://sourceware.org/pub/gdb/releases/${P}.tar.xz
+		"
+
+		REGULAR_RELEASE=1
+esac
+
+PATCH_DEV=""
+PATCH_VER=""
+DESCRIPTION="GNU debugger"
+HOMEPAGE="https://sourceware.org/gdb/"
+SRC_URI="
+	${SRC_URI}
+	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${P}-patches-${PATCH_VER}.tar.xz}
+	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
+"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+IUSE="cet debuginfod guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd"
+if [[ -n ${REGULAR_RELEASE} ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+fi
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/mpfr:=
+	dev-libs/gmp:=
+	>=sys-libs/ncurses-5.2-r2:=
+	>=sys-libs/readline-7:=
+	sys-libs/zlib
+	elibc_glibc? ( net-libs/libnsl:= )
+	debuginfod? (
+		dev-libs/elfutils[debuginfod(-)]
+	)
+	lzma? ( app-arch/xz-utils )
+	python? ( ${PYTHON_DEPS} )
+	guile? ( >=dev-scheme/guile-2.0 )
+	xml? ( dev-libs/expat )
+	source-highlight? (
+		dev-util/source-highlight
+	)
+	xxhash? (
+		dev-libs/xxhash
+	)
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	sys-apps/texinfo
+	app-alternatives/yacc
+	nls? ( sys-devel/gettext )
+	source-highlight? ( virtual/pkgconfig )
+	test? ( dev-util/dejagnu )
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	MIN # gnulib FP (bug #898688)
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	strip-linguas -u bfd/po opcodes/po
+
+	# Avoid using ancient termcap from host on Prefix systems
+	sed -i -e 's/termcap tinfow/tinfow/g' \
+		gdb/configure{.ac,} || die
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# code relies on C++11, so make sure we get that selected
+		# due to Python 3.11 pymacro.h doing stuff to work around
+		# versioning mess based on the C version, while we're compiling
+		# C++ here, so we need to make it clear we're doing C++11/C11
+		# because Solaris system headers act on these
+		sed -i -e 's/-x c++/-std=c++11/' gdb/Makefile.in || die
+	fi
+}
+
+gdb_branding() {
+	printf "Gentoo ${PV} "
+
+	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
+		printf "p${PATCH_VER}"
+	else
+		printf "vanilla"
+	fi
+
+	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
+}
+
+src_configure() {
+	strip-unsupported-flags
+
+	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
+	# Avoid really confusing logs from subconfigure spam, makes logs far
+	# more legible.
+	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
+	local myconf=(
+		# portage's econf() does not detect presence of --d-d-t
+		# because it greps only top-level ./configure. But not
+		# libiberty's or gdb's configure.
+		--disable-dependency-tracking
+		--disable-silent-rules
+
+		--with-pkgversion="$(gdb_branding)"
+		--with-bugurl='https://bugs.gentoo.org/'
+		--disable-werror
+		# Disable modules that are in a combined binutils/gdb tree. bug #490566
+		--disable-{binutils,etc,gas,gold,gprof,gprofng,ld}
+
+		$(use_with debuginfod)
+
+		$(use_enable test unit-tests)
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
+
+		# Helps when cross-compiling. Not to be confused with --with-sysroot.
+		--with-build-sysroot="${ESYSROOT}"
+	)
+
+	is_cross && myconf+=(
+		--with-sysroot="\${prefix}/${CTARGET}"
+		--includedir="\${prefix}/include/${CTARGET}"
+		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
+	)
+
+	# gdbserver only works for native targets (CHOST==CTARGET).
+	# it also doesn't support all targets, so rather than duplicate
+	# the target list (which changes between versions), use the
+	# "auto" value when things are turned on, which is triggered
+	# whenever no --enable or --disable is given
+	if is_cross || use !server ; then
+		myconf+=( --disable-gdbserver )
+	fi
+
+	myconf+=(
+		--enable-64-bit-bfd
+		--disable-install-libbfd
+		--disable-install-libiberty
+		--enable-obsolete
+		# This only disables building in the readline subdir.
+		# For gdb itself, it'll use the system version.
+		--disable-readline
+		--with-system-readline
+		# This only disables building in the zlib subdir.
+		# For gdb itself, it'll use the system version.
+		--without-zlib
+		--with-system-zlib
+		--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
+		$(use_with xml expat)
+		$(use_with lzma)
+		$(use_enable nls)
+		$(use_enable sim)
+		$(use_enable source-highlight)
+		$(use multitarget && echo --enable-targets=all)
+		$(use_with python python "${EPYTHON}")
+		$(use_with xxhash)
+		$(use_with guile)
+		$(use_with zstd)
+
+		# Find libraries using the toolchain sysroot rather than the configured
+		# prefix. Needed when cross-compiling.
+		#
+		# Check which libraries to apply this to with:
+		# "${S}"/gdb/configure --help | grep without-lib | sort
+		--without-lib{babeltrace,expat,gmp,iconv,ipt,lzma,mpfr,xxhash}-prefix
+	)
+
+	# source-highlight is detected with pkg-config: bug #716558
+	export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
+	# ensure proper compiler is detected for Clang builds: bug #831202
+	export GCC_FOR_TARGET="${CC_FOR_TARGET:-$(tc-getCC)}"
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	# Run the unittests (nabbed invocation from Fedora's spec file) at least
+	emake -k -C gdb run GDBFLAGS='-batch -ex "maintenance selftest"'
+
+	# Too many failures
+	# In fact, gdb's test suite needs some work to get passing.
+	# See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
+	# As of 11.2, on amd64: "# of unexpected failures    8600"
+	# Also, ia64 kernel crashes when gdb testsuite is running.
+	#emake -k check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	find "${ED}"/usr -name libiberty.a -delete || die
+
+	# Delete translations that conflict with binutils-libs. bug #528088
+	# Note: Should figure out how to store these in an internal gdb dir.
+	if use nls ; then
+		find "${ED}" \
+			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
+			-delete || die
+	fi
+
+	# Don't install docs when building a cross-gdb
+	if [[ ${CTARGET} != ${CHOST} ]] ; then
+		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
+		local f
+		for f in "${ED}"/usr/share/man/*/* ; do
+			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
+				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
+			fi
+		done
+		return 0
+	fi
+
+	# Install it by hand for now:
+	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
+	# Only install if it exists due to the twisted behavior (see
+	# notes in src_configure above).
+	[[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay
+
+	docinto gdb
+	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
+		gdb/NEWS gdb/PROBLEMS
+	docinto sim
+	dodoc sim/{MAINTAINERS,README-HACKING}
+
+	if use server ; then
+		docinto gdbserver
+		dodoc gdbserver/README
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,ctf-spec,standards}.info*
+
+	if use python ; then
+		python_optimize "${ED}"/usr/share/gdb/python/gdb
+	fi
+}
+
+pkg_postinst() {
+	# Portage doesn't unmerge files in /etc
+	rm -vf "${EROOT}"/etc/skel/.gdbinit
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "gdb is unable to get a mach task port when installed by Prefix"
+		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
+		ewarn "have to perform the following steps:"
+		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
+		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
+	fi
+}
diff --git a/dev-dotnet/Manifest.gz b/dev-dotnet/Manifest.gz
index 8c0ae697dbd7..5b1c2d8196ee 100644
--- a/dev-dotnet/Manifest.gz
+++ b/dev-dotnet/Manifest.gz
diff --git a/dev-dotnet/fantomas/Manifest b/dev-dotnet/fantomas/Manifest
index f8548201f499..76866af388ea 100644
--- a/dev-dotnet/fantomas/Manifest
+++ b/dev-dotnet/fantomas/Manifest
@@ -9,6 +9,7 @@ DIST fable.core.3.0.0.nupkg 88115 BLAKE2B 5c5a18b6aa818db35b9ee8502f109477a7c86a
 DIST fantomas-6.3.1.tar.gz 50369658 BLAKE2B 1b9014a8c28bc5951a85ae2e12dc167c0dd79156a36aea43ca9c4e9434433f19325baf6a88063b84e8ac7995cf4e586001eeeefacdaf1966872e86ce6b4bd4ef SHA512 67c739a3f203f992ba1690a226248fe3f947598ef08cffa8219148a30c360bd63eb98944129a62b60bda4d0cc27cc7e39841e305bfc49aeaf94fa7529d29ab32
 DIST fantomas-6.3.4.tar.gz 50374419 BLAKE2B 4da6367c872c4d69686353d4ec48a3bf613ba46ba68ada858ae2068206b10c15d019dd353963b4b7464ba3f0b00e4887f3ede1f644a5b6b6e459df7cb50982e2 SHA512 fa3284a548193ca0f28f45662955c66750bfbd5cc1d52b86851a9e7cddf00cc6bf7b458b6ab7feedd698d40bf8c90927a558753c394c9d2accfc782f7af8d0f8
 DIST fantomas-6.3.5.tar.gz 50374978 BLAKE2B 06d84381abdffdad4b6e11f8df7b7c26919fa77303d6f981325d0390a25bab2ec3964b4508d8fdaf57938ecd8266641d842b38af3a52543f7561808639703e1f SHA512 e065c9eea6044b8e1e41ec1553a0c5b4eb03ffc09f585125105b44787efe580ebca1eab0f11b4dec57c67cef6ffa6739d946b801fcbaef96906d17cc823a8766
+DIST fantomas-6.3.7.tar.gz 50375115 BLAKE2B 7c35e69efd4581087e281de3b89d7127eb5e95ce299e2d74671d5fe8d8d28f0b3e77000707462552dd0aa6641f3da94e58e53509a14a17a3673a1d1634ee3bd1 SHA512 255947f08062bec3e27ce02af454616e8e8a37c27f3fd3c21584ed6733b2c5d5a7cd2fd6ae9fa25f0598ff16668ec44f5207f42769f746947d6a4fde6cfbe0a0
 DIST fantomas.6.3.0.nupkg 5811389 BLAKE2B 57a12579087cb6cbe0cfec9885d0bd5768ba79245a197d825a9b8e8fd15d03cf9a23b3661d91492e4621e5aebe468e846bbfeb44339a7754a3d61a8826a5c62a SHA512 a708356ee3c135c88d759f92aac75d272f9e706f1fd151dd4dadb0d6b808b169636adc40875a0e858a8fbab9e5006a475b3bacd6712e7d200deda17f6452d0c6
 DIST fparsec.1.1.1.nupkg 353063 BLAKE2B 47e93d6ed373bcf3fd5c26ace2d60a1e6701b14bb4cbca1650bc15bfd0dce402ea8c8ad471004dfe618f0e9507ec60c53d7e01ead2e7480ececfc4a0395552ff SHA512 b28a1cc8a4fd2d4b000adf68b0a9ffb6aa72ec2cdd5157beb47635346122ac61f6dac0e0b06de8528ed7336e21e9881918fd18d36585507ebefb3336c57b6c76
 DIST fscheck.2.16.5.nupkg 1202407 BLAKE2B 0da4c276a6e0a1c68f0513a2e1c65291adfe527d89eb005a684937f895d9040d0bfcf5e8c657c6fc112fbfb9b889e4a6c010a0f92789796d0166d93d624a147a SHA512 a1bcecd7c86bd5598d585071c54b404fa8db4d9ed744562dbd83023a6b28b27eaff703353370f127f28bd8dcc6bfd6689640bdd177f5e947a9fbe5353e454367
@@ -211,4 +212,5 @@ DIST thoth.json.net.8.0.0.nupkg 172424 BLAKE2B 4c8e822c24add902b9ff56709a6e81c73
 EBUILD fantomas-6.3.1.ebuild 9006 BLAKE2B 68f1eb716617093dd4e44cc8af44c834a9b3494ebfe862acc650e578abb6c3be4b9bc50a7553eb0391884e5e174c09115b537d50e6b0fe46ae811bb0a639a211 SHA512 a47a8573d2e110cd00012aae89736f67487b72d34ac4f63b9c9eb3a45bb8e35bff0fa0ade03f887df764aa323237735f12c52eb11dfd0613a39053d573d02071
 EBUILD fantomas-6.3.4.ebuild 9007 BLAKE2B da5eeecc465d5e030202077ae6e4c7423c92705ae7efb43b55fa9d1a0893c8d0541cf1c686ca93398ab8a2d62f48b6f9fdc9d616622d2981cb002851bd94c8dd SHA512 487074a593a625ec4dc588864d9bb85e2d33485fc1844e2a3acc26914c732c5997839910dde3b2cd0aea3559ecbebe7cbdb09978c6a636908c3ad9a18a080948
 EBUILD fantomas-6.3.5.ebuild 9007 BLAKE2B 94f088d64899394839bb22e89c990e9268af0432be274ae0074489746c564b0f6a89a48288d14ebfbfb807b484ad35e2ee526530e99d6213ae24e18648afd6c2 SHA512 e7a614d7b3e0126526a73dfd8f0d2aabf002fe3bfd9232939ef883a411d332c8163e34aede97858fe4e06aa7315309f4643fb18d0ce5fb8cb5ad6e66da32c665
+EBUILD fantomas-6.3.7.ebuild 9007 BLAKE2B 94f088d64899394839bb22e89c990e9268af0432be274ae0074489746c564b0f6a89a48288d14ebfbfb807b484ad35e2ee526530e99d6213ae24e18648afd6c2 SHA512 e7a614d7b3e0126526a73dfd8f0d2aabf002fe3bfd9232939ef883a411d332c8163e34aede97858fe4e06aa7315309f4643fb18d0ce5fb8cb5ad6e66da32c665
 MISC metadata.xml 579 BLAKE2B 820d0e9c7adaacf5a8a8aa5bc0c8fa93c1738923e7ae902f5f64f7fa45ba9d0c8e34db7dbe4bd6ced70a70c49a789fb5931aa5b6553825a7fd889bc7ed560a51 SHA512 e5d7080a05c00b2de1f90f557162a9bc6e78937b2750a98d33c476e0b7a6d41047003260a147c1d54c23e6968fcee70e25e3b3f9406c4b89f9ec9049fdd33a51
diff --git a/dev-dotnet/fantomas/fantomas-6.3.7.ebuild b/dev-dotnet/fantomas/fantomas-6.3.7.ebuild
new file mode 100644
index 000000000000..f5b9efc1723e
--- /dev/null
+++ b/dev-dotnet/fantomas/fantomas-6.3.7.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOTNET_PKG_COMPAT=8.0
+NUGETS="
+dotnet-fsharplint@0.19.2
+fantomas@6.3.0
+fsdocs-tool@20.0.0
+fsharp-analyzers@0.25.0
+
+argu@6.2.4
+cliwrap@3.6.4
+commandlineparser@2.9.1
+dotnet.reproduciblebuilds@1.1.1
+editorconfig@0.15.0
+fable.core@3.0.0
+fparsec@1.1.1
+fscheck@2.16.5
+fsharp.analyzers.build@0.3.0
+fsharp.core@5.0.1
+fsharp.core@6.0.7
+fsharp.core@8.0.101
+fsharp.data.csv.core@6.3.0
+fsharp.data.html.core@6.3.0
+fsharp.data.http@6.3.0
+fsharp.data.json.core@6.3.0
+fsharp.data.runtime.utilities@6.3.0
+fsharp.data.worldbank.core@6.3.0
+fsharp.data.xml.core@6.3.0
+fsharp.data@6.3.0
+fslexyacc.runtime@11.2.0
+fslexyacc@11.2.0
+fsunit@6.0.0
+fun.build@1.0.3
+fun.result@2.0.9
+g-research.fsharp.analyzers@0.9.3
+gee.external.capstone@2.3.0
+humanizer.core@2.14.1
+iced@1.17.0
+ignore@0.1.50
+ionide.analyzers@0.9.0
+ionide.keepachangelog.tasks@0.1.8
+ionide.keepachangelog@0.1.8
+messagepack.annotations@2.2.85
+messagepack@2.2.85
+microsoft.bcl.asyncinterfaces@1.1.0
+microsoft.bcl.asyncinterfaces@5.0.0
+microsoft.build.tasks.git@1.1.1
+microsoft.codeanalysis.analyzers@3.3.3
+microsoft.codeanalysis.common@4.1.0
+microsoft.codeanalysis.csharp@4.1.0
+microsoft.codecoverage@17.8.0
+microsoft.diagnostics.netcore.client@0.2.251802
+microsoft.diagnostics.runtime@2.2.332302
+microsoft.diagnostics.tracing.traceevent@3.0.2
+microsoft.dotnet.platformabstractions@3.1.6
+microsoft.extensions.configuration.abstractions@2.1.1
+microsoft.extensions.configuration.binder@2.1.1
+microsoft.extensions.configuration@2.1.1
+microsoft.extensions.dependencyinjection.abstractions@2.1.1
+microsoft.extensions.logging.abstractions@2.1.1
+microsoft.extensions.logging@2.1.1
+microsoft.extensions.options@2.1.1
+microsoft.extensions.primitives@2.1.1
+microsoft.net.test.sdk@17.8.0
+microsoft.netcore.platforms@1.1.0
+microsoft.netcore.platforms@1.1.1
+microsoft.netcore.platforms@2.1.2
+microsoft.netcore.platforms@5.0.0
+microsoft.netcore.targets@1.1.0
+microsoft.netcore.targets@1.1.3
+microsoft.sourcelink.azurerepos.git@1.1.1
+microsoft.sourcelink.bitbucket.git@1.1.1
+microsoft.sourcelink.common@1.1.1
+microsoft.sourcelink.github@1.1.1
+microsoft.sourcelink.gitlab@1.1.1
+microsoft.testplatform.objectmodel@17.8.0
+microsoft.testplatform.testhost@17.8.0
+microsoft.visualstudio.threading.analyzers@16.9.60
+microsoft.visualstudio.threading@16.9.60
+microsoft.visualstudio.validation@15.5.31
+microsoft.visualstudio.validation@16.8.33
+microsoft.win32.primitives@4.3.0
+microsoft.win32.registry@5.0.0
+nerdbank.streams@2.6.81
+netstandard.library@2.0.3
+newtonsoft.json@11.0.2
+newtonsoft.json@12.0.2
+newtonsoft.json@13.0.1
+nuget.frameworks@6.5.0
+nunit3testadapter@4.5.0
+nunit@4.0.1
+perfolizer@0.2.1
+runtime.any.system.collections@4.3.0
+runtime.any.system.diagnostics.tracing@4.3.0
+runtime.any.system.globalization.calendars@4.3.0
+runtime.any.system.globalization@4.3.0
+runtime.any.system.io@4.3.0
+runtime.any.system.reflection.primitives@4.3.0
+runtime.any.system.reflection@4.3.0
+runtime.any.system.resources.resourcemanager@4.3.0
+runtime.any.system.runtime.handles@4.3.0
+runtime.any.system.runtime.interopservices@4.3.0
+runtime.any.system.runtime@4.3.0
+runtime.any.system.text.encoding.extensions@4.3.0
+runtime.any.system.text.encoding@4.3.0
+runtime.any.system.threading.tasks@4.3.0
+runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.native.system.net.http@4.3.0
+runtime.native.system.security.cryptography.apple@4.3.0
+runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.native.system@4.3.0
+runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple@4.3.0
+runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.unix.microsoft.win32.primitives@4.3.0
+runtime.unix.system.diagnostics.debug@4.3.0
+runtime.unix.system.io.filesystem@4.3.0
+runtime.unix.system.net.primitives@4.3.0
+runtime.unix.system.private.uri@4.3.0
+runtime.unix.system.runtime.extensions@4.3.0
+semanticversion@2.1.0
+semanticversioning@2.0.2
+serilog.sinks.console@5.0.1
+serilog@3.1.1
+serilogtracelistener@3.2.1-dev-00011
+spectre.console@0.46.0
+spectre.console@0.48.0
+streamjsonrpc@2.8.28
+system.buffers@4.3.0
+system.buffers@4.5.1
+system.codedom@5.0.0
+system.collections.concurrent@4.3.0
+system.collections.immutable@5.0.0
+system.collections.immutable@7.0.0
+system.collections@4.3.0
+system.configuration.configurationmanager@4.4.0
+system.diagnostics.debug@4.3.0
+system.diagnostics.diagnosticsource@5.0.1
+system.diagnostics.diagnosticsource@7.0.0
+system.diagnostics.tracing@4.3.0
+system.globalization.calendars@4.3.0
+system.globalization.extensions@4.3.0
+system.globalization@4.3.0
+system.io.abstractions.testinghelpers@20.0.4
+system.io.abstractions@20.0.4
+system.io.filesystem.primitives@4.3.0
+system.io.filesystem@4.3.0
+system.io.pipelines@5.0.1
+system.io@4.3.0
+system.linq@4.3.0
+system.management@5.0.0
+system.memory@4.5.1
+system.memory@4.5.3
+system.memory@4.5.4
+system.memory@4.5.5
+system.net.http@4.3.4
+system.net.primitives@4.3.0
+system.net.websockets@4.3.0
+system.numerics.vectors@4.4.0
+system.private.uri@4.3.0
+system.reflection.emit.ilgeneration@4.6.0
+system.reflection.emit.ilgeneration@4.7.0
+system.reflection.emit.lightweight@4.6.0
+system.reflection.emit@4.7.0
+system.reflection.metadata@1.6.0
+system.reflection.metadata@5.0.0
+system.reflection.primitives@4.3.0
+system.reflection@4.3.0
+system.resources.resourcemanager@4.3.0
+system.runtime.compilerservices.unsafe@4.5.2
+system.runtime.compilerservices.unsafe@4.5.3
+system.runtime.compilerservices.unsafe@4.7.1
+system.runtime.compilerservices.unsafe@5.0.0
+system.runtime.compilerservices.unsafe@6.0.0
+system.runtime.extensions@4.3.0
+system.runtime.handles@4.3.0
+system.runtime.interopservices@4.3.0
+system.runtime.numerics@4.3.0
+system.runtime@4.3.0
+system.runtime@4.3.1
+system.security.accesscontrol@5.0.0
+system.security.cryptography.algorithms@4.3.0
+system.security.cryptography.cng@4.3.0
+system.security.cryptography.csp@4.3.0
+system.security.cryptography.encoding@4.3.0
+system.security.cryptography.openssl@4.3.0
+system.security.cryptography.primitives@4.3.0
+system.security.cryptography.protecteddata@4.4.0
+system.security.cryptography.x509certificates@4.3.0
+system.security.principal.windows@5.0.0
+system.text.encoding.codepages@4.5.1
+system.text.encoding.extensions@4.3.0
+system.text.encoding@4.3.0
+system.threading.tasks.dataflow@5.0.0
+system.threading.tasks.extensions@4.5.4
+system.threading.tasks@4.3.0
+system.threading@4.3.0
+testableio.system.io.abstractions.testinghelpers@20.0.4
+testableio.system.io.abstractions.wrappers@20.0.4
+testableio.system.io.abstractions@20.0.4
+thoth.json.net@8.0.0
+"
+
+inherit check-reqs dotnet-pkg
+
+DESCRIPTION="FSharp source code formatter"
+HOMEPAGE="https://fsprojects.github.io/fantomas/
+	https://github.com/fsprojects/fantomas/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fsprojects/${PN}.git"
+else
+	SRC_URI="https://github.com/fsprojects/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+SRC_URI+=" ${NUGET_URIS} "
+
+FCS_COMMIT="050271d631956a4e0d0484a583d38236b727a46d"
+SRC_URI+="
+	https://github.com/dotnet/fsharp/archive/${FCS_COMMIT}.tar.gz
+		-> fsharp-${FCS_COMMIT}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+
+CHECKREQS_DISK_BUILD="2G"
+DOTNET_PKG_PROJECTS=(
+	src/Fantomas/Fantomas.fsproj
+)
+DOTNET_PKG_BAD_PROJECTS=(
+	src/Fantomas.Benchmarks/Fantomas.Benchmarks.fsproj
+)
+DOTNET_PKG_RESTORE_EXTRA_ARGS=(
+	--force-evaluate
+)
+
+DOCS=( CHANGELOG.md README.md docs/docs/{contributors,end-users} )
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	dotnet-pkg_pkg_setup
+}
+
+src_unpack() {
+	dotnet-pkg_src_unpack
+
+	if [[ -n "${EGIT_REPO_URI}" ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	dotnet-pkg_src_prepare
+
+	# Reimplementing "dotnet build.fsx -p Init" in shell.
+	mkdir -p "${S}/.deps" || die
+	ln -s "${WORKDIR}/fsharp-${FCS_COMMIT}" "${S}/.deps/${FCS_COMMIT}" || die
+	find "${S}/.deps/${FCS_COMMIT}/src" -type f \
+		 -exec sed -e "s|FSharp.Compiler|Fantomas.FCS|g" -i {} + || die
+}
+
+src_configure() {
+	dotnet-pkg-base_restore_tools
+	dotnet-pkg_src_configure
+}
+
+src_test() {
+	local -a test_projects=(
+		Fantomas.Core.Tests
+		Fantomas.Tests
+	)
+	local test_project
+	for test_project in "${test_projects[@]}" ; do
+		dotnet-pkg-base_test "src/${test_project}/${test_project}.fsproj" \
+			-p:RollForward=Major
+	done
+}
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 9b5042a56a8f..4f2f2567bb79 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/hashtables/Manifest b/dev-haskell/hashtables/Manifest
index a3e12c6ade4f..bf9f5c7a9ec0 100644
--- a/dev-haskell/hashtables/Manifest
+++ b/dev-haskell/hashtables/Manifest
@@ -1,3 +1,4 @@
+AUX hashtables-1.3.1-clang-argument-must-be-a-constant-integer.patch 544 BLAKE2B 89a667563eda6c3d865ae76ae3cc4284fc990652a5f98924537d00cb48f1b878420e917b78f46201fd857bdcdca1a6bc2f0cde121f9bde7fe458e9bda0325b5f SHA512 7bf1871e909e0b947f7e7bc9877e0b44e3cae70de9b59db60eddb3a324d5cba011de36d021fdb75136a0c1cdf0e5688a61ed3eba76ecb60e351a05cdbf62fc07
 DIST hashtables-1.3.1.tar.gz 58697 BLAKE2B d543987f667553b0739b414600190127840cb656d1509cb2541274bed00c298d176ff8ae059f79cc1dbf9201f1e76697103c9620a6208e9a9bf744cafea379d5 SHA512 b6430e092cfa9cde3dbea34cd9e2a10869c41e40e88f79e28aa6aabfdcd359dd74fb87020f8b9e004b817a6e9a8825335fcc91c2b88f7eb93b25758c71c77833
-EBUILD hashtables-1.3.1.ebuild 1464 BLAKE2B 58a695449e158c0519925e3109f8e75753320c0c5ae72531fbbd1547d3e93b5b019912ee0a5336ca8151d9b54d3786ec833ad09df1f98094abf819c5da4cee2b SHA512 81072c6de4c24449cc5bb5d683a6f0782330869a09ce8959cea03d68b873736caaaf7067b153f61cbae15de11e5dc2a611cfe4de3b7305ccb801a25cabe88297
+EBUILD hashtables-1.3.1.ebuild 1552 BLAKE2B 9a2810ffd4c47efe4576e70b5e05419d5da262014b1dc311d5f6bcab0e57fc61f315c498d2f49d00899b0210d2dcd69da8fabd875fc5130941cfbd34376de510 SHA512 82c74b7486c1df95c3df2dee3eb33ca230b15aadc1a92dc179b5b572ed23e85792dde94471d39c717e227af192d2b8ebae5ecf367364e552229ef63ec187eb6e
 MISC metadata.xml 588 BLAKE2B eb31d4540f9b46e9b8650f0e9b5013870cc0f6f37928fe5e51b11c4a6d22493c631f7eaf8d1cd91627e86e70159675948675a0b0af59ec414107f6d34911ba1d SHA512 908db425a90142de96cf9d722b3935f6f73d82d798e8efb7bc24d6479eccbee9a66ff898c6f2663cdfa6c6f91baae392b1cb2ec35b2358dcb0d1fe2c4e832b15
diff --git a/dev-haskell/hashtables/files/hashtables-1.3.1-clang-argument-must-be-a-constant-integer.patch b/dev-haskell/hashtables/files/hashtables-1.3.1-clang-argument-must-be-a-constant-integer.patch
new file mode 100644
index 000000000000..a8dd7bcd9a87
--- /dev/null
+++ b/dev-haskell/hashtables/files/hashtables-1.3.1-clang-argument-must-be-a-constant-integer.patch
@@ -0,0 +1,12 @@
+--- hashtables-1.3.1-orig/cbits/sse-42.c	2001-09-09 11:46:40.000000000 +1000
++++ hashtables-1.3.1/cbits/sse-42.c	2024-06-01 12:50:27.039285052 +1000
+@@ -49,8 +49,7 @@
+ #define _MODE (SIDD_UWORD_OPS | SIDD_CMP_EQUAL_EACH)
+ 
+ static inline __m128i cmp_mask(__m128i a, __m128i b) {
+-    const int mode = SIDD_UWORD_OPS | SIDD_CMP_EQUAL_EACH | SIDD_BIT_MASK;
+-    return _mm_cmpistrm(a, b, mode);
++    return _mm_cmpistrm(a, b, SIDD_UWORD_OPS | SIDD_CMP_EQUAL_EACH | SIDD_BIT_MASK);
+ }
+ 
+ static inline int32_t line_result(uint32_t m, int start) {
diff --git a/dev-haskell/hashtables/hashtables-1.3.1.ebuild b/dev-haskell/hashtables/hashtables-1.3.1.ebuild
index 13d8df830c14..34972a4fa001 100644
--- a/dev-haskell/hashtables/hashtables-1.3.1.ebuild
+++ b/dev-haskell/hashtables/hashtables-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,6 +36,10 @@ DEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.1-clang-argument-must-be-a-constant-integer.patch
+)
+
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag bounds-checking bounds-checking) \
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 32f26869d799..d3e9de4c857a 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
index 9a5e96a590b7..28153795482d 100644
--- a/dev-java/javatoolkit/Manifest
+++ b/dev-java/javatoolkit/Manifest
@@ -1,3 +1,3 @@
 DIST javatoolkit-0.6.7.tar.bz2 24514 BLAKE2B 5da4c95ac561b71a3019c265a5233eb825f5f57ae35e1dfefccc2fc26a5c967dcf562c321ff61f6ad4d702f4f656927cf21fa32eadb2454b18444505ba16ae91 SHA512 34e9e9d08ed486f57bbb33bed437ff7e4bbdcb6ff8f57c338e787db0ca5688a27eaf9e21f47b5d245279c58cbdaeab0d61b469b3f176ab37a18f122123c885d0
-EBUILD javatoolkit-0.6.7.ebuild 764 BLAKE2B e97c65b931c406623071097f52fd094d1d187014df797b53dc8718f9e97d81146e86c65da923abab38a09c789baf5a6ca8c8cbaca9e865b6272cd9fd56c9fd32 SHA512 132878521df7f592b806c396af5f20237d6dfb6abea4bb7fafe90ad94577b0fd073387853258c6b22b62552e6f8eb1f824754e98bc0f580ccedf6bda8b5e2b01
+EBUILD javatoolkit-0.6.7.ebuild 768 BLAKE2B 296db65615eb08d890e81f6d56d43fffe4445ffbe427a7415bcd3f28782ab8201bce6ddff010f9f5526ecca5a8d5667867cf689238a10988565647eb969d97c8 SHA512 91ebe663cf0c95ad8b3cbcfd7fbd13f31bbc8ff105bd6907c4366543046ae7f3dc17f06b54accd0de15667444e015ab05e718fc03735fb999ecda349d3fb0679
 MISC metadata.xml 400 BLAKE2B 748187af36d7fa0cfb430e8b853ff76739291b8f96cf6dde2d086e3433a07f4dcd486b763dbc7f89493027a8ef83750621d3a53ca07a8cd74d78f308a7a1ef42 SHA512 36fda254bdc3a8a53656e7b6fabf72bec16e94529a895c11340bcc97b554d7daa7673568cab72376dfa4ecbb8267fb63c5b14e8ae304c33002ccde0fd9b8fc0a
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild
index 71d14029e93b..c7f6e71045b2 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="xml(+)"
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 prefix
 
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index db5d135b98d7..49e146710a6b 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -1,5 +1,5 @@
 AUX lucene-2.4.1-javacc.home.patch 349 BLAKE2B 84c84886c40848052358b835c2bd5f3dec031c583bac8db9060b0a2e02a79e142ee2d1ea6e156179eb6de6b54aa22bea97ace36313222be0b65d6fb0d54a40b6 SHA512 83e57c94d3e432b0a1a4ec2d4d1d1acebd0b0ea451f0c39f03b5a62a0c8978da541de0009b4956c1672097df7f2c816c73590ec6077533d73a9d2309597cde1c
-AUX lucene-2.4.1-skipFailingTest.patch 1012 BLAKE2B c0af8c7f4c06f16a77e6de18eaf38b5a7b8178d4627e617a854950b2050553d4895cfc687ce4217ed6a442c8af599fda35ea8fe8c2887912e989fc71bc5f5617 SHA512 37838db1079f9bdee1ac364b713cb65f1579387132b50dd6a769478f2b0a4406b3595264354710135444aa5a16267a2d94a9708f3edb805deb74edff864d7643
+AUX lucene-2.4.1-skipFailingTest.patch 1010 BLAKE2B f415e401c30daf4fff339b2419301d2b7b63287b42069c7e5a1cee6e55c1fffee20d341770299ae4193d5a02be7c5e7f1e93c8d7c395972eb123f07a85d7ce93 SHA512 70bad0a13a2726528881bd996407e09aa80401601da031ade74a4f2f8f7ccc502e5c345b543ce575dfcbf1495ffa71ce7440ccf608dbd821f0c37e42eea40dbc
 DIST lucene-2.4.1-src.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e
 DIST lucene-2.4.1-src.tar.gz.asc 189 BLAKE2B 614fc428936d49caac1072e5c4fe5a31d86545220483f1e60fee6560b3bf1d661eb718013c8211ff701758aff37ebe3ffe18bb0a94d90b75962d1e74b8005f6b SHA512 38eee5a062ca11c638b3a0e131ffe133b49e9c759216d854f2be99e27a8445408b1097df28436e6155f551df0ddf9ca16a286652c9ce12dc114228bbd125dba2
 EBUILD lucene-2.4.1-r4.ebuild 2083 BLAKE2B d862647f006b0115168d1299934927e80f6db03fdc95b66985343736e4fa50e7e96e3a5e37d9c637ae5670e16974ddecdf5bf1046cf26481d1849498395f4e9a SHA512 163b9ad1667e8a1be7cec2d1b62dc0304b3e9d144570a185f89470b710c1439b6de80ad4b4245bcd03acfc667ac28cf5b3401b314af3755d573fc28e6d1cd5f7
diff --git a/dev-java/lucene/files/lucene-2.4.1-skipFailingTest.patch b/dev-java/lucene/files/lucene-2.4.1-skipFailingTest.patch
index 3921253f1f29..d8e3611539aa 100644
--- a/dev-java/lucene/files/lucene-2.4.1-skipFailingTest.patch
+++ b/dev-java/lucene/files/lucene-2.4.1-skipFailingTest.patch
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 217c1e8943b3..055e1b7948b8 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -20,8 +20,8 @@ DIST swt-4.31-gtk-linux-aarch64.zip 4019864 BLAKE2B 597f9c2ce1382aacd4667c7d1fc3
 DIST swt-4.31-gtk-linux-ppc64le.zip 4036590 BLAKE2B da9ad8a7e0bf168b024c4e1fbdbcc01154ec0d7e8b38b2912ba7edf1bf8239f05a9ce1f08790174158ebb788c9cc3adf754d13942fc8aa0fe9d4a53177a814ff SHA512 bf8f3f45b4229db383839a64b7d08294340ab2f0c623be8e382609b5ff9a59683229bb308d49480ffb01596ab050d45f97894fec99c0d4eb710e60c40b864531
 DIST swt-4.31-gtk-linux-x86_64.zip 4039479 BLAKE2B 6f7e434acf57cd03dd5e938b1b1c578339b3d7817202681a15420ebdec3be10b95b1bf5eca6f1cf71de9a5a0c390d2d6ee903c2a71e8974e03987cc52322e44d SHA512 da61610ce00fc46893ec3ee6d5d7ed5cc59312002c6946a3748cff1a776af75bad0026512b412ef1622ca0bee124764ed8ee7f5f87364cff945b296feb86e74b
 EBUILD swt-3.7.2-r4.ebuild 4440 BLAKE2B 6164e475706b71782671978cc34cf5cdf14b8668132fec49bbfaa03753a92794b0258d6ad09e3cf1582ca4207c824b787b62c958501a09afc17a2d3e69ad190d SHA512 a864f326933d855d6194035bc8582f7df201377af6b5bc4e2abdb16b711edf5d72f560f628ff89f5b426e7c2c63a3dbfef0bdf041dc9907ab6f71cc2b26671b6
-EBUILD swt-4.10-r3.ebuild 4252 BLAKE2B 3ffe9b50cc36d4f0be3300898039590459e9c093bb11fee761044018dc0e950331db461f7040fe6d5734303926d82eb7ef27f1d48832eff441d20226055bd3c7 SHA512 96a2993d48df58294737eba91aa7d2dac86a71c50947e07409debb38bc04028ef4dd4dab24cad7b0d4d067c090477f16e7ae7e686419582e4d799bd9cf3f1092
-EBUILD swt-4.29.ebuild 3440 BLAKE2B ac5dabbbcace7d28eb352a8851a0f1dd1ed72f3285215b639221c99db118c831524f563162876be9cca02ce21bd8b2d8a0b90f2983a68000cdbca562ce2c6d73 SHA512 7b1eacbda33353ab91d7deeb73889e9245664862c6c279def64a60a351f91b0b917223a4da9af2279416d1a2992383587a1427f15188b7ef6ecd1e62b7f465c5
-EBUILD swt-4.30-r1.ebuild 3510 BLAKE2B 74d7f75d69a3a6afeb61d0ff3f2a184093b94642a15507fb0291264925cb3238a238f901793c689475a4a6a2f33996932eb10ebabb27e785a0bf90bd92d02e19 SHA512 fd6a05e634a852b3400285afc951e8ee7a493d636e887cde369140b34795cc69c32e6f1ae7d06d689b271eb39120ee52e4e4c5d4f0792b847effb257fdb3bc8d
-EBUILD swt-4.31.ebuild 3580 BLAKE2B 1355d65a483725e44ee24508cc8168945f077e65704fb481b575459b6b1fc650c9df881515f8b47428ade7268db7b25424fb79d3ff9d6013a71fd534bb538992 SHA512 3e6fb7dd560ba838f56564bf5a7cb523bd4509e72665bc9394b1f9fe10ac6927f778a0766122dc1f166ec4b2d98bef79132683c3738b7a3242d6b06d5bb702ef
+EBUILD swt-4.10-r4.ebuild 4269 BLAKE2B 3ef14892698d8df50f090443a8e15f8b0a048b378f5a5a15d9430f3cd2aba36f68d3556444ba43f5e538c5841dc93717ecf91f032bc7cccce98e3a74ca3e12c1 SHA512 79b77fcb263f657fc386b887e1d815165cf87af5bc32ece128eef71845746173cac16cdfb42277e803244d3f507b618c424b65a5e079cbaef57fcaa4932c1070
+EBUILD swt-4.29-r1.ebuild 3457 BLAKE2B ea98a5170abae41c7e18637b127d4ffc9f67e2e92042dc97ee191780672813d94904758463c48cb5402d9d838b5e12d0a47a5c7218c0f424f2a30773445d0d92 SHA512 ed7a98c317bbb259fb9c732631c33a1291ae986bdf158cc0abc0c81cd3b28600747cc8af5d8bfcf8df5f61a7dff3697d1572358ca352cb7ce8eaa64089bf5504
+EBUILD swt-4.30-r2.ebuild 3527 BLAKE2B 0244ca3c7ba1b60277a4ec1a4eaeb53e5f254b0982e49e990a29acaeace91c14d019d7432bccf61598abe8622cb32d4bf035882e53573e0be276c1bcdb59b97c SHA512 d715601364f15c50460bb812f4384a24ecb05275cb833c59e911a292eac009ece65aff95e0fa9425ef04087a6a2311e3772d1a31629b7e4080fd2a2f2d4a0917
+EBUILD swt-4.31-r1.ebuild 3597 BLAKE2B 3ebfa0ada9993a92ee67868ee6070b0a4812b455e3e3209e1a00abe4a528c2202be78d413d62123d113edfd22d998d728d2913b4d03296922a01cde4835ce8c8 SHA512 414e93ee4cc2398bb5f7b1b7079a865e48a0d3de4dcd62bba170c2207d4283fe7eace273736335233a6b16848f73890f59646ff763ba311d5aa75ecb5c146870
 MISC metadata.xml 761 BLAKE2B f70a4d3ff5fcfad5705772396957664e700bd3ffe9580ac141c5faa11e24562b0cbc199a2f49d61d6a2a08058374dc1b7bfd9ae258e4a692e5b3c340f478da25 SHA512 1e8b8ceb30071c8271365a2d515e094c11ab569c4fee7b7f905d5de0a7613518320a1912b2b958d816e04d9876ed75425e16de9a35e1d6be6466888e08a420b3
diff --git a/dev-java/swt/swt-4.10-r3.ebuild b/dev-java/swt/swt-4.10-r4.ebuild
index 5b0d33375cad..9c3211738446 100644
--- a/dev-java/swt/swt-4.10-r3.ebuild
+++ b/dev-java/swt/swt-4.10-r4.ebuild
@@ -47,7 +47,8 @@ DEPEND="${COMMON_DEP}
 	x11-libs/libXt
 	x11-libs/libXtst"
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.8:*"
+	>=virtual/jre-1.8:*
+	x11-libs/libX11"
 
 # JNI libraries don't need SONAME, bug #253756
 QA_SONAME='usr/lib[^/]*/libswt-[^/]+.so'
diff --git a/dev-java/swt/swt-4.29.ebuild b/dev-java/swt/swt-4.29-r1.ebuild
index 08361076b0b5..6dbc30c768f9 100644
--- a/dev-java/swt/swt-4.29.ebuild
+++ b/dev-java/swt/swt-4.29-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -44,7 +44,8 @@ DEPEND="${COMMON_DEP}
 	x11-libs/libXt
 	x11-libs/libXtst"
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.8:*"
+	>=virtual/jre-1.8:*
+	x11-libs/libX11"
 BDEPEND="
 	app-arch/unzip
 	virtual/pkgconfig
diff --git a/dev-java/swt/swt-4.30-r1.ebuild b/dev-java/swt/swt-4.30-r2.ebuild
index f0ea9b557f4b..61d849831270 100644
--- a/dev-java/swt/swt-4.30-r1.ebuild
+++ b/dev-java/swt/swt-4.30-r2.ebuild
@@ -45,7 +45,8 @@ DEPEND="${COMMON_DEP}
 	x11-libs/libXtst"
 # error: pattern matching in instanceof is not supported in -source 11
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-17:*"
+	>=virtual/jre-17:*
+	x11-libs/libX11"
 BDEPEND="
 	app-arch/unzip
 	virtual/pkgconfig
diff --git a/dev-java/swt/swt-4.31.ebuild b/dev-java/swt/swt-4.31-r1.ebuild
index 5d3dfd9effdc..382a538ccff2 100644
--- a/dev-java/swt/swt-4.31.ebuild
+++ b/dev-java/swt/swt-4.31-r1.ebuild
@@ -50,7 +50,8 @@ DEPEND="${COMMON_DEP}
 	x11-libs/libXtst"
 # error: pattern matching in instanceof is not supported in -source 11
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-17:*"
+	>=virtual/jre-17:*
+	x11-libs/libX11"
 
 HTML_DOCS=( ../about.html )
 
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 9b3ba2cd1cf2..64f89f1808af 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index f54368b272a5..f32c8e8fcad6 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -22,5 +22,5 @@ EBUILD ocaml-4.12.1.ebuild 2524 BLAKE2B 379f9ca34424f1866d26ac392e49b1e3a276e348
 EBUILD ocaml-4.13.1.ebuild 2487 BLAKE2B 7e78f1e7d2023a5d243b7c4fc770bc439dfcdb245d528a596a08af9aa7d776ec3ccdd822eed9a51c4eca009e6c9712b9da2ed2beb7cea672f86e2271dce4dc50 SHA512 dba4a7593e164e6949ce7daddd9e0234db9d874adb17fd3c2bc2ffc67d67b557735a4a6ddb66af9d2c463a8ac474866395529d5f2b4443b0fbca44b0b6ce0974
 EBUILD ocaml-4.14.0-r1.ebuild 2508 BLAKE2B 333b6a84bc469d964cd8385fde845dc9a9c0f9a9b1463a87623bf09972415a651adb5c6098d3ab77a77c5dc05e5b345f20782838e49889d1fe8f900e4b26e447 SHA512 e41e0849502b7692f990f679fb2e8d50b183643ad71cd9e2171621db57143c7ea01d9caa317222118aa0a5fd5021b00c8548ebad600278a293d18432948c9e9e
 EBUILD ocaml-4.14.1.ebuild 2446 BLAKE2B 09e43241eb2b0c9219963a777648fe7db4ea4829b1e089d4d08f494066e6230a4f4f49f08b3db26b882fe4916a3842af4e637fe4866c811bd8ecfefed5a08219 SHA512 1db8ce4ddb772e4ac7fe3c03e80237ece1c459ab42161cbd6fc9d22a86f59318dda3d2b74eaf7359005f488dfb15c1a30c51c2e6caceed779dbe9ef7e6a7b2d0
-EBUILD ocaml-4.14.2.ebuild 2451 BLAKE2B b1ef54d0818b4495c83eda065b51415122fc1407000c7cb3f3597784d374aa98426d824ebb7566eb74eb9dbc1a5f57d6b023c7bfd810bfa0e9d7f4469f3cbfca SHA512 54221fb06950adc412555abd731407b009c8de8e10cde3dc5ae89c3414cb72d5b1f54a2652d519970c859c49a40a8c440ba08322d4faf3d58592d7df558960cf
+EBUILD ocaml-4.14.2.ebuild 2567 BLAKE2B e6946e76e1bf235cfece9f1ea55948b967d3c1a791011f51fc5da5e57805e77be5b289b059aeea7e4ea230e449f85d09779c71f57a92528a9bb5a80cba0b8277 SHA512 9e94e7d5b5fb5d36d2619fd1710a801c5ceb0df5461c43386862214303a6971215406b1c248b4dd1af928e6dd36eb81be91e14b55d567baf2733d77f0f7d7af4
 MISC metadata.xml 671 BLAKE2B 452ea340c8abacedbdb20a344cffa9b91db2251e0174db596e4f96bf2b1c9d308ceb035e0870e738a15c313003fcbf39bb91c5f68b40a185e5e08e3ea7042616 SHA512 1d8248e2b05b145c804cc9cce6aa617bd6466f26326033cee06ed27ceb93ebc88b62f3badbfe13092fbaa89c3a71087491b88c4fc094da8624ab668cdc73b383
diff --git a/dev-lang/ocaml/ocaml-4.14.2.ebuild b/dev-lang/ocaml/ocaml-4.14.2.ebuild
index f94e0f851126..bb61347421c2 100644
--- a/dev-lang/ocaml/ocaml-4.14.2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.14.2.ebuild
@@ -79,6 +79,10 @@ src_test() {
 }
 
 src_install() {
+	# OCaml generates textrels on 32-bit arches
+	if use arm || use ppc || use x86 ; then
+		export QA_TEXTRELS='.*'
+	fi
 	default
 
 	dodir /usr/include
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index c5ac1f1a8076..58721035a0ec 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -11,6 +11,6 @@ DIST spidermonkey-102-patches-05j.tar.xz 4596 BLAKE2B 215b770bbdf17973d7b3fd1df6
 DIST spidermonkey-115-patches-01.tar.xz 3992 BLAKE2B e97d0cb3edfb885119226f54f22485ed4e8220cd904d3356b87ccc013403f976a042171cf9ca7250bcf3fe3d90996dd80b4104e7d614f95d7bcfcb0e710a8a78 SHA512 cece96f172a09dd0e29f7c2fdbf650cde405b276bc4083956365289f1da4b1d078ccbde760da6553888ddb3c53cf9aded52051db556a2c4ec492fed01dcb03a1
 EBUILD spidermonkey-102.15.0.ebuild 15624 BLAKE2B a10e3fb8fcbc0f0016778a3c5bb1caea09b05eef2d059f5bb920158b45e9f15ab1e9bd9da90300457e68a147b334a49a86bd1dd07f036feedfa69d17491e63a5 SHA512 c71d02f78d2196e9afa44e3481fa9f6ef8324799b4a4a460eab531ca3d51e09a1b43a15bd2efbac5d11d03bb410babe6400236220684641c97aaa030ee970fdf
 EBUILD spidermonkey-115.10.0.ebuild 13639 BLAKE2B 123643694d19a8346be7ff1e78bf01b4d58fc8cb2205845de1525baeb7e58f915ac6a5ba8162f9755085ce11b93988d7547affcedf6b6313107aa3919c1fcf9a SHA512 4e8f6f57d72efd842b1f66b3993c35585bea9e7c7078045353b0111e2b773dba5fb7214b3b025f006130e2770fc152f2985db84a6d0695ba29447edc072d335e
-EBUILD spidermonkey-115.11.0.ebuild 13655 BLAKE2B 0116f176823e31dcb4a98ca42b0e3946eded5d4c94e99bc092a8a4547ba0f7aa47650a6297e37c38030dbf6d727505d362e852332a0cd96df2054ceca5d771ca SHA512 67701b4736c32b8206f71a4dd50337015e42e341e2317934a16bc3d6af4bccfe7f2a49166814f88e7cb94330eedbba0d9bcc8faf3211a2c626fc4d2203918957
+EBUILD spidermonkey-115.11.0.ebuild 13677 BLAKE2B a7b427b5f698c10bb87ea9554271066094b617e8e584b794ace4de55b3f92fa8f4433f89b44ea651e8d46e21ff07dd39a61b445bc083057cf221622bfaf61149 SHA512 29e048e3c4a27a53ace468f1488dbec63878aea8de9cbef743e795bba9dd27d74f9c6182d5134e7847ccb3ad369fb6e851d1eecd541c546b0ad553464a3bebb9
 EBUILD spidermonkey-115.9.1.ebuild 12934 BLAKE2B d0be2703825b566522d31850e60320c2f250de4683983bfa1474aeef053282321d83b26007fc36ea6429c48f5a528cb47a81627cdbff23754d61275a38776063 SHA512 aaba4bdafce7062a2b8a8b66c0488c4a6b4da519b1ea91b236fde3e7fe1c352205729331e71aae022083cc9dae2dd8b62e23e5dd35e452e3f919e6469b94f5e0
 MISC metadata.xml 513 BLAKE2B 58ffd474492f03c16bda95e48511fb6281e03067d2ad77e994f8117345ecece5da9591dccedafe75b037d98e06851a3759caa4b993adc2910dbb76e1c01a7fa3 SHA512 1ee02bff37e2dabbd72b7f719463b12299270c7960b4cf5a92afab17c954c50e6acb826d4a91db4954fb4a7b0f8669988f2cdb5be991df90e3a605c6b35fdbfb
diff --git a/dev-lang/spidermonkey/spidermonkey-115.11.0.ebuild b/dev-lang/spidermonkey/spidermonkey-115.11.0.ebuild
index 7f16d6e0ba80..30f367f6a1f9 100644
--- a/dev-lang/spidermonkey/spidermonkey-115.11.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-115.11.0.ebuild
@@ -106,10 +106,10 @@ BDEPEND="${PYTHON_DEPS}
 			)
 		)
 	)
-	!clang? ( <virtual/rust-1.78 )
+	!clang? ( virtual/rust )
 	!elibc_glibc? (
 		|| (
-			<dev-lang/rust-1.78
+			dev-lang/rust
 			<dev-lang/rust-bin-1.73
 		)
 	)
@@ -391,9 +391,8 @@ src_configure() {
 		myeconfargs+=( --disable-real-time-tracing )
 	fi
 
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		myeconfargs+=( --enable-rust-simd )
-	fi
+	# We always end up disabling this at some point due to newer rust versions. bgo#933372
+	myeconfargs+=( --disable-rust-simd )
 
 	# Modifications to better support ARM, bug 717344
 	if use cpu_flags_arm_neon ; then
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 3a24871d79ab..2a0434d40356 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index cc925d39276e..dc791ad7a6f5 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1,8 +1,5 @@
-AUX capstone-4.0.2-libsuffix.patch 347 BLAKE2B 5478a08d072cff0873c3410ce99dcf20c7aa12594148102498c7d0ed3216af95712f0daef5e9484d1faf368b93b2b014832ead5466d60d139e9ed7bb2bd1ed02 SHA512 81ffee2dc4a406e980025402dc3f8bee886cba9f305312e03c735d4b47e69887e90240274ae1949ff9900ba2a66413d33e7ef7a9ebb83a3dc9d2769f3d008395
-AUX capstone-9999-werror.patch 533 BLAKE2B ec2589edaf25bcf551cc3b3321fd77109551270da3fbac1c0457031b14aa9bd85dff06440e219e0db22017898d7f2e779e11f63fdcc7e7112baee040393ca1f4 SHA512 c98e83e296147d4520b5323393347739b07e93ef00a339154de131a31c4eba420a6387c23a4f9382408fa9dc243b55a262f73a48412da6bc7d7d1b31cfb19f11
-DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9 SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
+AUX capstone-9999-werror.patch 791 BLAKE2B f8456764a5af797eb0c5ad9460a44c7621e96d0a673450ed7c529b9ba73d90ebd3221aefaee95f210e65c900471aebdc82e6224f9b0ed24d4b855e28b4042ece SHA512 708908bd93f6fad559075414ccd6449fa285afe18d92c377fffaddf475755249fda9cd66e5504379976f350beaf934e5cdd37e8697ff00cc24532372caed15f9
 DIST capstone-5.0.1.tar.gz 7654195 BLAKE2B 83f6681d4c9c748df00daf59f7b33637ab72eee661261c22acae40a6db2def70bb6b5339d731244fdbae6f1e1b0b5b22bb6f60c1390a1bebceb97b3f810aedb0 SHA512 350aba77ce2d96b5c25764913591ba80e4497177ae0a8b2c820c6755ee8310848fbfc54e7ccac27fafc2dbc6778118ad92c53d1b5cb601d4fa146dec7d7e11e5
-EBUILD capstone-4.0.2-r2.ebuild 1536 BLAKE2B ff48fcc776ee396d790f6c1a52a9059fc1db4650b1f73ef5b2de2caa0ed51c662ffef2d53c0008d7a3abb5261dd7ae22fbc0f214882b33e674ab7e64c2929831 SHA512 6b5913274cf1d6c9d6deb0972a2e2d3532b81e52acc88191560effa22bfc8df3374d09ea2ffa5f6ca804c292e671d523793dd937c7e658fe03cbc53ff331f3f7
-EBUILD capstone-5.0.1.ebuild 1772 BLAKE2B f76ea315ba0d0f008d73b41aba175fefb2c97c7bd2b59a5f7d1239d04a925d558cd443a2bc52a18f64d9fb960d6fd6430db0b8a3ae7a9a48eac604a6be46d048 SHA512 a5c49ebf8c4794bac61d2125711cf6f746e8ceab4e8df7b4ab6277a07c759f8d956e87de395b02fc7a4c93f9943d67d6a2b15eabf73c2625a66df45d5f406137
-EBUILD capstone-9999.ebuild 2011 BLAKE2B ba99ea124dc4bde09972d93f5f13878eb79efba8faec9fe0be830a4b925257bdcba3776d5eedf7675c5788438935993e05e987c4c4e22cf74a43e793cbd809ca SHA512 0f43f3a9a17bf0b20aedaa6373c774ec15b551e6641b311857c3d7fba83cc2f0a7c2e04c3f7eb48ff85a95343fa53ef6ce22e8f850a86db484f93d637a9130cc
+EBUILD capstone-5.0.1.ebuild 1799 BLAKE2B 1cf12fc111a83bf589f9f0d29a8eefe3a35bebaba45a6657e05a3a62373046e0a0a8525b7af77c47c397bacafbc92ba92eed4f8976e71362ab62616b28af2134 SHA512 9c591b8383f45d3a7d9cd64f66977f6b7b86fd869028745a422f061cf8844849106f3682c982f1a6b11f93482b33774c779cf06e22a1ca3ac5714592dffdd344
+EBUILD capstone-9999.ebuild 2043 BLAKE2B 1f3402a4ec5367ee7a345a67bbf904dbe90caee87c9a877f52ac736844ee182c9af81c0d4eb80c94f3f17cb45a43bb92988d662a34ea313a57f0159d6fc14f64 SHA512 b74f47af67c46a46bc2aae10bc64049e7875f81205cdf8f5b4d3a962fefd8823d76841e25df2ff93be3001448db3606385a59daf1efa97179767fc4d34504e3c
 MISC metadata.xml 484 BLAKE2B 32c39bf06443ce4ca18191a4c9626cf517d5bd4f837c179e6186a68a0053217bf41d61d2c4d46c9792b1974879d22b36e4a02fa461a1b085acf5c4406bde4891 SHA512 f06dcd3133982f72cf21c5bb3d9a34207d7083233b5e70856f6a1dab60ef361cf1432659af30ea6b90fcb38cfdaec49f0792623ef841e136bc33cb5e1c40d1cf
diff --git a/dev-libs/capstone/capstone-4.0.2-r2.ebuild b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
deleted file mode 100644
index 579ef58d9929..000000000000
--- a/dev-libs/capstone/capstone-4.0.2-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake distutils-r1 toolchain-funcs
-
-DESCRIPTION="disassembly/disassembler framework + bindings"
-HOMEPAGE="https://www.capstone-engine.org/"
-SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/4" # libcapstone.so.4
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-# A few disassembly outputs need an update
-RESTRICT="test"
-
-IUSE="python static-libs test"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-#TODO: needs upstream fixes
-#distutils_enable_tests setup.py
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libsuffix.patch
-)
-
-wrap_python() {
-	local phase=$1
-	shift
-
-	if use python; then
-		pushd bindings/python >/dev/null || die
-		echo distutils-r1_${phase} "$@"
-		pwd
-		distutils-r1_${phase} "$@"
-		popd >/dev/null
-	fi
-}
-
-src_prepare() {
-	tc-export RANLIB
-	cmake_src_prepare
-
-	wrap_python ${FUNCNAME}
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCAPSTONE_BUILD_TESTS="$(usex test)"
-		-DCAPSTONE_BUILD_STATIC="$(usex static-libs)"
-	)
-	cmake_src_configure
-
-	wrap_python ${FUNCNAME}
-}
-
-src_compile() {
-	cmake_src_compile
-
-	wrap_python ${FUNCNAME}
-}
-
-src_test() {
-	cmake_src_test
-
-	wrap_python ${FUNCNAME}
-}
-
-src_install() {
-	cmake_src_install
-
-	wrap_python ${FUNCNAME}
-}
diff --git a/dev-libs/capstone/capstone-5.0.1.ebuild b/dev-libs/capstone/capstone-5.0.1.ebuild
index 2e024af16add..3fc30763814c 100644
--- a/dev-libs/capstone/capstone-5.0.1.ebuild
+++ b/dev-libs/capstone/capstone-5.0.1.ebuild
@@ -35,7 +35,7 @@ DEPEND="${RDEPEND}
 BDEPEND="${DISTUTILS_DEPS}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-distutils_enable_tests setup.py
+RESTRICT="!test? ( test )"
 
 if [[ ${PV} == *_rc* ]]; then
 	# Upstream doesn't flag release candidates (bug 858350)
@@ -90,3 +90,7 @@ src_install() {
 		find "${ED}" -name '*.a' -delete || die
 	fi
 }
+
+python_test() {
+	emake check
+}
diff --git a/dev-libs/capstone/capstone-9999.ebuild b/dev-libs/capstone/capstone-9999.ebuild
index 6d46a0133be7..ae151ecdb8fb 100644
--- a/dev-libs/capstone/capstone-9999.ebuild
+++ b/dev-libs/capstone/capstone-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -35,15 +35,15 @@ DEPEND="${RDEPEND}
 BDEPEND="${DISTUTILS_DEPS}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+RESTRICT="!test? ( test )"
+
 PATCHES=(
 	# Currently "-Werror" is only added in the `next`-development branch, but
-	# not merged into 5.* releases. Eventually this patch may be needed in
-	# version 5 releas line. See bug #911481.
+	# not merged into 5.* releases. Eventually this patch may be needed in the
+	# version 5 release line. See bug #911481.
 	"${FILESDIR}/${P}-werror.patch"
 )
 
-distutils_enable_tests setup.py
-
 if [[ ${PV} == *_rc* ]]; then
 	# Upstream doesn't flag release candidates (bug 858350)
 	QA_PKGCONFIG_VERSION=""
@@ -97,3 +97,7 @@ src_install() {
 		find "${ED}" -name '*.a' -delete || die
 	fi
 }
+
+python_test() {
+	emake check
+}
diff --git a/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch b/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch
deleted file mode 100644
index 056140be13df..000000000000
--- a/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-cmake does not provide 'LIBSUFFIX' variables, but provides 'LIB_SUFFIX'.
-https://bugs.gentoo.org/730722
---- a/capstone.pc.in
-+++ b/capstone.pc.in
-@@ -1,6 +1,6 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${prefix}/lib@LIBSUFFIX@
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
- includedir=${prefix}/include/capstone
- 
- Name: capstone
diff --git a/dev-libs/capstone/files/capstone-9999-werror.patch b/dev-libs/capstone/files/capstone-9999-werror.patch
index 1ec58fa056a3..d5f09ca7d656 100644
--- a/dev-libs/capstone/files/capstone-9999-werror.patch
+++ b/dev-libs/capstone/files/capstone-9999-werror.patch
@@ -2,12 +2,12 @@ Bug: https://bugs.gentoo.org/911481
 Upstream: https://github.com/capstone-engine/capstone/pull/2114
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -28,7 +28,7 @@ project(capstone
- if (MSVC)
-     add_compile_options(/W1 /w14189)
- else()
--    add_compile_options(-Werror -Wformat -Wmissing-braces -Wunused-function -Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context)
-+    add_compile_options(-Wformat -Wmissing-braces -Wunused-function -Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context)
- endif()
+@@ -25,7 +25,7 @@ project(capstone
+     VERSION 5.0
+ )
  
+-set(UNIX_COMPILER_OPTIONS -Werror -Wall -Warray-bounds -Wshift-negative-value -Wreturn-type -Wformat -Wmissing-braces -Wunused-function -Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context -Wmisleading-indentation)
++set(UNIX_COMPILER_OPTIONS -Wall -Warray-bounds -Wshift-negative-value -Wreturn-type -Wformat -Wmissing-braces -Wunused-function -Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context -Wmisleading-indentation)
  
+ # maybe-unitialzied is only supported by newer versions of GCC.
+ # Unfortunately, it is pretty unreliable and reports wrong results.
diff --git a/dev-libs/libliftoff/Manifest b/dev-libs/libliftoff/Manifest
index 72be9f5d2716..93e94c21d2c2 100644
--- a/dev-libs/libliftoff/Manifest
+++ b/dev-libs/libliftoff/Manifest
@@ -1,5 +1,5 @@
-DIST libliftoff-0.3.0.tar.gz 31691 BLAKE2B 7584518f709b9a6eb975ece00b4e194de2d1e8dde71d831600b13785b8cef86b5e36493068c2345f02b85c20454d88a7cabc6082170591e7769c44f9894fd2be SHA512 696f771aef60a9bcd71e1e2e04b5abea4f3c67a0aae231f360b43cdb5835a2181f482372ab1128fe152b0cb214786f924c33ee9ecf13dfe08c1b260d03d241a4
 DIST libliftoff-0.4.1.tar.gz 36504 BLAKE2B 23e73a9bb10a3c80caa21719bc2b857d612606f68559792731c04bf5b32d072b798e6f1a44da172910fbd2fbe6b439ef27d3848bf5c993a9f2a4d062a1038581 SHA512 4144dda17775a2b6f9f32bb62de9119365e93625ffeb6fb16c49224fcbe76991c18e66382a458ac4a648e5d72879c52be089ef3673e825edc158d73c97c874dc
-EBUILD libliftoff-0.3.0.ebuild 424 BLAKE2B b92b27a48682fb61d7c3cb5c76b658f6ef5282a529dc03238815a1557b520fad8c7f3513e0dee2d6342f3502f7f496f1a206c5c9d99198d7cb071345528f8f13 SHA512 92d3c14c6ff8be3098d101fe5fdae9d41351930178efe871e1c4560be74395a3603e4f0025f0df5576a9f4296d42a64a915626c4d8d134d8c598e5c0f749bfe2
+DIST libliftoff-0.5.0.tar.gz 39076 BLAKE2B a5c35c734a5ba4049661ce336401bd88d393001d7c49786d486146998d39530c364f7752b53968f5ab48f5eb774fa9c4245087bdb016f459a729991377023f61 SHA512 ce808f6a087f1f629cfebef95bfc7e216a09fb409b96b3c9f6b84d9d986ce50c5d7bf5b45c68e8baa99566b3627d754c269855b6f4ec3be63ae7b9f5109d5f08
 EBUILD libliftoff-0.4.1.ebuild 456 BLAKE2B 89e35c5c88b57571c669928cd797e955c5ddb050796c6f7629d37ef632ba1f2b0f047e6cd1f45b3dd869e3286071fca7c646491bce1447707e171be4f22156c1 SHA512 aba52a87e100c31d52e77df0d2648929df2752be4736f152ba907504c54098e09ac0f80890a88455eb9e0e830ddf44a0a13728a978cf0c28248514e4d6daa8e3
-MISC metadata.xml 248 BLAKE2B edac7e3ba8c55e21f79f34bf97705bdd8ceb89a6433c8bb250caa9e0549ac8960551566884194fb09ba596c54fe5166708c66f4d3185389c142f6fc08c53763c SHA512 c8d7e336ee4062bfc9a9fb25250d7388b837e839dc641adcbb9caf1bfb80b197e1f6171cc7842ca7edfbc26c27db5ee8b348b4e35f5a88dd5f8dbc7a8031108b
+EBUILD libliftoff-0.5.0.ebuild 457 BLAKE2B 5707119c1e418cc5c1c4e36f721de1ff422c3372a5345a410457159d5ba9137279fcdbc1133e83e5035183a53043b4fffb6f2884680b25772c2a7b28e3771cae SHA512 6e997d3b51aa2f8d545b5fcef444d6b58beaf2d7cf522d9904c168b4da030b746b86fa15ee0cdb179a4c5cc1ab2debd81660568cd2584bda5f3e9d17394786ee
+MISC metadata.xml 344 BLAKE2B 9bebaf9d80e8d44371d67afebd3a231d3a77ae61252cbf34ccf8f4a07595fb699b02046fa0aef5460cc27670dfe2e200cd363b59d8e0ca4ec21e778e48d822f3 SHA512 d36ce2d4e1e8aec0f949dcedb9c9dcc4c86d1855818c6ebd843259f32b66f3d30f3426a20427a55480b3a08ac711b127b7a9d9dca5c12086b9c8f8a5127ed9b9
diff --git a/dev-libs/libliftoff/libliftoff-0.3.0.ebuild b/dev-libs/libliftoff/libliftoff-0.5.0.ebuild
index bb61df9cef3f..7056705fe1a1 100644
--- a/dev-libs/libliftoff/libliftoff-0.3.0.ebuild
+++ b/dev-libs/libliftoff/libliftoff-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,9 +8,9 @@ inherit meson
 DESCRIPTION="Lightweight KMS plane library"
 HOMEPAGE="https://gitlab.freedesktop.org/emersion/libliftoff"
 SRC_URI="https://gitlab.freedesktop.org/emersion/${PN}/-/releases/v${PV}/downloads/${P}.tar.gz"
-KEYWORDS="~amd64"
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	x11-libs/libdrm
diff --git a/dev-libs/libliftoff/metadata.xml b/dev-libs/libliftoff/metadata.xml
index 96b4fdc27920..f1762d449434 100644
--- a/dev-libs/libliftoff/metadata.xml
+++ b/dev-libs/libliftoff/metadata.xml
@@ -5,4 +5,7 @@
 		<email>chewi@gentoo.org</email>
 		<name>James Le Cuirot</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="freedesktop-gitlab">emersion/libliftoff</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/liblouis/Manifest b/dev-libs/liblouis/Manifest
index 2cff72f5d9e4..9c0bdbf96f68 100644
--- a/dev-libs/liblouis/Manifest
+++ b/dev-libs/liblouis/Manifest
@@ -1,5 +1,7 @@
 DIST liblouis-3.23.0.tar.gz 16738612 BLAKE2B b4508d27eaa9669bb2a1fbaac55edb3a85d3d2df18a8b26f4c9c396579b04614da3b3bcd6af45459d9129d2b81a920262dcb8fef7bee4290752174411fd66109 SHA512 25819758fc987ed378c439c5d40efd2692247a6020a40e5909320021e518e0518f5b022dda4ea5c7006a0f1ce2a4225d4ee1404560987bb2dd83504d58aa09db
 DIST liblouis-3.25.0.tar.gz 16939419 BLAKE2B f67dc1ee3aa9eb32fcf0693b3a31d40c56f048b393785011ec2b4c61611a3ab67d181d1e76148c489e443e3b0c4d5f7846ac1b4810ffa2c6a6e1d081cceab6ae SHA512 4e6456f30e845b955e98346cb94bdd4eaa6aff30f3e29fbd4e91c5bb58d1182c679fbf8afa27d7031c80d5755ae8567b830fa57c175522a038ef18d1bdc0707d
+DIST liblouis-3.29.0.tar.gz 17073843 BLAKE2B b7735f4c59c46cef55f4748b54395b95f4f3623be37bd42bbed4249232d5ab4ad966e4f08945f91516be30f19735ed774411cfe4bc8e1c7822f04af2d0b0db27 SHA512 c2f51686e869921658a95a58102799ebcf45da9b73f7d81912462451236134be7c148b78f35a1e0586cd349bbcb62238218c9ae547092bed9303238c22963589
 EBUILD liblouis-3.23.0.ebuild 1759 BLAKE2B 912ab7776d3d0e4dad6906c993f4bc3dc47466ebb286705edac8205ec188187897769881181026839c2057ea6c11cc433d6a648fa99af5fd8a58c305ce177b58 SHA512 c2e7c1ff3ad718f1ebc651dcc87c516a96599468f9d3f3605a4715fccc2e6bc0353e77c409b6c5355ad6080fa5a9523a12a9e69040b52ac621e07d4c95a5e3d4
 EBUILD liblouis-3.25.0.ebuild 2418 BLAKE2B d91afdba655494c4e8c7f350ae675d6a4647b52d2732d418b9cd2bc3279dae85726d472b9d0d3d1c4190975eda3f3dc2362e4136f1a3f5b5035b6341ccf93592 SHA512 cb5ff4d9424be649235e31cf3af3e84a5386bcd293dd87b60a7d24d06360a44687ad5444b0dcd435dc27b39f2fbfe6de49fead1dc000edae850825813d6a6a95
+EBUILD liblouis-3.29.0.ebuild 2836 BLAKE2B 116a70679950f694f132df8a9cbd64e97a4b7795107b7cb65aba516ccd19e0a19a10a85142075e02393c10b82a3e244624a39ef890621c485b5f69307bd262d6 SHA512 bd8ec8938709b5a0dff2d9a221f5ca086be6cc13b77078757baba9e4f9b89fb001b230b4c5712085e87c6696c2c52ffac28ee53ed69bdda1619687189e4bbf3e
 MISC metadata.xml 352 BLAKE2B 5c562663af1cb8a830ef585416cd7dbd4977393310fb2216ac6fb5bbaa594ad4fb144bac1a49d161e5946978cbc28acdbaf5d59e781da5438d7116f34c259290 SHA512 23c7fd40c40c8e574d995d0fdbe56242e9b1874d576ba8a34cee80e3c3e41785e782ca37fb3f89665c24d5857cb956b70c9219dc3dc35cb209f947f0b267c4be
diff --git a/dev-libs/liblouis/liblouis-3.29.0.ebuild b/dev-libs/liblouis/liblouis-3.29.0.ebuild
new file mode 100644
index 000000000000..fdd585cad1e6
--- /dev/null
+++ b/dev-libs/liblouis/liblouis-3.29.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="An open-source braille translator and back-translator"
+HOMEPAGE="https://github.com/liblouis/liblouis"
+SRC_URI="https://github.com/liblouis/liblouis/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/20" # follows LIBLOUIS_CURRENT in configure.ac
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# texlive-core for patgen which is required by lou_maketable
+RDEPEND="
+	${PYTHON_DEPS}
+	app-text/texlive-core
+	test? ( dev-libs/libyaml )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${DISTUTILS_DEPS}
+	${PYTHON_DEPS}
+	sys-apps/help2man
+"
+
+src_prepare() {
+	default
+
+	#1. bug #913705
+	#2. Use correct python version
+	sed -i \
+		-e "s|\$CURDIR/lou_maketable.d|${EPREFIX}/usr/libexec/lou_maketable|" \
+		-e "s|python3|${EPYTHON}|" \
+		tools/lou_maketable.d/lou_maketable.in || die
+
+	pushd python > /dev/null || die
+	distutils-r1_src_prepare
+	popd > /dev/null || die
+}
+
+src_configure() {
+	# -fanalyzer substantially slows down the build and isn't useful for
+	# us. It's useful for upstream as it's static analysis, but it's not
+	# useful when just getting something built.
+	export gl_cv_warn_c__fanalyzer=no
+
+	econf --enable-ucs4 $(use_with test yaml)
+}
+
+src_compile() {
+	default
+
+	pushd python > /dev/null || die
+	# setup.py imports liblouis to get the version number,
+	# and this causes the shared library to be dlopened
+	# at build-time.  Hack around it with LD_PRELOAD.
+	# Thanks ArchLinux.
+	LD_PRELOAD+=":${S}/liblouis/.libs/liblouis.so" distutils-r1_src_compile
+	popd > /dev/null || die
+}
+
+src_test() {
+	default
+
+	pushd python > /dev/null || die
+	LD_PRELOAD+=":${S}/liblouis/.libs/liblouis.so" distutils-r1_src_test
+	popd > /dev/null || die
+}
+
+python_test() {
+	local -x LOUIS_TABLEPATH="${S}"/tables
+	"${EPYTHON}" tests/test_louis.py || die
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_scriptinto /usr/libexec/lou_maketable
+	python_doexe ../tools/lou_maketable.d/*.py
+}
+
+src_install() {
+	pushd python > /dev/null || die
+	LD_PRELOAD+=":${S}/liblouis/.libs/liblouis.so" distutils-r1_src_install
+	popd > /dev/null || die
+
+	# These need to be after distutils src_install, or it'll try to install them from under python/ as well
+	DOCS=( README AUTHORS NEWS ChangeLog doc/liblouis.txt )
+	HTML_DOCS=( doc/liblouis.html )
+	default
+
+	# bug #913705
+	mkdir -p "${ED}"/usr/libexec/lou_maketable || die
+	mv "${ED}"/usr/bin/lou_maketable.d/*.{mk,pl,sh} "${ED}"/usr/libexec/lou_maketable/ || die
+	rm -r "${ED}"/usr/bin/lou_maketable.d || die
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libratbag/Manifest b/dev-libs/libratbag/Manifest
index 2d2a789fb7b4..bfb1d005c41d 100644
--- a/dev-libs/libratbag/Manifest
+++ b/dev-libs/libratbag/Manifest
@@ -1,10 +1,7 @@
-AUX libratbag-0.16-musl-error.h.patch 1786 BLAKE2B 80e333dfa7e7e2a6d207885836b3654f01c821a21d1cda233770eb4d5879239b74e0886826f2118b1e7f5674f35e697ec933b79b43f0f415c94a1c62e159594e SHA512 43fd1e68670228a438c68714987d7ff930abfc271dc54abc26e0c7809e2302c7d3d45d3293ae9edfde2887b54a74dcda9eeff372145165eed5cb048672d8c69a
+AUX libratbag-0.17-python3.12-imp.patch 1345 BLAKE2B 8b65589c91e7f8f1b81bb88961eb5b549c12f16bef5ae8d435d9c8fc3c233d44e04d5d94f317fb0e0c0a3bf3b31956457ba0fbaa52fb7323ca48f772f03e7b70 SHA512 6272dcc3ea3b746e1976b985a2dd04c16eb30e950fb1f97e85a163416a0e2aacbb688c6f3e6bcc44b866ed04e48f4646bdc033ca039d9860ab868e5762d410e6
 AUX ratbagd.init 336 BLAKE2B c6f2ef095cd7d929c3097a18e912ae4b3615bd0ebbdfdaa9f4151b312614c016af2f3581c2fbb2853472cb70ce47d5f26f254772fb9f3dabba2ce93626b672b7 SHA512 3908b3481b49bcebc84e3023ff911dcbc1773e4322356def0067ed4aa426184cf43e12de702e98210157d17c2806d57c1cb4bc79ddb0b8660036a6fe3974607e
-DIST libratbag-0.15.tar.gz 249492 BLAKE2B 0f5b35800cb9f82cb892dacd5e3b041843cf5513507ee4882ec5b3f8c8aec8a24594736f2eb1c8e373a0ee38ace1e6328cbd4816d6e5b2cd1f2154ebd803a5fa SHA512 add47a6b3d771de77c6307e128a549f5295e216059b5a2375aa6b2b6bbebcf9a93d7bf148181b3f39f855976e9b6f57072dd9198d07828bebe85409f4ad994aa
-DIST libratbag-0.16.tar.gz 253080 BLAKE2B ede56838c822519b4fe4c6846f5d6d237104fc06f96fb17aa62b4c712965f00827973ebe732ee5ac9a16f101baf0b63eb445fbb97746df3b8ed24d6e085b34e1 SHA512 b3f2fee39ec85c0e08d257753241fb0e553de53eb7409a3b95f93a0fac3989a9411c53c915e72bef19bcfc5682fe9cdafaeb1f41f2718ab02766859f565415e3
 DIST libratbag-0.17.tar.gz 279273 BLAKE2B 7252afc8bca5d95c24d61dbd68c4e486550df7d6d9fa74a8c9d2a58c6363ed2ee289c0d02cdd72c968618f5c08a0687c97836dd2c47b457ba4228f4716b50cb9 SHA512 80ab5c895d83e28b6b6adcd0669854944d7932ef037c8d64b923a7362399e861475e9d81c5ee2cf814f654d7796b00a81314cc177f34e13c8684d525974068c8
-EBUILD libratbag-0.15.ebuild 2089 BLAKE2B 32577021a0a4033ef11dafa52d602c18edd756c0139bedcced067a830fe66db3e57320026f65edf5c2b8eaf9a5ead02f6260c636916026d63edd59b817aff1b5 SHA512 b28697fe6e63a9a4e0f77fb801bd0e58cb232276412cbffc4af25c3e09f4d2ad643e930dae985eea2249174aaa283c7514f38f6d08db6faabc3b9e27292dba98
-EBUILD libratbag-0.16.ebuild 2147 BLAKE2B 01f7df46baa647ca78d387e311292f70622bcb511699bb9da683bad33f0cc72e1a841d5ee326d5a8700e6ace862c3d0223921bf9005af620180eee7117c84b0f SHA512 8345e54c264f4fa9e41cda1ccc9d5f6d157c438c40dda2b2eb78aeab0696fa0501ed53ff6d67c39e621fe4ef50b58b1aaa24ce823a0e1d792f3df0d5420278d5
 EBUILD libratbag-0.17-r1.ebuild 2314 BLAKE2B 41f25df17270fd0f537d91534dade949bac360b80399ce8302b6fcc95c7b5c57d49c8699138756d3396bbf432db746c3ab8835b3181f3e33d79a4af5af68a4fe SHA512 8a5a703725c2dfc7fcf5440d3a3ebf3e35399078bb32a724a0bf8f41147c99b9cbdb8dfcc597c1647bcba12e7c70f42b96265b8f71569dd0e9719e8378a7204c
-EBUILD libratbag-9999.ebuild 2314 BLAKE2B 41f25df17270fd0f537d91534dade949bac360b80399ce8302b6fcc95c7b5c57d49c8699138756d3396bbf432db746c3ab8835b3181f3e33d79a4af5af68a4fe SHA512 8a5a703725c2dfc7fcf5440d3a3ebf3e35399078bb32a724a0bf8f41147c99b9cbdb8dfcc597c1647bcba12e7c70f42b96265b8f71569dd0e9719e8378a7204c
+EBUILD libratbag-0.17-r2.ebuild 2378 BLAKE2B 9d7a0dc9b30be878e69e4147ea230a398ccf8358639bd399a31865356d12447dcfe70de97009d031c6c6f04aecc3c3bdbe164f25571c0a6f64bb422029fd19c6 SHA512 3c10d0316bd84746263b2e872e9de509e5b70d36daa6d20d6daedb85707260cb8d180a4a58df7a771d2a1738917c3bc0f3e298c0f46943ef92fbd720f5de4443
+EBUILD libratbag-9999.ebuild 2314 BLAKE2B 154fbe01378273fc6a0a7c2c4fe4824db1a5de068d8d58930cf32ffd93b40ce9a1b1c697b4de6780b04d0a0a8cf8e0252930f6a9a17547a6303f13a47bb41bc0 SHA512 e66b1202c01d54ecb458128bd52bc064e3519725c872867e72e068be4af0084efb5bce809022bbf7cd333444bac3eb90267f7dc2eda0dcec639d34b51f490072
 MISC metadata.xml 490 BLAKE2B 1acac7162603488b92a2a99c2bf9ee12971b79d62b48ebea2bc6fdbb5e45f351002cb932cd6a8222fcd23acdffa77d4cd708b71459a5f557f668a9687da66efa SHA512 e55ba297fed6952b379b92bf14adfe02fd4a90a7f305d70126fb28ff12c63e64ff2781f378c279bd17392bf917d31f4ed2b3679b308ecf0e713e42eccbc9d1a0
diff --git a/dev-libs/libratbag/files/libratbag-0.16-musl-error.h.patch b/dev-libs/libratbag/files/libratbag-0.16-musl-error.h.patch
deleted file mode 100644
index a3b0b187c154..000000000000
--- a/dev-libs/libratbag/files/libratbag-0.16-musl-error.h.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-# Since musl doesn't provide error.h we need to check before adding it. If
-# error.h is present in system only then we include it else we use err.h.
-# Already there exists a bug report for this upstream [1]. The devs are open to
-# a custom implementation of error but for now this patch for do it.
-#
-# [1]: https://github.com/libratbag/libratbag/issues/1253
-#
-# Closes: https://bugs.gentoo.org/830557
---- a/meson.build
-+++ b/meson.build
-@@ -74,8 +74,13 @@ dep_libevdev = dependency('libevdev')
- dep_glib = dependency('glib-2.0')
- dep_json_glib = dependency('json-glib-1.0')
- dep_lm = cc.find_library('m')
-+error_exists = cc.has_header('error.h')
- dep_unistring = cc.find_library('unistring')
-
-+if error_exists
-+	add_global_arguments('-DHAVE_ERROR_H', language : 'c')
-+endif
-+
- if get_option('logind-provider') == 'elogind'
- 	dep_logind = dependency('libelogind', version : '>=227')
- else
---- a/tools/hidpp10-dump-page.c
-+++ b/tools/hidpp10-dump-page.c
-@@ -23,7 +23,12 @@
-
- #include <config.h>
- #include <errno.h>
-+#ifdef HAVE_ERROR_H
- #include <error.h>
-+#else
-+#include <err.h>
-+#define error(status, errno, ...) err(status, __VA_ARGS__)
-+#endif
- #include <fcntl.h>
-
- #include <hidpp10.h>
---- a/tools/hidpp20-dump-page.c
-+++ b/tools/hidpp20-dump-page.c
-@@ -23,7 +23,12 @@
-
- #include <config.h>
- #include <errno.h>
-+#ifdef HAVE_ERROR_H
- #include <error.h>
-+#else
-+#include <err.h>
-+#define error(status, errno, ...) err(status, __VA_ARGS__)
-+#endif
- #include <fcntl.h>
-
- #include <hidpp20.h>
---- a/tools/hidpp20-reset.c
-+++ b/tools/hidpp20-reset.c
-@@ -23,7 +23,12 @@
-
- #include <config.h>
- #include <errno.h>
-+#ifdef HAVE_ERROR_H
- #include <error.h>
-+#else
-+#include <err.h>
-+#define error(status, errno, ...) err(status, __VA_ARGS__)
-+#endif
- #include <fcntl.h>
-
- #include <hidpp20.h>
diff --git a/dev-libs/libratbag/files/libratbag-0.17-python3.12-imp.patch b/dev-libs/libratbag/files/libratbag-0.17-python3.12-imp.patch
new file mode 100644
index 000000000000..6ded679b1bad
--- /dev/null
+++ b/dev-libs/libratbag/files/libratbag-0.17-python3.12-imp.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/929423
+https://github.com/libratbag/libratbag/pull/1569
+https://github.com/libratbag/libratbag/commit/27b0d4a2d9cd21fa9f11a0770d94c578db6324d1
+--- a/tools/toolbox.py
++++ b/tools/toolbox.py
+@@ -21,7 +21,8 @@
+ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ # DEALINGS IN THE SOFTWARE.
+ 
+-import imp
++import importlib.util
++import importlib.machinery
+ import os
+ import subprocess
+ import sys
+@@ -45,8 +46,11 @@ def import_non_standard_path(name, path):
+     # If any of the following calls raises an exception,
+     # there's a problem we can't handle -- let the caller handle it.
+ 
+-    with open(path, 'rb') as fp:
+-        module = imp.load_module(name, fp, os.path.basename(path), ('.py', 'rb', imp.PY_SOURCE))
++    loader = importlib.machinery.SourceFileLoader(name, path)
++    spec = importlib.util.spec_from_file_location(name, path, loader=loader)
++    module = importlib.util.module_from_spec(spec)
++    sys.modules[name] = module
++    loader.exec_module(module)
+ 
+     return module
+ 
+@@ -107,7 +111,7 @@ def sync_dbus():
+         main_context.iteration(False)
+ 
+ 
+-ratbagctl = import_non_standard_path(RATBAGCTL_NAME, RATBAGCTL_PATH)
++import_non_standard_path(RATBAGCTL_NAME, RATBAGCTL_PATH)
+ 
+ from ratbagctl import open_ratbagd, get_parser, RatbagError, RatbagErrorCapability  # NOQA
+ 
diff --git a/dev-libs/libratbag/libratbag-0.15.ebuild b/dev-libs/libratbag/libratbag-0.15.ebuild
deleted file mode 100644
index ba7c076793e6..000000000000
--- a/dev-libs/libratbag/libratbag-0.15.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 )
-
-inherit meson python-single-r1 systemd udev
-
-DESCRIPTION="Library to configure gaming mice"
-HOMEPAGE="https://github.com/libratbag/libratbag"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc elogind systemd test"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	^^ ( elogind systemd )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/swig
-	virtual/pkgconfig
-	doc? (
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-		')
-	)
-	test? (
-		dev-libs/check
-		dev-libs/gobject-introspection
-		dev-debug/valgrind
-		$(python_gen_cond_dep '
-			dev-python/evdev[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="
-	${PYTHON_DEPS}
-	acct-group/plugdev
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libevdev
-	dev-libs/libunistring:=
-	virtual/libudev:=
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/evdev[${PYTHON_USEDEP}]
-	')
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/gobject-introspection
-"
-
-src_prepare() {
-	default
-
-	if use elogind ; then
-		# Fix systemd includes for elogind
-		sed -i -e 's@include <systemd@include <elogind@' \
-			ratbagd/ratbag*.c || die
-	fi
-}
-
-src_configure() {
-	python_setup
-
-	local emesonargs=(
-		$(meson_use doc documentation)
-		$(meson_use systemd)
-		$(meson_use test tests)
-		-Ddbus-group="plugdev"
-		-Dlogind-provider=$(usex elogind elogind systemd)
-		-Dsystemd-unit-dir="$(systemd_get_systemunitdir)"
-		-Dudev-dir="${EPREFIX}$(get_udevdir)"
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"/usr/bin/
-	newinitd "${FILESDIR}"/ratbagd.init ratbagd
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		elog 'You need to be in "plugdev" group in order to access the'
-		elog 'ratbagd dbus interface'
-	fi
-}
diff --git a/dev-libs/libratbag/libratbag-0.16.ebuild b/dev-libs/libratbag/libratbag-0.17-r2.ebuild
index ad08ddd3c6db..7620f30d382d 100644
--- a/dev-libs/libratbag/libratbag-0.16.ebuild
+++ b/dev-libs/libratbag/libratbag-0.17-r2.ebuild
@@ -3,17 +3,23 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit meson python-single-r1 systemd udev
 
 DESCRIPTION="Library to configure gaming mice"
 HOMEPAGE="https://github.com/libratbag/libratbag"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/libratbag/libratbag.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="doc elogind systemd test"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -62,7 +68,7 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.16-musl-error.h.patch
+	"${FILESDIR}"/libratbag-0.17-python3.12-imp.patch
 )
 
 src_prepare() {
@@ -102,4 +108,5 @@ pkg_postinst() {
 		elog 'You need to be in "plugdev" group in order to access the'
 		elog 'ratbagd dbus interface'
 	fi
+	elog 'You may be required to create and/or be part of the "games" group if you intend on using piper'
 }
diff --git a/dev-libs/libratbag/libratbag-9999.ebuild b/dev-libs/libratbag/libratbag-9999.ebuild
index e1cf833f0ff6..47fc210ab543 100644
--- a/dev-libs/libratbag/libratbag-9999.ebuild
+++ b/dev-libs/libratbag/libratbag-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit meson python-single-r1 systemd udev
 
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index b4555ff65b41..4a6c8a32bd8c 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -1,13 +1,8 @@
-AUX libsodium-1.0.10-cpuflags.patch 1232 BLAKE2B 07d8d993af926db81135b6366fc2219b52c82d3e04abe7208bddcc62b4ec9db5dc9480f7c3c40b6d750a4d5465942b49e4d3840189bf92586a93d99f7510e254 SHA512 0559e5073c3238d887fc34a9f9cd78bde6d628e36c8741ff8bdd0e7db5bca4f510e3b0e2b858c0ecb83433b3cb74ad1c957c61d68ae406843f42139af8b382fd
 AUX libsodium-1.0.19-cpuflags.patch 1448 BLAKE2B 36a54f26c3e8522109e39e08908291d461de8fe25c554c34d87b0487f07f25cb74f1ef93d567da0cc5695868c1bb83ee073f28956292aa467ce95d48bb5fde02 SHA512 8fcf8b59ca151eb8604ae4ea5ab55f9005a125eb4eb7e0493e01862ddbcbfc2eb3a17e4d4c043a311af84b90717bd979019d380de045bf7829a92f94d7b63f95
-DIST libsodium-1.0.18_p20220618.tar.gz 1869858 BLAKE2B 60d46f722c4e5c9896226e3e03c31768a2183bae80a535234b23ac5bc9a2c3632d6c891ce72cbc1d6dc633a15b539111e322c2d210f993f99d6e5bd32f8a8b63 SHA512 14d1c6109de2ac02ba6cb5541746275f6deb25302b60cb3f65a7922b34d2c3bd5f17a4d730acf77a53d5837be00228c68fa06c6a2e9095ea97f6d8c4b782ab6b
-DIST libsodium-1.0.18_p20220618.tar.gz.minisig 318 BLAKE2B a2cba3c62ca5a84e7897373cdfe4033c636c652c848bf9beff15765d359f1dd2a8834dc3a4d4443d0b9418a59a94309cf9c5c917ae9c8965778411e21f98e4e6 SHA512 ca1ac892b41c5cb6dd1ba9d4bbde8e75987e66023d29cfc81839bbb3b99efa215f7db1ef903c375dd9d2d5a76f6064b3c7eab833081d21983693b7db87175160
-DIST libsodium-1.0.19.tar.gz 1945523 BLAKE2B de43520150b55760142d186404cc3e49471c6e911a7a590c7ae08bc61e928c063c459555f49cd88155238fb0008ef3924b6d7c14ba9cff2f90f1e96201e1259c SHA512 8e9b6d796f6330e00921ce37f1b43545966094250938626ae227deef5fd1279f2fc18b5cd55e23484732a27df4d919cf0d2f07b9c2f1aa0c0ef689e668b0d439
-DIST libsodium-1.0.19.tar.gz.minisig 318 BLAKE2B e86e653107478d9e9281894632baafda57358229f2d56fcaf55591098e38d6be72ed2f599a7f2c16d5b9978d2cbfe8e07db4e772b053a832a61fd325fc1efae4 SHA512 8b5993bd7e541a5913ea1659c1009c4edefd9b5907e0a7c9090fa604c23d77006ad9d9a897d66243162742d63ce9bc1f2c81091d50a584f1495dd3bd87d4451e
 DIST libsodium-1.0.19_p20240117.tar.gz 1946650 BLAKE2B 6faa56733ed28f34d58b41a71a41d6ba6369e2f5686e01169f83d5fe955523825bd250cfd59e15515b24f67cef1610af41749b6f56bc370e7f77708a86bd7684 SHA512 2cefd883b60fba5522bf4a6f3c73f9bc54164340400377089eea8fbb01447f1137fcb7f6183845a6c5e2aad51982122a356272b4eda5452d7b550a65aa576140
 DIST libsodium-1.0.19_p20240117.tar.gz.minisig 318 BLAKE2B f951b547f53b2569ed1493dcdbff1cc93519437f56cdf97a764d61a7e1fa98b383b49d4f4a9c4b7b199e2060037971f293796e641bd689c9cd6c7ae2c90b7a20 SHA512 202f9686fabcb7b362923b7f1eeac8544c5f21e7eaa0b4cdd7329733a62a5ec9efd18713bc63187055149525a066540a6904776870d718fd3b238b71ba4b9a35
-EBUILD libsodium-1.0.18_p20220618.ebuild 1998 BLAKE2B c0971b1d0f9e13ee2365093c311cd6a7186de26a557461b66111a8e9f75691e8ce4318a285074cd873d3e122b15be2f646bd341b261220f94e0fe170ddc21b0b SHA512 1c0e04a0540c2bb0fc9e6f141c370c28a5c20e086f32cf5548cb6d73937ab2bcc4305d973d248b476a4c932b8450f4462e25185c1f82cefa6aff091abd538221
-EBUILD libsodium-1.0.19-r1.ebuild 1998 BLAKE2B 50b3fc86c63c7721fd3a3d3bda38648fed17127558c34b6e08e3e025fb47550748aaffe614d8393833c6cc4d433079b854411ae0000029fb79fdeb2876744071 SHA512 165a6d4bfba97d9049af1f9a06160a7d92aec6bc7d23205d2ab1c860a17b3310d305cf8bc16919935503a4ee67ba3cffe347c374b0c1f842909a3b50826100a2
-EBUILD libsodium-1.0.19-r2.ebuild 1966 BLAKE2B 575da13973413adc01e6fb9ecdb58e554275b817e5064ec94b7f801274a30ac0a15c6ed4e542ac8d387268d31a0279a291f2d2d5c054d59e9ee06f2dbe8bc4b5 SHA512 1b2a79ea96928e63f0c0194f01626c7a75c264e34640a41417a56e4cbf08a9723d11dfd6890d7b348917dd9d81b38bd07975999d30396d51182dc5ca545f149e
+DIST libsodium-1.0.20.tar.gz 1925167 BLAKE2B 2f1d8b2dc8a65f95433132b12bdccb7e0e4750326b05c4f42ddd3a74bf568faa2515384bfe94bba2ef420aff35c515d3d44945ea5a68f72e6a73b3a9b5bb234c SHA512 7ea165f3c1b1609790e30a16348b9dfdc5731302da00c07c65e125c8ab115c75419a5631876973600f8a4b560ca2c8267001770b68f2eb3eebc9ba095d312702
+DIST libsodium-1.0.20.tar.gz.minisig 318 BLAKE2B b5939a9ca9b25332c39484b3ef02ced54aa75b2dc732d384d4f42daa0b6bd276f0c3359a8cbe8c97d8ab76b8c49e9f66959dcf350e3cf00fae10a279826109ae SHA512 fc5a4282093d58eb42559f88ccf75ea3788449afda9d882d313714e448e78ef11c22ff1e52091af026f6bf3ba01917d606040b1dca240dd1a32278c901b4affb
 EBUILD libsodium-1.0.19_p20240117.ebuild 2045 BLAKE2B ccf03b49b0495cdf89159644672763a013aae0de1609025c18e00b152b11fd23fa57b885dd1c3e2dea2b54dee1374fc1b45f744fe2350a2adc130671e94df5f2 SHA512 e2c9033937ab8b0bf2ad721f9d59fc8b7059f597edd7ad99ed29c3fd10ccf508f05b5a67498824e7fafd11d5a522440ba735b81d8c4a1ee8e33428b03629300e
+EBUILD libsodium-1.0.20.ebuild 2053 BLAKE2B 984b99e22aace5e4956652c97e5c89ac24b8844a277dae8bd5dec0d1c414e67a308fb24aa72e6c741dfd6eeb5aa17667347ba640e0fb952eb184af1a61b24fb2 SHA512 399705179463ae9fba760b4374025223d97fc89230fa180d80ff566e8e6544285dbf9ebf42df4f70400542af67b5a2754681691654e6cb4a46dd1dadb180349c
 MISC metadata.xml 806 BLAKE2B 069f36bae588b263d664f00b50c9a0f4c2348b1a1f0ff2e5c5902217ccf14a81e648997fae2f789220d5b9fa5aef440a7c0526918a7d7f402870dd80067e3744 SHA512 1902268ec9dbb312b9740f9bc9b2df5e66f50dc066ba281b438fbf6d2b5317c589c587305c400c929c068af95c30918fde7a6324ab53b76503ef183aab034886
diff --git a/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch b/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch
deleted file mode 100644
index e03a703d7fae..000000000000
--- a/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -344,6 +344,10 @@
-     [AC_MSG_RESULT(no)])
-   CFLAGS="$oldcflags"
- 
-+AC_ARG_ENABLE(sse4_1, [AS_HELP_STRING(--disable-sse4_1,Do not use sse4.1 code)],
-+  AS_IF([test "x$enableval" = "xyes"], check_sse4_1="yes", check_sse4_1="no"),
-+  check_sse4_1="yes")
-+AS_IF([test "$check_sse4_1" = "yes"],[
-   oldcflags="$CFLAGS"
-   AX_CHECK_COMPILE_FLAG([-msse4.1], [CFLAGS="$CFLAGS -msse4.1"])
-   AC_MSG_CHECKING(for SSE4.1 instructions set)
-@@ -356,6 +360,7 @@
-      AX_CHECK_COMPILE_FLAG([-msse4.1], [CFLAGS_SSE41="-msse4.1"])],
-     [AC_MSG_RESULT(no)])
-   CFLAGS="$oldcflags"
-+  ])
- 
-   oldcflags="$CFLAGS"
-   AX_CHECK_COMPILE_FLAG([-mavx], [CFLAGS="$CFLAGS -mavx"])
-@@ -393,6 +398,10 @@
-     [AC_MSG_RESULT(no)])
-   CFLAGS="$oldcflags"
- 
-+AC_ARG_ENABLE(aesni, [AS_HELP_STRING(--disable-aesni,Do not use aesni code)],
-+  AS_IF([test "x$enableval" = "xyes"], check_aesni="yes", check_aesni="no"),
-+  check_aesni="yes")
-+AS_IF([test "$check_aesni" = "yes"],[
-   oldcflags="$CFLAGS"
-   AX_CHECK_COMPILE_FLAG([-maes], [CFLAGS="$CFLAGS -maes"])
-   AX_CHECK_COMPILE_FLAG([-mpclmul], [CFLAGS="$CFLAGS -mpclmul"])
-@@ -410,6 +419,7 @@
-      ],
-     [AC_MSG_RESULT(no)])
-   CFLAGS="$oldcflags"
-+  ])
- 
- ])
- 
diff --git a/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild b/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild
deleted file mode 100644
index bcd05ad21ed0..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libsodium.minisig
-VERIFY_SIG_METHOD=minisig
-inherit autotools multilib-minimal verify-sig
-
-DESCRIPTION="Portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://libsodium.org"
-
-if [[ ${PV} == *_p* ]] ; then
-	MY_P=${PN}-$(ver_cut 1-3)-stable-$(ver_cut 5-)
-
-	# We use _pN to represent 'stable releases'
-	# These are backports from upstream to the last release branch
-	# See https://download.libsodium.org/libsodium/releases/README.html
-	SRC_URI="
-		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz
-		verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/${MY_P}.tar.gz.minisig -> ${P}.tar.gz.minisig )
-	"
-else
-	SRC_URI="
-		https://download.libsodium.org/${PN}/releases/${P}.tar.gz
-		verify-sig? ( https://download.libsodium.org/${PN}/releases/${P}.tar.gz.minisig )
-	"
-fi
-
-S="${WORKDIR}"/${PN}-stable
-
-LICENSE="ISC"
-SLOT="0/23"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-IUSE="+asm minimal static-libs +urandom"
-
-CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
-IUSE+=" ${CPU_USE[@]}"
-
-BDEPEND=" verify-sig? ( sec-keys/minisig-keys-libsodium )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.10-cpuflags.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable asm)
-		$(use_enable cpu_flags_x86_aes aesni)
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
-		$(use_enable minimal)
-		$(use_enable static-libs static)
-		$(use_enable !urandom blocking-random)
-	)
-
-	# --disable-pie is needed on x86, see bug #512734
-	# TODO: Check if still needed?
-	if [[ ${ABI} == x86 ]] ; then
-		myeconfargs+=( --disable-pie )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild
deleted file mode 100644
index 575daa8a5059..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libsodium.minisig
-VERIFY_SIG_METHOD=minisig
-inherit autotools multilib-minimal verify-sig
-
-DESCRIPTION="Portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://libsodium.org"
-
-if [[ ${PV} == *_p* ]] ; then
-	MY_P=${PN}-$(ver_cut 1-3)-stable-$(ver_cut 5-)
-
-	# We use _pN to represent 'stable releases'
-	# These are backports from upstream to the last release branch
-	# See https://download.libsodium.org/libsodium/releases/README.html
-	SRC_URI="
-		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz
-		verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/${MY_P}.tar.gz.minisig -> ${P}.tar.gz.minisig )
-	"
-else
-	SRC_URI="
-		https://download.libsodium.org/${PN}/releases/${P}.tar.gz
-		verify-sig? ( https://download.libsodium.org/${PN}/releases/${P}.tar.gz.minisig )
-	"
-fi
-
-S="${WORKDIR}"/${PN}-stable
-
-LICENSE="ISC"
-SLOT="0/26"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-IUSE="+asm minimal static-libs +urandom"
-
-CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
-IUSE+=" ${CPU_USE[@]}"
-
-BDEPEND=" verify-sig? ( sec-keys/minisig-keys-libsodium )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.10-cpuflags.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable asm)
-		$(use_enable cpu_flags_x86_aes aesni)
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
-		$(use_enable minimal)
-		$(use_enable static-libs static)
-		$(use_enable !urandom blocking-random)
-	)
-
-	# --disable-pie is needed on x86, see bug #512734
-	# TODO: Check if still needed?
-	if [[ ${ABI} == x86 ]] ; then
-		myeconfargs+=( --disable-pie )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/dev-libs/libsodium/libsodium-1.0.19-r2.ebuild b/dev-libs/libsodium/libsodium-1.0.20.ebuild
index eebd3c520e94..35a5bc16739b 100644
--- a/dev-libs/libsodium/libsodium-1.0.19-r2.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.20.ebuild
@@ -20,6 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz
 		verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/${MY_P}.tar.gz.minisig -> ${P}.tar.gz.minisig )
 	"
+	S="${WORKDIR}"/${PN}-stable
 else
 	SRC_URI="
 		https://download.libsodium.org/${PN}/releases/${P}.tar.gz
@@ -27,11 +28,9 @@ else
 	"
 fi
 
-S="${WORKDIR}"/${PN}-stable
-
 LICENSE="ISC"
 SLOT="0/26"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="+asm static-libs +urandom"
 
 CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
@@ -39,8 +38,12 @@ IUSE+=" ${CPU_USE[@]}"
 
 BDEPEND=" verify-sig? ( sec-keys/minisig-keys-libsodium )"
 
+QA_CONFIG_IMPL_DECL_SKIP=(
+	_rdrand64_step # depends on target, bug #924154
+)
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.10-cpuflags.patch
+	"${FILESDIR}"/${PN}-1.0.19-cpuflags.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/mimalloc/Manifest b/dev-libs/mimalloc/Manifest
index 77545a09754e..af6c3bba649d 100644
--- a/dev-libs/mimalloc/Manifest
+++ b/dev-libs/mimalloc/Manifest
@@ -1,7 +1,9 @@
 DIST mimalloc-2.1.2.tar.gz 1163868 BLAKE2B bba29671fdca81b682edeefe16a1239640ea28fee4e44c97d0422ae81e0b3e7141c733459ccafc6672780157af67ff7d2a10cf4157180e003b458332a79d8481 SHA512 927b046e67783b325a6e41e3a9a6d3d78306fa1c82255defd1f3a7a60a27fd809a601f65b1b27fa38f2064e124f29856d7c0e5ccc33c54c2e4b6ebb9816d74b1
 DIST mimalloc-2.1.4.tar.gz 1133761 BLAKE2B 6271f54b8c0c0397bc0d7fb909009e05b9119c15ad3f926a82f078f3ffa7320503cc679487414d3b8e17bb41b17a43f71982727f80c7288b3b2d473992d706e5 SHA512 cdc43b212b9c67cd50b31bfae875387e3099165260fec995681a4079ca107c275452c2aadc5ee9a177391d1856750e0e2b104191bbb9829aeb5a42406267832e
 DIST mimalloc-2.1.6.tar.gz 1134456 BLAKE2B 1d4d0053e6c6b582d2c82f573b61dba7b3d1d6748999d313493d9db5bfb62e7379b48c72f88afab4e8b609971974488c9d42f96e2486d5905e2a9d78730d3231 SHA512 cbecca799be7a38b291c44ac765aa6ce36c6aeb0f064da942c568da38073350a122e7d1553e7929ee4f72f61ab3b767fa565f252cfd819463d2e1c73c25c5163
+DIST mimalloc-2.1.7.tar.gz 1181422 BLAKE2B 2c4c2d61837ab315e00a5c12d1c74c8f003aa3e9159403194ba61f5dfef2f4c2497b83487f07b20ba506ecde40a6754df6b7048a3818af58168ca90b8ed44470 SHA512 4e30976758015c76a146acc1bfc8501e2e5c61b81db77d253de0d58a8edef987669243f232210667b32ef8da3a33286642acb56ba526fd24c4ba925b44403730
 EBUILD mimalloc-2.1.2.ebuild 850 BLAKE2B df1b87e00239d319dd692395fe31c6376fb2e197208a002234cb6f62a2f43429fb0e7a90b0ba308a880e7dcfb343caa716d2bad7b2add0a9e7c9a49ff1741ae1 SHA512 847340d9b4a95d81fc7a5fe99b724cacd1eb96cd794f67ca934a7af32e1cfc11c3f8a58d0cd3403e9155b0d74150962d6971bcaa8f2c0dbaa998bf7a5fb02dbc
 EBUILD mimalloc-2.1.4.ebuild 994 BLAKE2B d04db9996415aede3568ddd1f40c1b14cceb5ad2ea53c4b90c23d4925a3a68572135db859c1f6ad81ceb5121c22effb32c3906639df8ae14fe2ab0fed9e5f31b SHA512 e1c2f5f9d19e794f3a23a63214b5fdf318d2e09b3bab0e5d2953202cfbb3acbe573b34786c1a1fa6c78a4c222cc1558708c90991014d53c4ebbeb1cc3dfbfe92
 EBUILD mimalloc-2.1.6.ebuild 1099 BLAKE2B 56768e1ca66cc2e5a70420ea93a035251415c2b242c511957fa000a7079200e7972a632c2e0959c83e3bd74507af3bd42801c35cfeb7ca061ec051d234276698 SHA512 2e9e7fdb9624b2653acb5daeb4e54bf8febdff6c8294bc5a76d50ccb3327e1eea27e804af5c05cd03cd016766678b18dac338e618208077c49c819617e55126e
+EBUILD mimalloc-2.1.7.ebuild 836 BLAKE2B 5f6ac7302068165b29e1556df21e968c1171c78785ccdf77ea233b8756e161eb23f01df38b8c9e8650d2101911c2d09eb35c432b5a95b20a193bdd0918a9a3c0 SHA512 a1e775ec6b3b1dbd6505f46349f886b802c1be8ac0ca3fb0f80ba57ae58c119f5df9ba8edf29838537b7a1f1993064eb46514cd2cc3b4b8446cc0b4e2affd3c5
 MISC metadata.xml 504 BLAKE2B cf6477282968a5469d072cfd81ce800e3ef0a48deb5353c85a1cabc837560cafdb9f9739cb4e98784238d2cc512a29cae5efee401f92a19bf75fb5d810154f76 SHA512 4e8fcc49881f3c479424cf363665d9b12c58eb52f7d962b98b81f5b3e186ba3bd14c2b5dac488d819147121a16c2d9613e75cb77f71fa04e820ca2c1e538baa6
diff --git a/dev-libs/mimalloc/mimalloc-2.1.7.ebuild b/dev-libs/mimalloc/mimalloc-2.1.7.ebuild
new file mode 100644
index 000000000000..f7bb6dcf66e8
--- /dev/null
+++ b/dev-libs/mimalloc/mimalloc-2.1.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="A compact general purpose allocator with excellent performance"
+HOMEPAGE="https://github.com/microsoft/mimalloc"
+SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+IUSE="hardened test valgrind"
+RESTRICT="!test? ( test )"
+
+DEPEND="valgrind? ( dev-debug/valgrind )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMI_SECURE=$(usex hardened)
+		-DMI_INSTALL_TOPLEVEL=ON
+		-DMI_BUILD_TESTS=$(usex test)
+		-DMI_BUILD_OBJECT=OFF
+		-DMI_BUILD_STATIC=OFF
+		-DMI_TRACK_VALGRIND=$(usex valgrind)
+		-DMI_LIBC_MUSL=$(usex elibc_musl)
+	)
+
+	cmake-multilib_src_configure
+}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index ac11e1dd3ebf..e4e7062ba464 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/async_kernel/Manifest b/dev-ml/async_kernel/Manifest
index a58dbe8bcff3..17297d0539d1 100644
--- a/dev-ml/async_kernel/Manifest
+++ b/dev-ml/async_kernel/Manifest
@@ -3,5 +3,5 @@ DIST async_kernel-0.15.0.tar.gz 148527 BLAKE2B 535a64a204332bcc41e6c4ef5ff78fa81
 DIST async_kernel-0.16.0.tar.gz 155521 BLAKE2B 9968e15fba844b35c595811cfc953aff71adfbcd26765060dcf8733907d1e71c771ed8eff27ae10967ee287d25c0af6a8945afbcf40eccb239d00212264c0c13 SHA512 8fb53e1802d5992698dcc8ce56b04e898bc3c9402a04462a63854754a7d2900a0760d09c5526e92114fc5eca3857757613deb9ef88552c020f04a1956590f13a
 EBUILD async_kernel-0.14.0.ebuild 508 BLAKE2B 216bf5e5292aaaeb4013f0033f713fe3d5f31145b8df65b48c6c5489bcb23ddb60d66dd8efef1835061fee37498435e4803f2d0d9a36f819e10c89358c7fd7c3 SHA512 914de6610883bcb0589b07a7a89e6b15ce7279594822a5d3bc28f4b78f3f5c1d6654ab57153c7c09e43b254beab06fb1239a07c54c2eca6edc28767a1918a6e5
 EBUILD async_kernel-0.15.0.ebuild 502 BLAKE2B 66f3b202456ff4c46aef91880584dfd23819e798759a10873a7524aa342240bd33ff051b1aab4c77c929de6f97cfe3dbe96e24189f426ab1c50ead6cac9517ff SHA512 e2c5575763f71173c231474d68f190a8d51c913c4a9d63ecc3e1ffbc471df71e374af8326ffc00a4a12db780ddc2801d21674ad56d1badcffaf56b9397afe150
-EBUILD async_kernel-0.16.0.ebuild 578 BLAKE2B 8ea1ee528811fd7b13ce4bc2ed22f3055c71a561879db16fc09634d6d8c979b566d3af79857b56504b13d71de5e2e7dd7ef9bfe8dd627fb04cc307e253d97e18 SHA512 ebb2d3682e3692d2efec848b0488b05c9c18572532a3cebd0411e9814abcd6fe3db6cb658f5bfe39316535659c81dbc46e6a9caac496e8bae01299e00c76d98a
+EBUILD async_kernel-0.16.0.ebuild 574 BLAKE2B 2061a7d469947026df123298379af1b6277adfa1a8fea48e81ba605de04c7022971558bb1f21c962137c52e7771fb64d846f8c99c6ae9651a66fb0e88aeebe3e SHA512 263dcd405f55c9025d9cc189067a7e9f9d7fae58931f4a1ec4322adfbbe20bc308f4128c3e31847a3f705f976c16c245d6a58bd84f16f037178666c0fa2e69dd
 MISC metadata.xml 321 BLAKE2B fd8db9f53c6506db9ed49966b039aa07734345b6e0983e009e6fb9bee82fd7dd4e15ecdbb791503ce7f4ec3fd9fac2751f02626dca8a86e2fdac640919918d67 SHA512 a64a7d3dcef7d139eaa027b590915e6d4171daedfb4ae2d83ebac996edfc107e2b345bbcbed096629a23ef6f6d923497e09b5a3e3004160d33160c2b7d16d658
diff --git a/dev-ml/async_kernel/async_kernel-0.16.0.ebuild b/dev-ml/async_kernel/async_kernel-0.16.0.ebuild
index 3ae6dc07bd49..1c9d662e4ff9 100644
--- a/dev-ml/async_kernel/async_kernel-0.16.0.ebuild
+++ b/dev-ml/async_kernel/async_kernel-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/async_rpc_kernel/Manifest b/dev-ml/async_rpc_kernel/Manifest
index ce837bf56bf2..f954d08d925f 100644
--- a/dev-ml/async_rpc_kernel/Manifest
+++ b/dev-ml/async_rpc_kernel/Manifest
@@ -3,5 +3,5 @@ DIST async_rpc_kernel-0.15.0.tar.gz 65182 BLAKE2B bd809bcdb17de6fe2765bc536b26c6
 DIST async_rpc_kernel-0.16.0.tar.gz 76163 BLAKE2B 14a293ee65f207b28a755799162cd66346ec54bedd01c1cfb7b9d413a4c278c332ee7724320c688aea19148935aad6f5cc2d96a3f653de0d8ff32cbb568cc4a7 SHA512 62381da44300df9f2c422fb1e439fe00316a5017963c2a3fb5d8b52f6268944cc52ec4b6b2cd694798717eaee2282e3bb10c59a7dc76ac41b2d319595e658e0f
 EBUILD async_rpc_kernel-0.14.0-r1.ebuild 525 BLAKE2B 20730fb7fb510515328b2654de55bf66cbc707e156c4eba7dd18ef11d02f11ae7b06d8e378e06320b2c87b6bdf13a7752b073de3a7f4f68bf20dac6960f6ec61 SHA512 192f3d74c4cf1ef7b0df514b02f4ab96a8c088163f12e9cbe89020506d5336f840488344c03d635dc55759edc056cb53831d0c626f42c77e36b4bd229ef75801
 EBUILD async_rpc_kernel-0.15.0.ebuild 537 BLAKE2B 1b83ed80095ca66c8aeebc6b01a3f6473dc9c99b9ac34ab2d82194ff66efa605bbffbe5782947077104d2bfff136b92db34fba41dffb991f8e2ed15d17a8cb42 SHA512 022045797cf7d87d43f0592093ca69614f041456c8f9fb79b336382afef273a72848b0085ddc25ac7c8c9a956b62843c683c60acd0584ddb0dd5751e4a2953e9
-EBUILD async_rpc_kernel-0.16.0.ebuild 585 BLAKE2B 0ef70604d43ade211f28058d145d77c65b5659a15d9b2e4c64053b563ec013382ede56e6378f5f26b0f2b18954e4536e844cbaefa4d6fc2f109badfbcf643c2b SHA512 0bbede611ac21c26f08a60b513b03e1d8af879ac50002ac92630e59734a7a3dd5cc35ec93b7fb400161f2b0d09ea0aafe70dbecfa01cc357c5c39215f6d8180c
+EBUILD async_rpc_kernel-0.16.0.ebuild 581 BLAKE2B a3fcecae09c22c6a14297abec84437ab0cebe03b8623d73248022fcf4dba9c475e468abf0fc538bd662a7930e941e2c3093fa082de4dbfd2c651ae29540f4e33 SHA512 fa14f1db9a0eb5f9a09077b89620a543e62496e4aa58334c0bdd94825152c7fc1a54cce4282fc59382c52c4428dbcae973cb37827c8d39ff3aeef6be4a30ebcb
 MISC metadata.xml 386 BLAKE2B 9ff1fe9b10384c1f1a3111cab449a667f77f3a64fc63212ac01563dcaa87b6cea881f6883a64c7d43396179bb3bc13627c719a56755ed734d92d84573470103d SHA512 f7b74045608712598c819b395e7019f9ded93a38b256183cfcdd4fefa31b26e20db8321f3376bd519157625a1dbb9d506f93a38413f1d046adfd2c1d9246120b
diff --git a/dev-ml/async_rpc_kernel/async_rpc_kernel-0.16.0.ebuild b/dev-ml/async_rpc_kernel/async_rpc_kernel-0.16.0.ebuild
index 8e3831a5982a..e431f879860f 100644
--- a/dev-ml/async_rpc_kernel/async_rpc_kernel-0.16.0.ebuild
+++ b/dev-ml/async_rpc_kernel/async_rpc_kernel-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/base/Manifest b/dev-ml/base/Manifest
index 189f4f250ef4..84883912761f 100644
--- a/dev-ml/base/Manifest
+++ b/dev-ml/base/Manifest
@@ -5,5 +5,5 @@ DIST base-0.16.3.tar.gz 442632 BLAKE2B 533a04b197bb1065a8b8772aa227bbe3be2c47d53
 EBUILD base-0.14.0-r2.ebuild 551 BLAKE2B 61f5b53cc82227154b8e3403ec0731167593e8be9fa34c048c49f16e9396ddc55782768285f745faa0c923bde96d48b75752707f5e6843ad9084662d7e7f21a6 SHA512 d87c518813bed90e8d5fefd5c3f6d90ea61ba15b77131ef6320a6a8ed4341e44739041be32c1cc743029ef90a3764bf9b7580028627af2f9c891b81fe490dedb
 EBUILD base-0.14.3-r2.ebuild 541 BLAKE2B ddc0b055a9dcee7c21ed0274cb38b99b725374bff580bfd2c4541dd9e96ff83757c95db2d109279741e0f875539cd461ec509810dfb655e3d20be292652b5b5c SHA512 b65032fb17bd24d039f3a37c9199f99ca73591a9a2c9a648fd19d84c27127882fe4ff3acb23b85c49af3de9853a890ba8338d59e111af5ef227285e643f47274
 EBUILD base-0.15.1-r2.ebuild 542 BLAKE2B cc17a8d51a39dc5a58a53d6ce6a7b1965d16b69845b001b62ff291181726188e7a90f13d26ab0af062858e1c80db070db87ad0881142742fda739c49e18af2a5 SHA512 c597e15dfea4a9586dec285e511a7dc91cb6676f1493072e99d289dd4a6dfa085aafb55bd531ebd61e6c96e0fa5d27e82210a1bcd5a126f37ad385b05bd5633d
-EBUILD base-0.16.3-r1.ebuild 547 BLAKE2B eb9d506801f445a09bc8e238f23bc504cd521d99920c831c1d850fdb4fdd88733fe4f5d46ae75b0c612160ddd2af20ba26fa9b3ad19fec19b2c0a79177d5ac95 SHA512 fc44187b4a802fb0f217b85f32ba1e3b743ba129c9372410d32cd8ef95f5f65e1e1c9fd3cb23c1d4b228d67dcd4b5c3a7344ca877a832beaed21c1f4c4963643
+EBUILD base-0.16.3-r1.ebuild 543 BLAKE2B 4b0e2821d9d473345e5df2d0e7a9e991e20752e8ae6c315ef143e760905aadebdfa2358dcf5c1a4820940888f0071b84ecae680c736e89790b58e6d4b5f7e90c SHA512 307d2aeb6851247343358daa39b73eb0bee2e4f29c8c7e44fd838f4f720278f7f1c683c7b886a1a4553c5e3ed0c47e376fe7d55efc29b71b8bb842b0dc56b66d
 MISC metadata.xml 313 BLAKE2B 13f4eb00195c11bc9b1ee9a4a35903c30e47c28e6913d23ed7fb6700b139f65562fc991fbc23e26e28dfe59da6a2da053325fbf33200731b99d730d84117cb03 SHA512 11dfae973f32014f4cef738c456b6e32d762282a21bec90af5541fe67cfc0400d4889c077598e627c1098b05c655fc3f4682403d3614c40aec3b2aa321d8daf8
diff --git a/dev-ml/base/base-0.16.3-r1.ebuild b/dev-ml/base/base-0.16.3-r1.ebuild
index 0842c57f20db..bb34eeec1b28 100644
--- a/dev-ml/base/base-0.16.3-r1.ebuild
+++ b/dev-ml/base/base-0.16.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/base_bigstring/Manifest b/dev-ml/base_bigstring/Manifest
index dcbfe7bc3306..4e897d67aa46 100644
--- a/dev-ml/base_bigstring/Manifest
+++ b/dev-ml/base_bigstring/Manifest
@@ -3,5 +3,5 @@ DIST base_bigstring-0.15.0.tar.gz 17266 BLAKE2B f557fd8d46ad33afb89f50f914c76b28
 DIST base_bigstring-0.16.0.tar.gz 19275 BLAKE2B 380b82c397f8cc8ddc6c5d33ebab13845eedbafc8c479eb2a03289d0bea929a0b442363729f706d0ff886f1686ee2b7e31aac97e3f7477809f13a5b0eebcdccc SHA512 95297f201ed8229feb974e6389f2aa955391d4716d6bc81b9b8ea06daf2722a950bd623fd35267fcbcde064ec49a5e06f51ef5b12f5c30793da937ca1c3c8bf5
 EBUILD base_bigstring-0.14.0.ebuild 1001 BLAKE2B bdf7a42226a6d53ee3f05f8ff43b5a1a1651e8eb550a6cb6f3431f62ab14c436c5c2cb9c8ac019e497b0bdb5426c4e8aebb95363b44e13f5a8bb2148dfa2783f SHA512 5293036194feec3af8861c581117740c96e6630d7561c6999a62863818ea37a1c1c4e43966add9d9527f88b2d645ab132c769912a8e4c9656fecb3aba63c96d4
 EBUILD base_bigstring-0.15.0-r1.ebuild 519 BLAKE2B 7ad293bb8f28c1c17fc5101193ef1f2c533afc7456706e4b3313251078b94db8bf99dbb82cdf710267dc56ebfe155f9b46aeb99b10c19e01cab2e563f852cdf9 SHA512 55c5fc0bb2116470d4f1c84b1cb3431541520b817b9ef611b93156d153ebf2211674e900ac2ecb608b281fad69288f378c3d548e1646fde077a22f6d936ef3f6
-EBUILD base_bigstring-0.16.0.ebuild 552 BLAKE2B 36f54ee6dd43930d6c1030e5729af3d6b1c43a838c23ea144e0d391315e6bb9694d51588b0a9729eb191d36852e35e755c2e11cc7c7024134e5eae0ecc982f8e SHA512 792b51929e502bc7f62b5112de88d4d59664b63d130c60e7321a446c61d0a664f4574deb6cd5163173b3d8fc7851cd187115ecf18848de8369f9e98235d00664
+EBUILD base_bigstring-0.16.0.ebuild 548 BLAKE2B 21cd7b1626e3f829b859495f011ff0d590867fd64a4e9b2de348f9728e9a8a909fae93348b53af67c453d474a2dbb32e4761a9bfb3ad33da3416a4d569f5368a SHA512 248faafc1ff49688cad33f4818daf8a5e441a2b93476e2f6a16d38e0ec6fe91ce2aba3f0c40929d8e7ccc44aa9ff849ba6662b3d1300925dd6c7e7f7d345fbbd
 MISC metadata.xml 323 BLAKE2B 3729ce1b400ce788ad528fc85ab4c404b3a02a35051f1d73059878ca255fccdbca77cecc62dd1f1172452c4879b5dfa633acc4e5cfdfa3275f7fc4eab80db3e1 SHA512 a1f3fde83f77f720641d14178a1711ce34bae7e4de33a40aa26dd2d56042722019bb5f71011a6a516874013fd7925407fbf2f60ace38b006e00bf45b54c75f13
diff --git a/dev-ml/base_bigstring/base_bigstring-0.16.0.ebuild b/dev-ml/base_bigstring/base_bigstring-0.16.0.ebuild
index 5893bd93f8ab..97d02825c707 100644
--- a/dev-ml/base_bigstring/base_bigstring-0.16.0.ebuild
+++ b/dev-ml/base_bigstring/base_bigstring-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/base_quickcheck/Manifest b/dev-ml/base_quickcheck/Manifest
index 0efce76936ac..ac66f4262f0c 100644
--- a/dev-ml/base_quickcheck/Manifest
+++ b/dev-ml/base_quickcheck/Manifest
@@ -5,5 +5,5 @@ DIST base_quickcheck-0.16.0.tar.gz 76738 BLAKE2B b54fac86332bfe06b767345898c2e1a
 EBUILD base_quickcheck-0.14.0-r1.ebuild 810 BLAKE2B a304e470c32c2398c0b192f7a0e855d111080cbd37e9473f885784cbb3f62286fed610c4ac7f4a4c9aeb5bd552b6f838e6a13562e991f77a45ad74376731d27e SHA512 da77414509e79c78719cd15a1a04119fe26904eee3ed1ed4dac10f039973f91add34e5c50c1496f45bd7a85d256f8f22e69c3e3b0d1849ba6ab4340aa6f386be
 EBUILD base_quickcheck-0.14.1-r2.ebuild 797 BLAKE2B 3dbaffdc1a50fdfd24408b503cc4ffa45caf2d26436f529e40b43ae8e1193d9b6c7767fbb415aaaa71ba321a984288430f1caeac55b939543f6c7c237d330c68 SHA512 02485cd73f239c346e33ccb4c4f34b9e9179355e6808ee0f417feffbd4c3bd3bf583b86be7f21a3f31a21365d320fff08c4b28127070cafa2a3d50aeba3d79c6
 EBUILD base_quickcheck-0.15.0-r2.ebuild 692 BLAKE2B 89d39708bf56c14db63c2095d2a19eea8500ccefc05e5a78368d3279bd3e4859870e643aaea9d252132faa61deddd94bd76e13c0c52d47b57d7e28179cb8e6a2 SHA512 950c132a6cf668fbac9e0485172e128f5263347d42ce218b07c556b9f883c853e23d01d81dae2c73b7eb9937eee87edd008527a60425b48b9172bea0e99b6acc
-EBUILD base_quickcheck-0.16.0.ebuild 910 BLAKE2B 2a51a662f791dc4997174e4b54b1594335698dce5ffd28292a86a9aca7fa7c64f6794f2bce3b4c548d16d235f96b69241baf338f4ad04090e619e3b2bdf3da2b SHA512 dff45eea36a922ebf078ba1275d9f4f28578d864bde4035d90c3eedc15352d8588ad7c9c7314afce602564b7088e67e092107500bc9416e2cb37006573c97069
+EBUILD base_quickcheck-0.16.0.ebuild 906 BLAKE2B e93496937fab3776c51e158924f6bbd98f05f37c876a718e624a01b69a89c47f9c4ca83887a1c990f30861ef24a53a7e1515ae71d6f58e6b6a6fe9c8a1933b7e SHA512 5254e4acd0c7755450140c0034ad04227c22411b48bba86f7458abec1ee569781e9a759699cafa0bd3d09a3c04829354590f768773269d0b47f072278107d244
 MISC metadata.xml 324 BLAKE2B fdbbfc672f96e2bc7755d43e5d86233dca5d6dd44a4a0a955079a115d19ddf722ca61e3fcc3fc7005a20224454803727f69b7eab025739ef15054883743b2f16 SHA512 da6f6e438ee1d75de993b744be68b4a78cad69b465d6d580e4ce8baef5d7824b6d3805619aa2d85708a5e8659b59e894d7dc66cdf6960da3ac1881ce2617ea54
diff --git a/dev-ml/base_quickcheck/base_quickcheck-0.16.0.ebuild b/dev-ml/base_quickcheck/base_quickcheck-0.16.0.ebuild
index a867793e810b..975e3173b981 100644
--- a/dev-ml/base_quickcheck/base_quickcheck-0.16.0.ebuild
+++ b/dev-ml/base_quickcheck/base_quickcheck-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/bin_prot/Manifest b/dev-ml/bin_prot/Manifest
index 41360058c862..ea3f10c75667 100644
--- a/dev-ml/bin_prot/Manifest
+++ b/dev-ml/bin_prot/Manifest
@@ -3,5 +3,5 @@ DIST bin_prot-0.15.0.tar.gz 345362 BLAKE2B 654014d47cdf59374247bd904005972f60d24
 DIST bin_prot-0.16.0.tar.gz 343886 BLAKE2B f13574daba74d813810afb844ebd300803279fb5ab0c067b64dc13230a0cf5d88b46809892465b7bea22e41696c962de40f5cb7c05099a98de7c01f0a7f96240 SHA512 e6e2b4c2984fc89fc7ceb57cae7b7f796e6a0441e4d37da1b6bc1f167d8900b1c4bc0174d5d9de5669b7539d9256293365242e9875ef78fccbda226635c63b5d
 EBUILD bin_prot-0.14.0.ebuild 678 BLAKE2B cc7c516c93044c22e49d758179cfcf843eba6e1203e192ff60ca0b35d705ced5333c72d60a475ef7145f1a98073b7c75c11b5e3774b4bf0682d24b27dd5aa6ab SHA512 42a42908de039f1d16b2bf4935051d6a6b51dd4c0519416d04325fe122da7864072bebc79985a24fb03f8298290bd5aaf60137ce326da4a691c22383f7138d45
 EBUILD bin_prot-0.15.0-r2.ebuild 716 BLAKE2B 956bd79b4f5244188312f75506e5ee797f67872fa2d4e02cfb2130ecb957ef8996615cc98ba20c0ad489a5f7f02f8a73e05fc4de88157bf298d6bc2fc591b0a0 SHA512 6e7ef5f3acde49f0c52e9893308bb0937467f7af5a4c13ea819f75d0c9f52ac43b9e3304975f9dbd1ae4a54983d73f3c7c4a692134d4a6fef6e7d0922b159161
-EBUILD bin_prot-0.16.0.ebuild 758 BLAKE2B f6702b5f235c546fef0e3395e99cf29d0e7ec8352391fbd5542571a0ed4a70e3ce1016ce92823044c5b7730fb51258afa8ca2a9d0d6a36d2d751e3c910faefe1 SHA512 53cc428a8542326575b411f19d6d11dfe2e8fafdba7948d83189507cf99fdd234de8df40411a7591f994a56e77de727915e52f7348f20a94282bccf9fc811668
+EBUILD bin_prot-0.16.0.ebuild 754 BLAKE2B afc54a04f374ffa37d4dc1c5df4c78ac51cd29eb97b3139f5bdb8016aaeef020af01ac137acb020fe37706b0e91cb81df2b72da36535c4a93274a41cd61b64a8 SHA512 47e09c9d1af27fc83d86989177f5a5b8e6b8368c07e8298d00636afcb945b21e6449affd5cf374a23911941dbf2c3bea1f697eb73b1173f205e94e87a974f4dd
 MISC metadata.xml 317 BLAKE2B 5a1a8df5a5a9a119f1d51f99bdedb24e153c7159e13ee59f1eccdb1b9d5018b3ccede38b2a766d0dcefc56a9cb7a1178c5574bffd180eab1c8ad451f9d7f3e77 SHA512 1177d89b299a879a46a3ca36660a88c86871376b18077abcada26861a76b2dc5d7db41243ebeb98322cd64a5aac16a4c3419a1fa76290ee1e0bf9513bd83d7fb
diff --git a/dev-ml/bin_prot/bin_prot-0.16.0.ebuild b/dev-ml/bin_prot/bin_prot-0.16.0.ebuild
index a50282c1aedd..af96d925c025 100644
--- a/dev-ml/bin_prot/bin_prot-0.16.0.ebuild
+++ b/dev-ml/bin_prot/bin_prot-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/bin_prot/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/core/Manifest b/dev-ml/core/Manifest
index 418cd9d8bde7..f2e66fa9336a 100644
--- a/dev-ml/core/Manifest
+++ b/dev-ml/core/Manifest
@@ -3,9 +3,9 @@ DIST core-0.14.1.tar.gz 361679 BLAKE2B ca43016c760e620f9073defd84a07bacaa0557d42
 DIST core-0.15.0.tar.gz 522984 BLAKE2B b6fdc9d7fe133c504f89ba492e63d090e2ca4e413e96eb8c216213ea358d84ae89ef1d372525b53f701e8076e4e0670ea3535f399f3f735b3b7da383901def09 SHA512 a73a3c1c6f0ade9a9e49917bb896e62afc4fda44dd90ffa99ef9ba24debe7166b4fe1b374500a044cad8318d12f250de7fe2dd935015efde379cf91a2241f51b
 DIST core-0.15.1.tar.gz 522517 BLAKE2B 1dc1245708f392161ce04ab121dfff550f13a8aa75b967bc3c32f474641b455355bbeb63ef1c7492947f46c3391cd877b96a8e35c083d0406135e840647715b2 SHA512 2c04fdd989d016faaa2dee4b13372d3e228f0011151ae5f747c1eb6206820a61779a87eb7e2ecc6e1ddf77872a69a07636a93d24df61b4a2ba2a1b745f499b16
 DIST core-0.16.1.tar.gz 542242 BLAKE2B ad0b3c1b55b960f040dc0ed82a2c3c19447dfe635d2d25adab63a0ea529867cd6692fe258af3c5896ea63b5438f96b75007b4e2e5ea1d34b3c13936a7b369aeb SHA512 5f9f4400b6e42b74ffd57223cb67884368d324739565bbb20162547ede8bd6d0ece3cc265503b674829f9cf373784e8036d4c73e26e9196aa5446de69b63e181
-EBUILD core-0.14.0-r4.ebuild 688 BLAKE2B 0236d0a340235aa8b2dd9a03fcdcb137dfb18daf160953852bed23f5b29471f8664db40618e744631c92648f73fc23c11e2b5309d8dd64a5ddf50710bb000e8b SHA512 87276c8dfdc8b2fce059a3dd4100d31b131582af46d054521bb496e207fec897b63ec8abdc900c66bb7e93a9e605100194239e8e61394c8df34b06c483b72444
+EBUILD core-0.14.0-r6.ebuild 745 BLAKE2B 2b7e7fc6196ede9d49b9c91e4d30586dfe054eda99cd6393945535402f8de45899fae03a7d5721cc21b2cce951bc6917bcf25c2b1760ca68fec6b8ee1de57a19 SHA512 41d0744b44089792896d1dc803c81ee85b5abef81856be900e8bd98a6c57cc751561cb778e0ea9cd644174324efc04cfad9665bb65f807180fc25559db8cb811
 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 1105 BLAKE2B d8903254a09e419e9765861d9af6190d19d887d59d09d5f2ad0e4622a88aa24bb40fdb82a4beb24c9c9ee24485703de6121ae82b68198c185b100a568d6baa52 SHA512 48346cc5bb1fcabd3c6394cd29ebc7108850c4a04f3d435e9ae3e81410f51523bcef450012d61f282aff95c847f5d40a275d4a139f95ee701208e21865d365d2
-EBUILD core-0.16.1.ebuild 1070 BLAKE2B ace66ffc9720131d8ad2066075c16b41cf7c1bbc1081cfba61381ff322a2efbe254715770b5f2179329ec0529515beec19581963fc321c19cfccab99a73a745d SHA512 8c546cc776385f1596dd9016a004e5c3a00fae79105c56076ebc8128baeff1230526811ba9ed41b62a08b0f8e7f83f196702d0e590579a6a248fc8d82c1328d2
+EBUILD core-0.16.1.ebuild 1066 BLAKE2B 569da757f9d85ffea8594f84c161a1bf5de342b3438ff06ff8d253587826fa319d210f1178c7f6c6a4bc84da9340e08870b195b1a7268479b5fbeeffae544f63 SHA512 8110792477d6cd9c8d74fd287ba87e5dc38a2eea3ae38b6175a9af880baa3e1ed3a850621136321ddde28118104aea314909247c4b7d1fb2ecebf6727ebd9c0f
 MISC metadata.xml 710 BLAKE2B 368091778c4347e69ea5398a3f6013d1741bc9fb20acacc861de152c8afd90d9647ef7b31143c26c7e50e0285b52f2a8688b7203821473004a9b237e65585dd7 SHA512 3d29e7a8c748a4849421fb73a1f1225f6480d032d8eb8bd70870567c8f2ac50ef1504c368204f6f063f71f5c984daff98a1109e81674abc8faca10c5a3414efe
diff --git a/dev-ml/core/core-0.14.0-r4.ebuild b/dev-ml/core/core-0.14.0-r6.ebuild
index f6d81379f69f..8de3801b0c69 100644
--- a/dev-ml/core/core-0.14.0-r4.ebuild
+++ b/dev-ml/core/core-0.14.0-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,13 +19,14 @@ RESTRICT="test"
 
 RDEPEND="
 	<dev-lang/ocaml-4.12
-	dev-ml/base:=
+	<dev-ml/base-0.15:=
 	<dev-ml/core_kernel-0.15:=
 	<dev-ml/jst-config-0.15:=
 	<dev-ml/ppx_jane-0.15:=
 	<dev-ml/sexplib-0.15:=
 	dev-ml/spawn:=
-	dev-ml/stdio:=
-	dev-ml/timezone:=
+	dev-ml/stdio:0/0.14.0
+	dev-ml/timezone:0/0.14.0
+	dev-ml/jane-street-headers:0/0.14.0
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ml/core/core-0.16.1.ebuild b/dev-ml/core/core-0.16.1.ebuild
index dc2f2c901b50..bcc0dc7244ed 100644
--- a/dev-ml/core/core-0.16.1.ebuild
+++ b/dev-ml/core/core-0.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/core_kernel/Manifest b/dev-ml/core_kernel/Manifest
index 60015594a758..ae7f0a3faa6a 100644
--- a/dev-ml/core_kernel/Manifest
+++ b/dev-ml/core_kernel/Manifest
@@ -2,8 +2,8 @@ DIST core_kernel-0.14.1.tar.gz 701832 BLAKE2B 0463641f8ab663f00dff59e1ac0b9693f1
 DIST core_kernel-0.14.2.tar.gz 701911 BLAKE2B e784d6d8f53df03ffb56075a43bdfc82d5099740c4eebdfdebe196cb3c97211b95892af18ab0f69b3143a873962fa74afe09a961ad851fb8eb4f30287e538157 SHA512 d0f719734d920d98c55ac7d1aa8ab5b3de7a3896f6cd8b1ffc5147c689f072361e79045a0b34c1f5359dbf492e612eabd613c4724fe60d45345c2944dcdcf6de
 DIST core_kernel-0.15.0.tar.gz 265183 BLAKE2B b1e67e8a84e1abbb23ccfb65c8320e36b3b2f91be3c2aa02e73b53c411e80da65c34b69d538d027417a52fd1dbb1a2217b9020d86ae00237ebaf3e7c06b35e42 SHA512 da28f11374fda2e869b5ef3f7131461c6d896b52413654f2aeb7c74bc77ba4a8e2a25830eb3e3ef393e0bbae903db20f54773b356c53cab75c1bba1b9ce265bc
 DIST core_kernel-0.16.0.tar.gz 276775 BLAKE2B 3e64ff9291c01b7f9d48a70e3106b09d96040b41720f36cc36d2067cf195451a0c948991f55b930bb6f58e28d75f47f21367785c2c06ac8459de0f72bf05f961 SHA512 a6cf486694514ea4393aa6b2bf688b4a21fd97238d22ddfa99af30ee478be23255d67f87c16115df03ceb3a7bf4726e92d0c01be0abb2308f36c027a5ab4bc04
-EBUILD core_kernel-0.14.1-r3.ebuild 1032 BLAKE2B 50eb6684ab6cd15aa6b2e328d11c19f9b8a641e7952584b08add5ad98296e46052066973007b811da43f75d0cfa44c6cc645a1a2126725b3446cebd66f0ec4b0 SHA512 39fd1af966e29654d3f37c141a6e72d8cd8bf7379cfb568186fba00c710ac1817178e2311909c169c1b687688a844f53d9365ad7523d561f51a208cc3fd20091
+EBUILD core_kernel-0.14.1-r4.ebuild 1139 BLAKE2B 5b7bb789beffe5e59d0c911ee7bd893167cfb55efaff94bada7cd6df32b22290ca2f5f69b2d282669bb5f979f50ff757d0b7164cb4726d40cc715fef6c56e976 SHA512 7e1f13ec54585cafb94fb55213c867c9da9c3220e30935a32e9055cb61026b1aac5d09725bc3c727916bc9dbcf53c72f04a89ba178fa0d20a0dbec55daa36d4e
 EBUILD core_kernel-0.14.2-r1.ebuild 1075 BLAKE2B 0a88db73c4a3a93e948d624e235d72ba70fc5e960ae68c3472881a537ff0fa5d0690861824fd7e501e9ac384b9a93b6c3b17c600686221a83d1be73d4b1dd8d9 SHA512 b4d1ddd8a0f1e8762786c6b23fafcb388c20e7fcd842e51a876204993942b90a328f8ef36f7f81a9cf981d64f4a2d5d93f436642fb93be761d103da062737224
 EBUILD core_kernel-0.15.0.ebuild 577 BLAKE2B 1ab31744e2561113090f3586241159bc0f368564cfe67c060bfa02a7b7e389cb4a0d0ebb14da876a53dd1e4d2772cd284fc9c69a81f796e0fd1b0eeebd63062f SHA512 3c417112f71c1469e04dc668e603b0c33e7ceca5cb846a9bae0461f45b3d09f399fe82f854d55e173255992754b5afa1559632ce747b017564175d148a6f8b33
-EBUILD core_kernel-0.16.0.ebuild 1400 BLAKE2B 45e0b1c1d04e1d4908a4ea0b0e4ddcec678c89cc255feca2006e4aa9728859be295e360686fbb78316e12cfc07bf27eb4693112dc9ac6ddb557ddb25bdf32066 SHA512 9fba23f6a2062f4bfae73bd8d3285367ac5326b18ecc287cf63fff11399ed7d922189feea44a8861541af6c854cc20f3e7facf56ef7b89a50e54609725b66df4
+EBUILD core_kernel-0.16.0.ebuild 1396 BLAKE2B 70a66ac0e3aed9a14f7e7783776d8d0c55c252c8cfc446422ebbb73510568a41d26730bd482fd0321d7cd18fe1991bf420f731fbccc201674d9a85d8dad2d1d4 SHA512 3fd1b35c85f1105888db0ca7044606c316ee23a5b97f220d87d98d7a412abec19d8164b8995d1c2eec23d42854670bd531e05d7952e6c7c0eefb3f8532198384
 MISC metadata.xml 640 BLAKE2B 411246c9f2ad1ba00a0475e8195d3b54a0ffd9b7c6804c10b482540e6c27d683451ed63d65f48e2dcab87a53a69fa6215590c8b2f8bb951266697df6226e44a9 SHA512 7854d4748ccc7833d4a029e8ee0fdef9d91c2552d916d77bfe171590a1de6c9e547675e04c886afe9b5b6de8c34e200f6e52a193213ae00ce70f5823fa363292
diff --git a/dev-ml/core_kernel/core_kernel-0.14.1-r3.ebuild b/dev-ml/core_kernel/core_kernel-0.14.1-r4.ebuild
index aa497f6f9095..f4d6230c918b 100644
--- a/dev-ml/core_kernel/core_kernel-0.14.1-r3.ebuild
+++ b/dev-ml/core_kernel/core_kernel-0.14.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,27 +18,27 @@ IUSE="+ocamlopt"
 RESTRICT="test"
 
 RDEPEND="
-	dev-lang/ocaml:=
+	<dev-lang/ocaml-4.12:=
 	<dev-ml/jst-config-0.15.0
-	dev-ml/base:=
+	<dev-ml/base-0.15:=
 	=dev-ml/base_bigstring-0.14*:=
-	dev-ml/base_quickcheck:=
-	dev-ml/bin_prot:=
-	dev-ml/fieldslib:=
-	dev-ml/jane-street-headers:=
+	<dev-ml/base_quickcheck-0.15:=
+	dev-ml/bin_prot:0/0.14.0
+	dev-ml/fieldslib:0/0.14.0
+	dev-ml/jane-street-headers:0/0.14.0
 	dev-ml/ocaml-migrate-parsetree:=
 	=dev-ml/ppx_assert-0.14*:=
 	=dev-ml/ppx_base-0.14*:=
 	=dev-ml/ppx_hash-0.14*:=
-	dev-ml/ppx_inline_test:=
-	dev-ml/ppx_jane:=
-	dev-ml/ppx_sexp_conv:=
-	dev-ml/ppx_sexp_message:=
-	dev-ml/splittable_random:=
-	dev-ml/sexplib:=
-	dev-ml/stdio:=
-	dev-ml/time_now:=
-	dev-ml/typerep:=
-	dev-ml/variantslib:=
+	dev-ml/ppx_inline_test:0/0.14.1
+	dev-ml/ppx_jane:0/0.14.0
+	<dev-ml/ppx_sexp_conv-0.15:=
+	<dev-ml/ppx_sexp_message-0.15:=
+	dev-ml/splittable_random:0/0.14.0
+	dev-ml/sexplib:0/0.14.0
+	dev-ml/stdio:0/0.14.0
+	dev-ml/time_now:0/0.14.0
+	dev-ml/typerep:0/0.14.0
+	dev-ml/variantslib:0/0.14.0
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ml/core_kernel/core_kernel-0.16.0.ebuild b/dev-ml/core_kernel/core_kernel-0.16.0.ebuild
index be1df007fb3c..f1677250eed2 100644
--- a/dev-ml/core_kernel/core_kernel-0.16.0.ebuild
+++ b/dev-ml/core_kernel/core_kernel-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 # Wants quickcheck_deprecated for now
diff --git a/dev-ml/fieldslib/Manifest b/dev-ml/fieldslib/Manifest
index 609f9d827614..7443fb702914 100644
--- a/dev-ml/fieldslib/Manifest
+++ b/dev-ml/fieldslib/Manifest
@@ -3,5 +3,5 @@ DIST fieldslib-0.15.0.tar.gz 3680 BLAKE2B fc6f2ed845906c7956a202d60c49a3ec919a94
 DIST fieldslib-0.16.0.tar.gz 3711 BLAKE2B faf1ee760fb04f643bfb6d80a5f3ab1ac4b4aa2edb112f516fede7e0a6e66bbf48951615faf0aa9b86ce1f518ef24bedef77d7486ac22a24404ca4b009a8b8a0 SHA512 73a6d9fdd921eddbe766e933ef3dbb2d3866bf454a79a260c81406e069e0c1db689676e070214b38190ee1ddb369d0edd704a474186aec44eeabc8b0adee0f86
 EBUILD fieldslib-0.14.0.ebuild 473 BLAKE2B 894cb61564c6d278d31ecbd2c4d502f44d41631030b912553d69242edb9b33f5ece397ea384b1ae44fee2ddb315b0efc48af2c18adf59de62be2eec6d3634122 SHA512 1decd4330b340d0f92e8035521d7f953d3f2940a0969445dc9d9213a1aaa865b32639f9bc16024b1ccf1cae83a79303548378ceb67c40f8a1d54ef94c0242f49
 EBUILD fieldslib-0.15.0.ebuild 480 BLAKE2B 60e38f4b1ef12df7c9cd47dd89304ef4ae18e662816b109a3836fe3fade18424e7969f355f7e31ab09ccbeea90fa84110520b2e1423ecc3ab18851913a531100 SHA512 d2be4b63bd7d919fa0b2682f6e67c607aaba5ea01f98471908717f9329598607edce3a0ad5cf6eee3d844ad07ffbc894fe8abc5eb0a777e640ee0a205835aac3
-EBUILD fieldslib-0.16.0.ebuild 514 BLAKE2B c284593f63c9c93b8e8d5083dbeb128f65da92e88f6b1eaa7cdca3dd38e404653bd42c059ef4768a014aaed5daceeef59b78fdbbcae8374b36b46eaca9dc4004 SHA512 bf954df3319b01496ca9e6c4fed01bceb76c37c54a0360d7d13f07dc937e8c0f8e1151f2571814233e0f079ea24a2602f7d65ae14f58df39bec3b37350af8336
+EBUILD fieldslib-0.16.0.ebuild 510 BLAKE2B 0c9fe73ce827f53d25fc7f1da863c55f62d3da07b5a1887b6f80d6b7ea633d557641af29abf094563d63df9859f71e1d85bf93a86dc1b1a51e3cbb11bcbf2d51 SHA512 ad302b42eb04ed87b4f1b8364f99403dc9f94847bfaec659cf00bbae2d189a10743abf82f9eaeaf7f092f8145ce3672245514fe6802efa4e00a591337b5d7138
 MISC metadata.xml 642 BLAKE2B f10a2ccfaba12724bdb081e6010ad8c1b214af5255ebea65fd7a910abb5245a82157f427b787d1e528f5b6865ceee37a69d395da898e7cf689c13967d4f511d4 SHA512 da170e90a7a9aa9bb26d512ce3a8bc282a6f738281fe3333d0765fe439db0936639a9c4c336d3ca56fa091df737cf33b8dd3d30b6b7a0b3790230e207129e386
diff --git a/dev-ml/fieldslib/fieldslib-0.16.0.ebuild b/dev-ml/fieldslib/fieldslib-0.16.0.ebuild
index fe32ece0414e..35a98fcfce16 100644
--- a/dev-ml/fieldslib/fieldslib-0.16.0.ebuild
+++ b/dev-ml/fieldslib/fieldslib-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/int_repr/Manifest b/dev-ml/int_repr/Manifest
index 05b0112129e4..9fde2c971a04 100644
--- a/dev-ml/int_repr/Manifest
+++ b/dev-ml/int_repr/Manifest
@@ -1,5 +1,5 @@
 DIST int_repr-0.15.0.tar.gz 9105 BLAKE2B a2a8197cdba7c4805c9eb9402e1c853619fc142bd057c4b42a578bcfdc97b417751634a31bab1ccd5c2e75cfbef46d33b6daf76da5ed4e3c9ec26d5c81fd3b73 SHA512 96537591fc597264347f967757df979344224f84594949bca96b40298e4ae1d7b28b40f3705ad4f85e3801724c6388fc048271216703b81fda0e56a314f3e88f
 DIST int_repr-0.16.0.tar.gz 9227 BLAKE2B 4dfb7a21cfe2bbd27051005f7eb1452925cac30b86ce3b20aeecbc0b2cf52966cbabbd9d56fa1fadfdc3c3912b33c4a1b323cfaf46e6c027ef6c31b4893e8901 SHA512 1b395d2c5c2322a8948f09e2b1c53382902edb1a390bc4659baf8eb87d085c90e551ede171a0d4d4b3c6fec18210ff100b02565461b42cabaedc446551c79841
 EBUILD int_repr-0.15.0.ebuild 483 BLAKE2B a4958ea7f09992aec49fde32f1bfa4a48ca7d9b5bf947533e2fb3aebc3651e4b9607cf03511e17c9576b90a32a412e937329a41e36a02b2f3eb97c4b30e84a8d SHA512 aee7e6cb061da839f5de5ca7f1c803de90e13cb32bea359cafa656fed78f506c46f06652f1ebbe55000b451b6d3cdf0663ac62d23d44bbfcbed5ce95d1a5e997
-EBUILD int_repr-0.16.0.ebuild 513 BLAKE2B 8a1bfe84c0e5d356aec1729a6132cb58b5d9a34753401d7482444fbccd70d43dc2bb261e879ed1b9b9d552ab484a6729d843fce662f8cb6aa66f762dee6448de SHA512 f5d0ce02405349068375951cd888776b35cd60a61168cf8739987bd60b47475bf482373049e9b8ee579f4b8779beb8cf90e01cfa90690874fd8c893e3cf394cc
+EBUILD int_repr-0.16.0.ebuild 509 BLAKE2B 062649217a2d750b5677125253af838b7e1a7085da8521b6ba225f6029f346868a9e2b565d886375e100280a22cb2586ee004ddfdd27e96ae28292c5f2515ebd SHA512 c5a27942eddcea3d337937deb1ce74ebd96ddac4cab38effa2366c52078ff1f2c3cffc3ced3ba8b3c251e63e75a9a1a216ca8adb5db506471a6c215d9e2d9456
 MISC metadata.xml 317 BLAKE2B 58b512e27ebd93e11da8245933f2230bddab2c07234c6365b8f860c70fad16866cd6e5a98559034d962c2cc5509d0346a9b6f9e88dcd663967432f4e38c70f0a SHA512 1e3442d580d84254768050b55eafcecaa4b1749404879f5443514c45014d9e0110ed72375ebe01b44603faf98035f1570f5820f9f4e9e448a627d6498fa65c70
diff --git a/dev-ml/int_repr/int_repr-0.16.0.ebuild b/dev-ml/int_repr/int_repr-0.16.0.ebuild
index fffa9b22998e..1a9171440789 100644
--- a/dev-ml/int_repr/int_repr-0.16.0.ebuild
+++ b/dev-ml/int_repr/int_repr-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/jane-street-headers/Manifest b/dev-ml/jane-street-headers/Manifest
index 25aad7d49164..5cb51a575c53 100644
--- a/dev-ml/jane-street-headers/Manifest
+++ b/dev-ml/jane-street-headers/Manifest
@@ -3,5 +3,5 @@ DIST jane-street-headers-0.15.0.tar.gz 4865 BLAKE2B 932468266f6cd56ee2b484c5f445
 DIST jane-street-headers-0.16.0.tar.gz 4905 BLAKE2B 33301bd5221fb636a44a3e654ae1511d99645e0dbfea4f9765f5d2febf9cdab03d6a9a15f7cf1733ffa380e7c9fa5743d66487feda0e2e2088d1e748775e607c SHA512 05336733845b442e3594889ac6e8fe7048bb3fc23b5f8a05e48d42db6851e4aac561587a1e73b9d6fb1852b768dd66b949cd220b1a9effe83dd181707ea2ab24
 EBUILD jane-street-headers-0.14.0.ebuild 413 BLAKE2B f7d52404918d76834cd1d31a183f9e7532b256d5c714486499a8d34296cc0b9c95828d1216859a2e68e20df1af3a8d2439f869d2bfbcc6e6f385e59aed7b217f SHA512 8bce1952dd4fb634050983f5024f5079856282d63b8f194da5b61d53e62c0c91a8ff36053b815e07e43eb02b7a4a6fc9950942d081dd2284543a14a6efd1669c
 EBUILD jane-street-headers-0.15.0-r1.ebuild 422 BLAKE2B 2f42bd7fd8e890b8484c3fecf739361d75c99c1e7876f63555476e3dab1249738c5ef9420596ab8c430b00bd74056461a504c818aa95c8259b45dcf6a43d3626 SHA512 fb63b58563676422b2b668b47285b587f8e805f9977be156135daeee6c727a8eaccba797e2a5e13edb068b775ca3116a68ecc28b236b1768b6aee1580481ab35
-EBUILD jane-street-headers-0.16.0.ebuild 479 BLAKE2B 8d510f1dce0776391b87af579e15fd7871d6987d6c3d5353a002aa936caac72087c1a3b09e5c25c4fd95466cb98bbb39783d1e3ec006f08134ab47e22bafef13 SHA512 e43f0a99b4e39bce7b8760112f57fda304a0c612920a92195e80cf05117df192188cbb327eb3a34b1f6b0883818626a6119d1765090a2ea95c3d5cee36a86818
+EBUILD jane-street-headers-0.16.0.ebuild 475 BLAKE2B 47775782a1ea8245304c514b9ac1403b8627aaf8751fcdff731cf80689373ced05750ae5716be599e333601f843e624c0c14ef6d64e3795249735245d5fabd54 SHA512 a965b781de5d10cf424ed181abf26389d5120f690db968e1f434ae93d1296bb46838fb5d6004eaf08820c77ab187a6cdcb258e6047e626bacd206e233956a4f1
 MISC metadata.xml 328 BLAKE2B 3841632fe3750691379f450f94437468e814ea272f39955b7e124991c920acce76741bdb6cd757240e0884087d282cf99f2b6e5d4a072236946aa48b852bcc03 SHA512 388b851a7e01bd5408ca54889a192b2531e1ee5e9982588c65d8e205e0d4589f5b3adb3128c2a7356a9c57b70227078963201f04a290ea58e9757dfa7eb543ea
diff --git a/dev-ml/jane-street-headers/jane-street-headers-0.16.0.ebuild b/dev-ml/jane-street-headers/jane-street-headers-0.16.0.ebuild
index 6d45dbd92106..ea6b1e06b196 100644
--- a/dev-ml/jane-street-headers/jane-street-headers-0.16.0.ebuild
+++ b/dev-ml/jane-street-headers/jane-street-headers-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND=">=dev-lang/ocaml-4.14"
diff --git a/dev-ml/jst-config/Manifest b/dev-ml/jst-config/Manifest
index c2808adf8a1c..544cc87c4e4c 100644
--- a/dev-ml/jst-config/Manifest
+++ b/dev-ml/jst-config/Manifest
@@ -7,5 +7,5 @@ EBUILD jst-config-0.14.0.ebuild 537 BLAKE2B 3733f37f016cd7755e1324366bf56a6643ee
 EBUILD jst-config-0.14.1.ebuild 542 BLAKE2B b991afdc7d7b013ca176612070909ccc50294eb963bbc0243d2e96d0f0e994090efbabddb9c69473fb825448647b0ccfb2e6e509af597a5c26126181a03cf1fa SHA512 f5640ed8e020e3d0628bdbc35ab131cd95ade5f86c39d273f3a80296e68be31a1554f7caa1a726f4a2a1df7f1b527ecf8087b87154935a7d5ce587483ce635c5
 EBUILD jst-config-0.15.0-r1.ebuild 551 BLAKE2B ff7406d512144d3107b7fde4d96e02443e7ddf0ab5cff3623ffb10401eac48cd039d2701559ec90672bde584aeac472d015fcd76fa6a17e2f506a0fc03e6f1f3 SHA512 a573407ccc79d6746f00ccf8a5bf8ff5a8f303d3e3ec499c0d8e319a52676c03045464d2d6991800a938f9f9b51c983a5ac94d32867b5f1e610f92e0e9c4d8e4
 EBUILD jst-config-0.15.1-r1.ebuild 628 BLAKE2B b2639ee310ad24eca55b903f1c54b14b5a96db0092deaed6338603dc34ddc6e746f3d7ecb9a1e67dad38116b54bdc0977445294b02d3f611b2b2fc99ba2811e9 SHA512 52a2f040925bbe12f347faa1273ed71da2f0480ae0abc23e24461923ae05becf63896c951389e6518ef886ce6e330576443c9a1919980b81154b3dd3b688c2c1
-EBUILD jst-config-0.16.0.ebuild 656 BLAKE2B 0122714d407180052e9990c959ab48880bc99cd1707039ea881c35d05d9ecbb65021c31470e442ce38fd7888ae5dac99ab8367b2e373500b179b865aa12a1790 SHA512 3488fb45bc93277a914f95c6f9ed085e2ba890a3d5ad8cebc0d4724f2989417031532af0df795a9a0724be80a9f6277d14c701dcde524e987e319e85edc88240
+EBUILD jst-config-0.16.0.ebuild 652 BLAKE2B 90417829b07fa82b8b0e40fef1ab6414912e5e110bcbbe918c29584b499d2a9223ffe9884624fa43132a69a45da140b512c6edf4117babc80099364530574481 SHA512 89adc7424397be1677ca689d1035e0d81347c18106f57d9b4de9b9ece722d02a75c123392348629b1574e0ebee9a852426c11349de4ae58fb80fbb720e312c06
 MISC metadata.xml 319 BLAKE2B 026944027d43638915798e6301cd44943c06b0ff6df3a750ec9487e558a0d38fad9c79270464a9d6934a500ec4443bf60953f636102fea0625d9c99a0fc19833 SHA512 5be8182ab8d98cba8182882470323bf7d31e4dbbc2b40c472ba8255a6382f8a68233aeb39ba63345c7edd4804e08c51863fc4622362695fb33dab3ab8f45ac04
diff --git a/dev-ml/jst-config/jst-config-0.16.0.ebuild b/dev-ml/jst-config/jst-config-0.16.0.ebuild
index 733b5faaf37a..b623137b063f 100644
--- a/dev-ml/jst-config/jst-config-0.16.0.ebuild
+++ b/dev-ml/jst-config/jst-config-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/parsexp/Manifest b/dev-ml/parsexp/Manifest
index b6cb149a7a20..145a939e1f91 100644
--- a/dev-ml/parsexp/Manifest
+++ b/dev-ml/parsexp/Manifest
@@ -5,5 +5,5 @@ DIST parsexp-0.16.0.tar.gz 56904 BLAKE2B 3ead4215242a6f5edd8babbb64ef68dc0a9e230
 EBUILD parsexp-0.14.0.ebuild 460 BLAKE2B 35a98a1fe05d179b2777b253d6cfe5e839444397b6ded94ae6802fe6a09bba27f5cb80b46f09fb10a82b5744ce635b3cf22d4520a0bdd229502831534dfed893 SHA512 18b7b772b64c58e7db79ad5131008b1564de33127aed3737bbaeff5cc536fef724c151bed51eb0671f43299882e16d93d83759197df4530609f936047f6242ef
 EBUILD parsexp-0.14.1.ebuild 472 BLAKE2B 9268011a8aa369d2b993daed5cb435b67320a97ce36be71a7739242feba9f76571dd31df0d8486e6a6b88a6050c2b2e51fd855bbb94b6fcf6e5e03848d97b65d SHA512 1886caa497fd3a0dbd763359c0aadac1a3a6a1980b00f31cc89c0831ce08c75d62914844d3a6771640273307528a22fca54461e6c8c25201fec22e0034d00ee0
 EBUILD parsexp-0.15.0.ebuild 460 BLAKE2B 823b9dce4ab4af1ed8208dfbf37b02c0caec772218e7fca7036f5689b3f9c74757c6447e63be0dea8119fdb8f9a77c5e52e19d64c445034e3625faaca6b1ebd3 SHA512 fba0868ec4217d6af13c0fd275a6b1294769efbff6054d927800c29c8f0b9112eec02b4335c293258182564127ee404ff9d5b46769e268a8c1eca072f3297077
-EBUILD parsexp-0.16.0.ebuild 465 BLAKE2B aaa0cad39f364d483a4839a85d8aebc3a79d1144a69c0afd176e73c168b332ee3e35705c92491b6fc9522b04369f8622131214c0edd7bf82c712952cf59bfc0f SHA512 55a75e15a158d120e7f52a9c1211be8953cdd79c884eb82a659dd6f8a7e85420c5f2d863caa26d14222e437a50a0cb2eb3cb4e5b3dc5c03eb47acc49d660af06
+EBUILD parsexp-0.16.0.ebuild 461 BLAKE2B 1d61d09ac7e925b7f3111c98e0e7237e5169e8aee961a40299d504ba44378988fcb81713535ebb07cd223f524f46203eef86d4eb0c0dd3f30c4f27e342239d87 SHA512 bbf9ee95f3b7c26a8d1c416174d5ffd33e6384e2608afd416517cdfd9c313bfa79c524e3bb4d064a123fff9a7ba13503c304da7bcb82964a8c0c440ac6b7c6f6
 MISC metadata.xml 316 BLAKE2B 743e4035fcb8d0bff4cfb264a34bf1f24cf5960523a49277139b1c6d91b7a4fcb99907c2a82d677c3f8f8b8a63336ee42e5cd051f128dc41932faa13c49cfd10 SHA512 5bd61b49d4813c17c5b57d1637f67d32539fcf8cd7db76a3defa39d347827724054d6535dfca3e519bb9c1879e827f5011ff492766f40c921630ecb1880b9b4c
diff --git a/dev-ml/parsexp/parsexp-0.16.0.ebuild b/dev-ml/parsexp/parsexp-0.16.0.ebuild
index 1ba5973d963b..5a043352d269 100644
--- a/dev-ml/parsexp/parsexp-0.16.0.ebuild
+++ b/dev-ml/parsexp/parsexp-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/parsexp/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="dev-ml/base:${SLOT}"
diff --git a/dev-ml/ppx_assert/Manifest b/dev-ml/ppx_assert/Manifest
index a6931bc78aa5..de8cf821533a 100644
--- a/dev-ml/ppx_assert/Manifest
+++ b/dev-ml/ppx_assert/Manifest
@@ -2,7 +2,7 @@ AUX ppx_assert-0.14.0-4.12.patch 1228 BLAKE2B e12ae7064c8a223b0910fde08c4c9bf898
 DIST ppx_assert-0.14.0.tar.gz 7239 BLAKE2B 730d1cceee88728291473e73120cc1ae19477927c8f5e20b1a455ab78e34c5917907a60e03ea7d2b898ccb99e42755f1ad918d7fa59ae64bac84fd8356af7647 SHA512 b8ae4a1f08e9110f0809f98d1e0126d50101db7c5b87aa166294aed29df420a079fd2c0797c2888718acd8cd4f2aaaa98f0c445e5fb1423325cc89801e7d52b1
 DIST ppx_assert-0.15.0.tar.gz 7387 BLAKE2B 60b4f32780ecf04eb478645f25150f9ad2b6671954e99b208917e0723767a1d122128c19b6964b63cd707ed78bf5b8117d4319f2f82e0b22deead05a140adcba SHA512 54d28c8fc9c1ecff9e7b616aa4013d09f6554f6b59b62ef9db0f18fb4a8e0b36f31241f522324140a9f680ad46ac57257a28baca00daa901c264f40d61fd510d
 DIST ppx_assert-0.16.0.tar.gz 7419 BLAKE2B 21090724f4fec89cd6dc87a409dc181e0cc816c24beb82b330f9471e7d20aeb0cab61c105d61251706180af2be3d93cf46dbd78d0af2b2ce9cbb57bd8134774e SHA512 cceddea9172535ca72990fabe455b503a28a5b7519dc635ba1e6e3aff9d0c5f71a794f3ce05466165bab843b7385c23b0d879917d15589ad9b9592718dd46063
-EBUILD ppx_assert-0.14.0.ebuild 808 BLAKE2B 6ada3f0bc4713307c5375c573fe34e8eae0b6418d3f37cd2cfaf060f74f56b5d9af691113911f31df8c7e679b966acab2a2444207fc44a9715511911a5cfd985 SHA512 8974cada500b4ebbb531e29d3daaf6f086037f6aa0ed2634b9b3797dbdb1903109db9ee6cdd9c28a02131ba4f58fcbdcba984bc8e6afd7b69b7c94a4e9d1eb27
+EBUILD ppx_assert-0.14.0-r1.ebuild 796 BLAKE2B 29025c989b6f6053661f67c5304ebb30a9d3fa37e190e4fb4b931453afd3b501a3076947ac513880b38581a8905026e2cb459f990307cec842a8398500b28366 SHA512 7576adfe6729f90ade5aa9cd861a6c64f9f5b80731dbe18d78ca859a4081438338209119e5fe6856da4218086d48bee627293f19f477a486cc638073e960df16
 EBUILD ppx_assert-0.15.0-r1.ebuild 609 BLAKE2B a2789458040acc3ffc38017f087543b33c8a4536b4562007e996da82177c874478aeaa694c33fe486174afb6542c1a1cc5a0bc15c9bb8ae82d08dda976093b7d SHA512 b1f54e90f5d05bf99a20e955affdae74f38c27fa6c416c0de6ca78f83efe1ea83b6d8b58de5eb19991cc76ef07e4ff91bcbd5aca4c706b13aac70a6892b36e7a
-EBUILD ppx_assert-0.16.0.ebuild 644 BLAKE2B 280d3687172ed44235fe1f4e934d8da7577d9d96e36e6d6acf9c95a9b39e459ae8283075385a79a6e2ebe65bc3e583305dc50b11171b8f011c252a134ceda5f7 SHA512 0d892af8793f1286ff734ceeef63cd5be64f663419f1b59c11c45f8cf214c928db51c6b10864fc777085c63abee6481a902013c790c9d6c5d28ac8b1c673727b
+EBUILD ppx_assert-0.16.0.ebuild 640 BLAKE2B d9ec4db5e811b91f67468d4de6f5001ff8d24a00649480ef48bf7b973a5ed35b04856d36c851d39e755816c50c1f81986dd741da22b47784a7e88ab531a72477 SHA512 d6ac161ce53528455e00179e016fdd5848dec2f20df4581dca4e27089953aef1a6838844afa0d44193386296d7129aeb14db36842163f4a826569926c7c31b68
 MISC metadata.xml 319 BLAKE2B f258068f83e4eb0b59386ef1d2b4b20658852d1f7520e7eb85dd4dd2c46dfe7f9be3bfa0a82bc11f4e2f6f75e6147e3f8793c7e5fe141c031edd0934bdead499 SHA512 3f21beaf22ab51842dfd4ad45bb2f9abff53e872376a143774b300569bceb0011ee4402b6d115a3da1d7def0ca68956188fe454228074390212702470f140abd
diff --git a/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild b/dev-ml/ppx_assert/ppx_assert-0.14.0-r1.ebuild
index dc67973148b1..d76dff478f2f 100644
--- a/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild
+++ b/dev-ml/ppx_assert/ppx_assert-0.14.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,12 +15,12 @@ KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
-	>=dev-ml/base-0.14.0:=
+	<dev-ml/base-0.15:=
 	dev-ml/findlib:=
-	>=dev-ml/ppx_cold-0.14.0:=
-	>=dev-ml/ppx_compare-0.14.0:=
-	>=dev-ml/ppx_here-0.14.0:=
-	>=dev-ml/ppx_sexp_conv-0.14.1:=
+	dev-ml/ppx_cold:0/0.14.0
+	dev-ml/ppx_compare:0/0.14.0
+	dev-ml/ppx_here:0/0.14.0
+	<dev-ml/ppx_sexp_conv-0.15:=
 	>=dev-ml/ppxlib-0.18.0:=
 		>=dev-ml/ocaml-compiler-libs-0.11.0:=
 		>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
diff --git a/dev-ml/ppx_assert/ppx_assert-0.16.0.ebuild b/dev-ml/ppx_assert/ppx_assert-0.16.0.ebuild
index 839209fc5e32..37c3e2e0efb5 100644
--- a/dev-ml/ppx_assert/ppx_assert-0.16.0.ebuild
+++ b/dev-ml/ppx_assert/ppx_assert-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_base/Manifest b/dev-ml/ppx_base/Manifest
index 5655d92e900b..d5fd3ef82f31 100644
--- a/dev-ml/ppx_base/Manifest
+++ b/dev-ml/ppx_base/Manifest
@@ -3,5 +3,5 @@ DIST ppx_base-0.15.0.tar.gz 2942 BLAKE2B 7e08f445f6e643a5b278bcc661a359a155ee608
 DIST ppx_base-0.16.0.tar.gz 2996 BLAKE2B 963c1966caa53fe4e626c111069a199846436e488d7c05a2323e8e726af09a5aaf5df5f2ef81a3736bc2215d8118351a413a3b3b1714361f44c1f0f3febb8af7 SHA512 110b03434f0ef7c82b8728c60ac03f56ec0bc2a292d9cc39bbca0102a976c34fb4a18311a7a1ff6755f7f61c2aa677d0413da36635f98336cc59eef962b8abb3
 EBUILD ppx_base-0.14.0.ebuild 708 BLAKE2B fb302cd237abd2ada517794aaafe6b4305fd62cd0a1e098cca6e980cc8a5c6752f557dfea1f91a06fc455abc9ffd199e56c19d3c3c924270cc78115f2d23a362 SHA512 fdce71548e81eb75ca58caa1bb967a2f0320e4386050e0398bd6d35e7d9f454afcae9c1cc03fd860580541535b51415b059ec76b7e3287e17149bc787eeb0caf
 EBUILD ppx_base-0.15.0.ebuild 524 BLAKE2B 9d238807c8b97265527b2e2ba21ff4b7bf2874f6caefafea6feedd6ec7e6c9099ca8525dcf20881914871d188f30d090d53705e8c729603644ec647d2cc3689a SHA512 bbcf83f90a1e5d1f2efbf73446d6f02dd2970b4074c8cdbd8c0ce09863e734fcf5e6e0b19a6ed51d202d079454243dc662c7401d7eaa7a75af7164fca0108b69
-EBUILD ppx_base-0.16.0-r1.ebuild 612 BLAKE2B 95eee4c24da8adf5bd22cd07b4f995cb9fd2646cf1644e2d831406f6f322452080d98ab3ba5336e8bfad59489fadf1b38a51d9e85c21f1afe3b9fa3f23b6f2f3 SHA512 3b9c7381d1c415f2881705b44484ae0fafeef7257a494bad8d83e188b6c87a27d26d41e832b130afa5f31964d650d87bcba63a4f6599959ac28e898539759852
+EBUILD ppx_base-0.16.0-r1.ebuild 608 BLAKE2B 96a60c522a1a5da14b09ec44200c595f0ac7f153f996259e8df2b6ef4b11cc420fb865080b2bd0caf55184f7e4ca7c61640a35ebe78b0af65a16ffd0b1ccc30a SHA512 e0036f601f62d4c0eab0b6fc3094a096d14a21fbc92ab640d0b7cf0ff95a943298a2e41a0a47a02aa763d1002d1fa6dc3622c802fc89075b77ed8f28c6482db4
 MISC metadata.xml 317 BLAKE2B ca0b0a804ac8f6b87e6052b561aa4bba1439d64dd3224d64bb865ef5d32bbf653135bc45beaa9711285627ae7dba077dab90d0eb662a3bb39d22d292bd9c1f80 SHA512 7190a91e9a6e3d3ab84aa0790979c0e9ef41cc830dfcdc1b062e0fb6e0cc0404cc670f2d3b1109f5c32929f2e76c05a21f9d92ad4bf23761b8485648b607057d
diff --git a/dev-ml/ppx_base/ppx_base-0.16.0-r1.ebuild b/dev-ml/ppx_base/ppx_base-0.16.0-r1.ebuild
index b694c4df4962..b44e16941118 100644
--- a/dev-ml/ppx_base/ppx_base-0.16.0-r1.ebuild
+++ b/dev-ml/ppx_base/ppx_base-0.16.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_bench/Manifest b/dev-ml/ppx_bench/Manifest
index 378f6b25da3a..6e7eaffaf1f2 100644
--- a/dev-ml/ppx_bench/Manifest
+++ b/dev-ml/ppx_bench/Manifest
@@ -4,5 +4,5 @@ DIST ppx_bench-0.15.0.tar.gz 9530 BLAKE2B d001817a4e912f7a9345e94a1f5104d0f1b6c3
 DIST ppx_bench-0.16.0.tar.gz 9555 BLAKE2B f215f21f4c1d4d23c86bbaaf4feb7ec3d21a1041d1072b9aec98a16f6cbec6cd2e6e067e8e44c90d5eb9aedc331092400f578aff40cc18a4eea22df1d7f432c2 SHA512 4644d7088647bffa24e380dcf52adfc4034fccddc0f3e75112c71542d6a4515904d465f15789705ac1861d267fab52af2791dc0a2ddedf83585c5f62c0f18aed
 EBUILD ppx_bench-0.14.1.ebuild 636 BLAKE2B 5393e0021bd6378b54f964a8dfadf8bfc5233f0f352f2996ec7213f44d44752f06ab2ec51cb89d304015a28e2a390f9d077db7c61b714d2fb72eaafcf8626b19 SHA512 f7225df5379c8222b1947eda12a4c7eef7c03200a9223197c939026c6f0e8becc1328ec7db599ac8c9f64e6aa703c7cf056d2de521f30d415f5f9d024f6deb96
 EBUILD ppx_bench-0.15.0-r1.ebuild 590 BLAKE2B afbb1cf288fc2f7eeff61d42e4b4ae436dffcbdfa9a4788abe9e098c2ea67f93f56f248a0b6dd3239ea01ed3dc79f0e45aae6146ffb74a8c0fea060201725e2c SHA512 c3ac3759913fea6faa8c1a44ab16a3490ca2d2818281f764b908a3569d51b07be028a50c1fd8f5893a5da1d2b3e68aafbdce1dab84b8971beb87c4141f3948ad
-EBUILD ppx_bench-0.16.0.ebuild 567 BLAKE2B 172779690fba3f7f9bd434d514993eeca827fdf35ac87d37de71e95a77fc41b0cae124b42be75a8a432b050210d1c1739ffff91cca450660b419774a96627539 SHA512 9e077e05930365adf7de9f4c64ce3e6b0fa979ef7fc363990dca36531203e1c81cd1c2cd1302866e83bc40d8a0ddf4d17c9589bd591a8750dd498620bea74737
+EBUILD ppx_bench-0.16.0.ebuild 563 BLAKE2B dffd979d29e034c6850c54935377afbb7cb593bdfdb548b2fb8403b5d5cefc5e78fe999de4ad69f19155cdee27ce284878fbef9e2125adc78d2079286605b910 SHA512 0be33e154a988a24c9ce4fc39ab13aacc09bd14f649f5957a135bd19175c8539c71bee0230e047f14fc463287a507d92b1ce4091e81c232bcdd0cda84440328d
 MISC metadata.xml 318 BLAKE2B 236fa58154c76e1e6af504007386858ee1f3e63cf9d229dac68e6ea1ca5a39a5af91c4eb96899ff3049947799e1ce3fc54170b8b71f43b34170eb4fa2a8013a0 SHA512 1c02be00ba358669394b48b565246834af1b945c7b378673501dfc0bc80588be5afdf3b689df1353eaf626d68e1fab0477c2410e295a73a24a23460cd335fcb1
diff --git a/dev-ml/ppx_bench/ppx_bench-0.16.0.ebuild b/dev-ml/ppx_bench/ppx_bench-0.16.0.ebuild
index 4ed99f0f5ec2..695016c548e5 100644
--- a/dev-ml/ppx_bench/ppx_bench-0.16.0.ebuild
+++ b/dev-ml/ppx_bench/ppx_bench-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_bin_prot/Manifest b/dev-ml/ppx_bin_prot/Manifest
index 4def08f85fee..178650629090 100644
--- a/dev-ml/ppx_bin_prot/Manifest
+++ b/dev-ml/ppx_bin_prot/Manifest
@@ -3,5 +3,5 @@ DIST ppx_bin_prot-0.15.0.tar.gz 37045 BLAKE2B 6ec039c1b18c759a676c1da30f02d70799
 DIST ppx_bin_prot-0.16.0.tar.gz 37632 BLAKE2B 48597b32da8b41dc5c9027d8dccff099055b9efdd7510c5f89c4d74f51e2fe6150e800ed5fbcc44f818deed5843e5bd485403ef7ec1e09ddec8d2b328e1dc8ad SHA512 b6e4f1a1ea1dfcfb2c23f34b0842097ad85535a22a767b2f47aa3a5812a112a60768c7b94bfce2602721f165b8ffec1e5282e83a008b2c6684bb102093467f3c
 EBUILD ppx_bin_prot-0.14.0.ebuild 869 BLAKE2B ad17169e03e632c5dba83929e2f66cd8b19098baaef22029e0fc4f89a481aa07a3f8c865b072353ba76f3ad69b952ecf773cb38fe7130a135d6304c9709698b8 SHA512 010da5942a99864432cb49f74e6d4b5b5b92482d952aff6a2c8e622bc23c66a35ce8a0244c93882b9d9266b28a1ad5f8bf32fa881c429fbd43a484d4a2262436
 EBUILD ppx_bin_prot-0.15.0-r1.ebuild 615 BLAKE2B cf26be339c80dc604843aec1b1d01009a98eabbc782510ce7fec54480f867c9b7ca75a720212244753a19e3dffb40aeae087267daaa545c8dbb03326a6168285 SHA512 81ac997f7fe8d081651642de7da26a0d41e0d193c81ca40bef46e2df7f285fb7f5922875c43a59bf22270c529adb4452b313e0aa772ea10cde5f15f6e1a1142f
-EBUILD ppx_bin_prot-0.16.0.ebuild 643 BLAKE2B 973de9e6b4b9362049ff3ca4426eb9623f4d8e1f66d338388cac6e0ac6f32deb9f557d9a7a17578c9cd1073d2b52e3abf8c42aa5a291d971a923295a3ce7745d SHA512 a2e800a365e904d29f021d4c4be58d450c0c9cb1aa9f3b304e35c35130dc0ec1836366570327ad7edb4ff2d7ba286ed958a0b107f39d49989aa57197d61a87c8
+EBUILD ppx_bin_prot-0.16.0.ebuild 639 BLAKE2B 51c0a16c46a3ad05c3008eccec75e42792d6f3b78076efebdd0b5b6698688dc7116e7f5ea9cbed89aef66609d807bbae7e672c30942a16079d1b5968dab89884 SHA512 89ab6b08e98d74938caacfebea4ad563086b037ea8089e133748a78c35b21ed1c95e2b5e7da5a3631fe381a36d101a113f0f9094ea520441b9bb0705a7523092
 MISC metadata.xml 321 BLAKE2B b0ef24cff0c794d45d3864eb092b8cc44dc83d685d45e7eeea5823bc7ea5530a5f0162d616866761b728ad6cda226f7b472ce346485054dbc8c6ee8743ea6406 SHA512 48929babf2b2af6fb5ad2618ba4ab5b824fc268468c21b0446cce282ca501e767febf418301f169d4a528d17382dfda096d4a53374edb243ceea2bfdce982f6f
diff --git a/dev-ml/ppx_bin_prot/ppx_bin_prot-0.16.0.ebuild b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.16.0.ebuild
index c8f350402be7..fb2b307789ec 100644
--- a/dev-ml/ppx_bin_prot/ppx_bin_prot-0.16.0.ebuild
+++ b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/ppx_cold/Manifest b/dev-ml/ppx_cold/Manifest
index 12e3fc1acb52..1429e301ecf8 100644
--- a/dev-ml/ppx_cold/Manifest
+++ b/dev-ml/ppx_cold/Manifest
@@ -3,5 +3,5 @@ DIST ppx_cold-0.15.0.tar.gz 3779 BLAKE2B 23987d38f61d3457c3c8a5c5105a2c7886fb88a
 DIST ppx_cold-0.16.0.tar.gz 3814 BLAKE2B fc75c4a32e9d8c3175e6a05f1f03d9c475eed7949fca4ad71ac21a4da881840b1c74133417d3354ecb3cbd7fe6b5a57238ef6d2dc97816f2f6659ea7b08bc7f4 SHA512 816358747bf4e4d92b6d5fa7bc31691897f6fb88336000a5e40b86250911b2efa203f6465d77b24f0147312bfd779de49822c5ea7a2a87df49d754b8c6e30821
 EBUILD ppx_cold-0.14.0.ebuild 609 BLAKE2B e33c2f192b2006bce6fb6b370e90f4e1fb37b2972605e814faf3de3adb3055f5bee33a02e74437caf7cb92b6a00140de5f5d6d7f2ef38e803996505ee7c2d21e SHA512 e84147c45f9434997bc7ef851ff3a465307065104da167bdf9e409370279a089d838f229bb8115e6c3181d49452ed28c9f675ab5edc61052e3d87d6549479d1b
 EBUILD ppx_cold-0.15.0.ebuild 553 BLAKE2B 214ad76f9285af1bcf1a611a34538d7a3aeb6cd65358d6d2ea60e8044eb09f877a284e74c48da117a05bb1e791e30429c84fccbcb56600c5b9f4855810e34ab0 SHA512 c93f63e8e81ea79e4ff5307e6a05f504c8c1bd097bcf66c7f26f9e922a6640317b9d91352fb891b6d09bc3ff9c4f97833384d7b5a34b9523e4ab2ac7b5992b11
-EBUILD ppx_cold-0.16.0.ebuild 581 BLAKE2B 6f52b5a98edeb1e703fbee4b9a61f92b79763b6eec885af096da2c752eb0ffbb1d74786295c8463cf2297699f5401d6696338cf336f5bedb8b270bcbb12edc24 SHA512 b1a6effdf4efb0b192aaf22c113598d5e726e7e5aeaebf3496f2897ae32cf5d6c4abaebf9f187b9ac91d7a1ed2af6eb2c88714cffb937d0d4e56dd2ce8db453d
+EBUILD ppx_cold-0.16.0.ebuild 577 BLAKE2B 85984c09d9a270d25a6a0a33767ed61d229fc2dd9dbeb4766fb09c923aea02900523929da144ce32a30e5cf2a2a5d58c4d39f7babf5c33a1571294cde1165965 SHA512 37dccded4115bdec32bf14acbc6426c2686610ab75f02500340d410bd43de32df21996b8eeea2449868db275c573584f51c37e026d5a9cf64f9bcc24ac36394c
 MISC metadata.xml 317 BLAKE2B 9a320dd26c8484ee206cda91babcbebbce9bfdd9d7dcfb39a1950cc27e8c00db408acb46b9660c406a856d071f6511d97c9f6e81528715180fb210ff108595dc SHA512 e46cf97833e49d14212cc0f0001d7302e8b15520b0e9b2cd87687b3270a76a1635c0e2c46af2b7fe9bae60231ae7183691c86944937c9fea00cdd09499e30813
diff --git a/dev-ml/ppx_cold/ppx_cold-0.16.0.ebuild b/dev-ml/ppx_cold/ppx_cold-0.16.0.ebuild
index ef672cd3037f..912ef30d00c1 100644
--- a/dev-ml/ppx_cold/ppx_cold-0.16.0.ebuild
+++ b/dev-ml/ppx_cold/ppx_cold-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_compare/Manifest b/dev-ml/ppx_compare/Manifest
index 89fef1051475..5d127205dc24 100644
--- a/dev-ml/ppx_compare/Manifest
+++ b/dev-ml/ppx_compare/Manifest
@@ -3,5 +3,5 @@ DIST ppx_compare-0.15.0.tar.gz 13905 BLAKE2B 6c3f3b8fba090bc1e0b0aecaed116ac25cb
 DIST ppx_compare-0.16.0.tar.gz 14041 BLAKE2B 7f6eaaafa75e49e09cef26b2e6579fd9cd18a67e4b73fe727cca0988bf062eda2f4c11424ee449ad6d82923d8f08ffbeda0f1e05e2a940f7360c64beeb03d98e SHA512 8acbb52a841012fc81efa0f8c1df4d8f0595bddbaf723aed4702d0f7917552ac4c08f6b971c1aaf765460a512f2fca46fe8bbe14fb1b021a3fe3be4181bdb030
 EBUILD ppx_compare-0.14.0.ebuild 668 BLAKE2B 7ec359582f6a72935da12825a8a994e028ddde22340acbc7b71285f5e12ade486d1cd06572f55e428f0504135ae2493cf83bfd74ff3825dc1f3dcc1800c4fbb3 SHA512 55c8bf50550238e202336ab17ebceedddd8374bb20173638518b40bfb0c7c523e077adb6ec6dbbbb3f2855712da183a958b688f4bca7a5447f74e65a7b5b1e7a
 EBUILD ppx_compare-0.15.0.ebuild 612 BLAKE2B 36bcb3ff63f2743c484e7dfd75104d74be60e6b1e94a8a9f7ebb178981da164007ec6e8e1a51a178a5de5857a80d745f6b921bd7ff03aa0e0854597f6cd69091 SHA512 0e6f91b6a2045c9b50661d3502fae0adca51493ff768e2bfec0af76489f7ab299ad6e09a0caeb20c4a0972e1881a557b3df580f4548f8013f89f94a6253a0451
-EBUILD ppx_compare-0.16.0.ebuild 640 BLAKE2B 613b5f2337f350b8dcfaa81812327b6bd43f9abc99fc9ba49dc308ad8ee204650ad0504b4c694a73358fe66f0cd09e6c50123c3ff6a29d55f1f0cb0d93245684 SHA512 10478bcad3dc7f30655121d1d41a845ba8a5aabd2ea216dc4225cdfa379f46f59c805630819446257ac76774c547f976ce421ec6ec3fb5d28284585947d21393
+EBUILD ppx_compare-0.16.0.ebuild 636 BLAKE2B c606c32ab5a2570d1b00a02baa356964cc54fe791eba66f89451f14a3935639b6521ba197eec06eba2a95e9ea2581b858bde9dc4e584272dc400cdc76b47e41c SHA512 df572cb6265ca406319cde749a278f3e37ae3472935db051fe30e7a90d216d320a73bc9d7935be8ce9ef0369d6674d9222ee19f9080437094b6fcb6d7708ad55
 MISC metadata.xml 320 BLAKE2B 62bb137c9458b6c75a4020b92813dfcc3986aa14fbe3b027821586b4dd735dea0f062e7253e66cac50e73a8742c9a4ece40881cf130a591c731e5cab9cdc1407 SHA512 4bea249224e667460941449ee2f0d6eedf7b35501366e679f7ea6899276e1fd913b7a24883722b832950f68a980ca2685ad3af9c0cd43e83fcfe7ca4a843f945
diff --git a/dev-ml/ppx_compare/ppx_compare-0.16.0.ebuild b/dev-ml/ppx_compare/ppx_compare-0.16.0.ebuild
index fcdd04ba6b95..fdabf59246c3 100644
--- a/dev-ml/ppx_compare/ppx_compare-0.16.0.ebuild
+++ b/dev-ml/ppx_compare/ppx_compare-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_custom_printf/Manifest b/dev-ml/ppx_custom_printf/Manifest
index 20233c6b46dd..26bf96255e8f 100644
--- a/dev-ml/ppx_custom_printf/Manifest
+++ b/dev-ml/ppx_custom_printf/Manifest
@@ -6,5 +6,5 @@ DIST ppx_custom_printf-0.16.0.tar.gz 9729 BLAKE2B a527652e9f5ecc2f64f48e77c6d05c
 EBUILD ppx_custom_printf-0.14.0.ebuild 689 BLAKE2B 72ff471b70a6e7aa3ba0135873bc843000f890205eeebf72b60cc8110e1aadec6eb1301d3b00b442df836ddb604ca07e4e550113a49cf58fe4b2019aac2cacd4 SHA512 df9dabe35387cfa59e1a2da9f458983ec4ce536c9c393c9f3a2b2895561c2a63e294e866cd35ca2a22173bba735db2c371fb7838b8071d617384e736f2e46be0
 EBUILD ppx_custom_printf-0.14.1.ebuild 646 BLAKE2B 8b4fab98560e59cac195a8f337036588fd7e6751e8a3f133f24bad37944448ab369ea6f0383e930e43033f082c077e26ba59bc19cdf85225b7afa7bf59a86adf SHA512 ff250cce3d9e698c66d370fb95235c9ce7d8900babaa0a298eddb37443a67ba46332bc73a41b20e5007ef188dbc520c0208b2d6f8d55af077bcdb4383806ddfe
 EBUILD ppx_custom_printf-0.15.0-r1.ebuild 546 BLAKE2B 46cfa077a4c2f85d1d83a0b2c5d462e8f27f2b79f91c5aae94ff5405ea02ccc5f4b431d97c51438b26a2d1784f769d3c944462353df46a33b4a41f94ad6d544c SHA512 b3cde9f78fd88c2d444ba26c63ecdd8bc71b087abb4ce7c5b73e182d2be59dd914bbd7b56712e8522a036ed52555d7ae4c665b3bdc283f59f8408a366f9762cb
-EBUILD ppx_custom_printf-0.16.0.ebuild 574 BLAKE2B 6d14e1736033a975f21391c14930be4c240b8a198d10f1604142a4ef0a4c88786f6f9e0cc290b689bc04495f077ec61e90e9f05cbea263abc68c238fce39ae8a SHA512 d59533f6cf66452bcfca0bb85e2a243a8c1f31b9655f6678eaab07bc07ce73252fa947848737b8b910d71dbe9430a639f15562d7f3de2db34e730c914270f051
+EBUILD ppx_custom_printf-0.16.0.ebuild 570 BLAKE2B 50699becdbfeaed4d74c05beab9b150580866c80f4c2b0169bcc7e0b452aa4dbc773b8667c2f1af2525803d488a2601588be8494a2f10cd784962bb1fea82b53 SHA512 dd383e07b002fac75ae827a17cf78b129978f9675065ac342a752f55ea8b24f167cf3fe6c8ddad81ce8cf6f5b360a0d4005f095e2ef06a13bb03bdca277c453c
 MISC metadata.xml 326 BLAKE2B d5f00ff07a9b4fe4a837b97c12198f94d2ec22c80a9d2b75cde3208b13ccdc6115e0d124fec0f441b571e88f8d7a4a620bc1a289967f0054ca7c60bcd2320c28 SHA512 0386b81c7ac705e9c407476c5b97b767fec019f15fdfcac89096e4dacd63b81cb1371971e2666c7c5cd1b2dd657f35ddd420687ee55615e8206306fc10847619
diff --git a/dev-ml/ppx_custom_printf/ppx_custom_printf-0.16.0.ebuild b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.16.0.ebuild
index 5b8ba919077e..572524d350f1 100644
--- a/dev-ml/ppx_custom_printf/ppx_custom_printf-0.16.0.ebuild
+++ b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_disable_unused_warnings/Manifest b/dev-ml/ppx_disable_unused_warnings/Manifest
index 52abe5e5658e..3395b83dbf9c 100644
--- a/dev-ml/ppx_disable_unused_warnings/Manifest
+++ b/dev-ml/ppx_disable_unused_warnings/Manifest
@@ -1,5 +1,5 @@
 DIST ppx_disable_unused_warnings-0.15.0.tar.gz 3966 BLAKE2B b087baa50ae3e0dd926221a69d0c3121ebeea431c08d0dbcc9cf5edee28e69c076e2f77c3b992757e56d03a6487ecd6257fec6a0373294cca6cdef7f71412216 SHA512 837bb96b5cc2623205ce778e6100d97a0a029e8c20a945509c06ee44784e67b8e9033b5387681c0f86c07f48ca4541e356ca62e19c1baa8d1b52c813400bb024
 DIST ppx_disable_unused_warnings-0.16.0.tar.gz 4004 BLAKE2B df63aaf68f0d9ee2e756b8f5c1df358d7f5ec9f00b7545a8f9911c2e73e7cadb4ce66d1b95705437e8c608e692edc67c9f17e4b10f659a47754365028f31f69b SHA512 43831260baf4d9602da6a26503ac6db50517965c1788941610c4ca5ca4f7fb6cf8381a8fe4669cc3355502a7ff9f42baf35e8ddb2e7ed71a018d9ef16a1d9d77
 EBUILD ppx_disable_unused_warnings-0.15.0-r1.ebuild 523 BLAKE2B 2dcd1bc6c7e49a03de8b50321aa948067da9129b8caf3594acc9c398bb9f9d23cdc41cc1139d0febb3466bceefe56eeb59cb135a68b9da7ad0c8355f72156109 SHA512 d024312b5e2c90e7085b15470a765912722ffcbb8b9f0073833fae8ce14db2fa9d69272c8f54767704c3ab8627f0bffdf3dba725791c66a4c12139bbb9cec8fc
-EBUILD ppx_disable_unused_warnings-0.16.0.ebuild 527 BLAKE2B db62c0e0064969ffa142f19d01cc4692a676ca059201f5b50b2a0e7e6339ba7d7af11e3cce5ee0322dbf32694b2717b54319986214158b6ca0ae063db8328ba0 SHA512 90ccdc1870389ae3578ab1c0a0e9efe4f11a0e7e842a71b3bdd0fc3d0aeae3391f937abecc3b66666bade1db4e960c7e16acc4c7948ca3fb7c4685ffcb6aca66
+EBUILD ppx_disable_unused_warnings-0.16.0.ebuild 523 BLAKE2B 48b7fbfd3cfda24e230ae6ea8e1dcc353122d7faa85a3426629df4400a14d7b36447d123799be769e4321940289909184e2e8a1fb65e44b9ad118f09fc42b64c SHA512 4940e7e85f56985acd562e42111a79cbb8574e986d6b03eb7423f5319a81ec30e6342bfd90326d83864b6536fe10ff118991895ce21959c9b128a73c3c267bd6
 MISC metadata.xml 336 BLAKE2B bfe94571dbe0a68c07075508ff585369cec562f4ff9a202972296cf1d89909085d75bc0192ca26e6fcff13ef4dd1124e471239d2cddadc0da879d933d670c392 SHA512 0346430a84b97f0b7feadf4d67b8c41f1e05bd58b907c2dc2ebf4f11e7fb001c41505e6b760b3a1654d3d5ae02d5da594b7dbeb5900d5ec98e1bfe27a7ba5194
diff --git a/dev-ml/ppx_disable_unused_warnings/ppx_disable_unused_warnings-0.16.0.ebuild b/dev-ml/ppx_disable_unused_warnings/ppx_disable_unused_warnings-0.16.0.ebuild
index b39b7cdbc54f..100b722a7a78 100644
--- a/dev-ml/ppx_disable_unused_warnings/ppx_disable_unused_warnings-0.16.0.ebuild
+++ b/dev-ml/ppx_disable_unused_warnings/ppx_disable_unused_warnings-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_enumerate/Manifest b/dev-ml/ppx_enumerate/Manifest
index 863482a32272..c230d1ad135f 100644
--- a/dev-ml/ppx_enumerate/Manifest
+++ b/dev-ml/ppx_enumerate/Manifest
@@ -3,5 +3,5 @@ DIST ppx_enumerate-0.15.0.tar.gz 9377 BLAKE2B 93718a2d22d4421c1a7105096802583b6e
 DIST ppx_enumerate-0.16.0.tar.gz 9414 BLAKE2B 87230f95eaf547a55c3ea3ca833dc532cfe1fd9245964de0e21e181317c964cd20c5fc20f9498e43ccaea4459ef074a1b52b3989590713ba4a7886c364bb4676 SHA512 8a5b79bd7bee7b746ade8a0f9ab1397f12e911a61582df344e78630ef64184f73415041b73699668e6b06b682c5f3f4f7b894bce0cd4aa7d122157f86d4c4af8
 EBUILD ppx_enumerate-0.14.0.ebuild 599 BLAKE2B 5d410e5f92353c113bd94e986fe4ccb6b6822c198062048fd069249edbafb42363568fc369818711ecfefa9303748b6571719339427f9f10d2161a9976bb042d SHA512 d0c81c0048b512835925326da78fe2dd8b6f8e9b4390a60a2a90cf8bba973ec8a9e2d553c36472c2484566c53ad9521fa88f28ef0cea7bf51fb2dd12cf056735
 EBUILD ppx_enumerate-0.15.0.ebuild 543 BLAKE2B 90018b0d96a1049bf410ce02c5b959fa4e078cb434fd7baf2f34e3679b9e1d0730396fb4c285793985529db66b1333c584f0ec7f75a63f2944abda4a60023790 SHA512 5c5c35e16ba15b978af58d9acb1a2b04a0d4998c715ab3a9cce0316cb2281153edd097d2ddfa6c4860710dcdfe860f608214ac135467921da2052daff083cb05
-EBUILD ppx_enumerate-0.16.0.ebuild 571 BLAKE2B 0409ce43e7c95a2861328cb75becc1ca98734fc86fa094b6b3c164f0438c7acd9dcf93b5effb2ade2b14026465e5654aa883389c231994d530e480a742589998 SHA512 6c8988e996c767aae037a5bf6362645779c39d8c81d23e1d867fc6e7bf38d38d5bba2feb257e7d5fe475bcbf01ab7629fb70b6345104c729427e6e8f0198431b
+EBUILD ppx_enumerate-0.16.0.ebuild 567 BLAKE2B b50746ff757df05d46d9819de26ff163a964b38855426047e8f2094b5a1a854b70792486c5f0e3d986073023130f9d554ab0fb863416467028b67f0e59d79c92 SHA512 40c19c5ce0b6398806dc2d9997994e8a47a2bfd586c48a8aa75c6eb9e8962cd614b2fc413f9eb7837e9c9c787d9c23bef78ef9ecc1cbd55f23168f59353ac3b4
 MISC metadata.xml 322 BLAKE2B 0e2cbb4b1277e94f5f983f5aabf4ef15365eeae6092a585ca1bff7dda63556cd18ee29c5bd97f93d660c57f0119856a96c81cc81351876e86e89562417a60a2c SHA512 d88fc81108e18a3eeb29ee98e1e67a5fedc9806cda2b0b02c7f527bddf16de8f02ed49922072870f1b44a72a5183ae031301ef0c8794dc0437c33ba1b0d65606
diff --git a/dev-ml/ppx_enumerate/ppx_enumerate-0.16.0.ebuild b/dev-ml/ppx_enumerate/ppx_enumerate-0.16.0.ebuild
index 1b79c5839e72..20267b3d7bae 100644
--- a/dev-ml/ppx_enumerate/ppx_enumerate-0.16.0.ebuild
+++ b/dev-ml/ppx_enumerate/ppx_enumerate-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_expect/Manifest b/dev-ml/ppx_expect/Manifest
index 946a7518a0de..6843aa104d38 100644
--- a/dev-ml/ppx_expect/Manifest
+++ b/dev-ml/ppx_expect/Manifest
@@ -10,5 +10,5 @@ EBUILD ppx_expect-0.14.1.ebuild 767 BLAKE2B c23fecbaa66262a0fc54367cbb60678e9085
 EBUILD ppx_expect-0.14.2.ebuild 779 BLAKE2B 7f5972403701fa477ccd97dfdd02ac522d7f59217002f478bf50b5aa525799d0846e47a29ed79c949784e24a9e60c295b1c40de1325a9d322400074f87acbc87 SHA512 66e0b351a5ca2a0048a719ae7c3c2a834c075896888a7d4364b277fea90bfbf51995fb0ed7c5100f522469df410dbc87416328b755c5312a89c9dcf95157abcb
 EBUILD ppx_expect-0.15.0-r1.ebuild 553 BLAKE2B 1e16e8fa8cc15c31eca0e6bbe8066deb5f83706bc8f2591ba58525f2d82af91c7495979040d86a2273e3b2f2aa7ecd67cfcd87184ba1fbebe762613a109a9101 SHA512 373fe00e40a6601400aa92d07a7a47b4f6d912f9b435192672c755ce1d2188e6e674ca4526be674deb12a6b37a44090f9d0114c3b201b47f47f3c49863954964
 EBUILD ppx_expect-0.15.1-r1.ebuild 565 BLAKE2B 93ac5ac6585f13f37c6e8ac0678301bbff8b03c42d8c7093b8d23fed9d97933969bfc5e83ecd5ecf44e34f401876e45f699713d4fc93aa2e97c314bcacaa1023 SHA512 bdbba68fb101febe06f16ea5eaa37b765e86512d8aafcaf74cffd3aa498a1765c39bd11e792359011db2343c0ed4809a5a9eb14cd7266f106e8c90e17a01b3a9
-EBUILD ppx_expect-0.16.0.ebuild 655 BLAKE2B 3c6d915cfc2834f2abb31cb4a13edcc973679c6e3abde7b1a108f36e37edd1e8e2eca2cecd17a40defae33daf10aa3f843fcfb542514c25cf1ad877f5fde2aa1 SHA512 05c5cdde274d32cd86d651a0fbd9c094846345a72902a2871160844b131096cbc4df73a15f2ba080bf6b131ced28d7ed41498d7d7b29d3fabb5c80d797764708
+EBUILD ppx_expect-0.16.0.ebuild 651 BLAKE2B fb894eb22c7af60c4159f8d0b4601d7a298aa4cd720ac0c7d149b9f5f5e346f4c803a5f225456b51bcd27078cb8fdd8302a0902caaf1b82cba13458bea4997a7 SHA512 a37418d1313bb62b0ac281ff7ffabd48b3a85db819451391f0afbea75b92f56514b96710180bd1b19a3b78817f3bbb401e12a8460f8d7ba6c7b01a453f398cb9
 MISC metadata.xml 319 BLAKE2B 2ecd44a00ff835deacc0d1edca05d16a7e8808474e73f3de1871a3689cde9420e7a3bb063be86f13c12db5e345fe1390bc8c83483b66b232003256d33fea226e SHA512 0606882528ee0af1ea5eb0d8c870a1bbb6db605b698b7360aa16e58027ef169a281cade50c99d55c685225524c46ade87ae1a82efc6c050388940ff0a02d7b2a
diff --git a/dev-ml/ppx_expect/ppx_expect-0.16.0.ebuild b/dev-ml/ppx_expect/ppx_expect-0.16.0.ebuild
index 61d547bb407f..bda52bed3d82 100644
--- a/dev-ml/ppx_expect/ppx_expect-0.16.0.ebuild
+++ b/dev-ml/ppx_expect/ppx_expect-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 # https://bugs.gentoo.org/749291#c2
 RESTRICT="test"
diff --git a/dev-ml/ppx_fields_conv/Manifest b/dev-ml/ppx_fields_conv/Manifest
index 9559ea59ca24..f9cfc5540f61 100644
--- a/dev-ml/ppx_fields_conv/Manifest
+++ b/dev-ml/ppx_fields_conv/Manifest
@@ -6,5 +6,5 @@ DIST ppx_fields_conv-0.16.0.tar.gz 21481 BLAKE2B a3a19b935b457fba0aebbe308ee3452
 EBUILD ppx_fields_conv-0.14.1.ebuild 667 BLAKE2B 3cb36fb05a537c7da5d111d035842727b0efa4072e2e6f168161aa7f1a0680200b28dcab759a0c4a62e09b08afb085da3896c7dcb1441650221ef80738cacdd3 SHA512 418d20aa4f4393fccab7532a2458e127338955c5b9f11d6707425e330a5668dbc426b54be0bc7949ab47a660a8a66b110a4a2ddce02aceed8cdbe2093c8c8dd4
 EBUILD ppx_fields_conv-0.14.2.ebuild 624 BLAKE2B 4560ade1b72e898aa037ed35ebf319551044173eea6b5031dd9f01dd83d3b1d34b4748b1c5961a7239644d9bfd62084ac205ab496805c9ba76979c102f5611e9 SHA512 655b61e3a19630723542f419e41d7ae04a3bada916ca6cb8d88e325dcce79da430b2fadb81997f95cc29a2043665a1e463f0e52b1f42eb3f084f2a1037d141e5
 EBUILD ppx_fields_conv-0.15.0.ebuild 566 BLAKE2B 3f2912b1d346f3bf5d377f7b5ec9daf486389c4a4df957acb871c1403a770ded79cb8cf6d67c7fde569c4140b19f1acf56fd4c524dd96424822309fabb887e02 SHA512 7b4fae27b2d68dc635929d6d7e473f31e363532fd464a5e43b8bb7eb82771948eb48c479a426539d446506519122778f82ff0a2a502709402d2e91db63c6f004
-EBUILD ppx_fields_conv-0.16.0.ebuild 591 BLAKE2B 5645e1d43a25811590707f67836c6f8f9de8d778f117321f41f3f9adbee3b2725b7fd8df60f04352b3c715ded1c266249b239079d47058f522504d6639e1a6d8 SHA512 1916e1a1c6f04f25daaf39ae244c93ad8900d20b5fb095007772192c419826a8f62834ce19c779c95bd009fdbe83ade8e7c5cc58f1b2069781a53c7d50040229
+EBUILD ppx_fields_conv-0.16.0.ebuild 587 BLAKE2B 1cde61879b693e7b987021b2893222861a7d1a2cf9ce852d710fe1c022e4512977d2d5f9fb6f05612dfde3d4026ecd96f0b6a679e4d9ab538c02a2b92d587eb3 SHA512 b838aaf4c78e4e2825a59b701a8842030eceba3bf7b851e23e093bedee86df82f4680e367d12b87d25765f60fd75fb9e2e6aef4de79917873f43265f9996b0e5
 MISC metadata.xml 324 BLAKE2B df583007092a40d0da913836603d9ffbd18d369d938d976cd242085e221de4d4cfce80ef780c43929ee00269860e1d4dc2075e7bce1982ecca17dc807e4b3150 SHA512 5b9d066fdb3925962f9bef0a8392d11d23b77047586b6bb6cce7cf45ad57a2e08b020761dd699d4c767ae82c0b70a7ea139812c0ce3af8e895a988d52ac8ee27
diff --git a/dev-ml/ppx_fields_conv/ppx_fields_conv-0.16.0.ebuild b/dev-ml/ppx_fields_conv/ppx_fields_conv-0.16.0.ebuild
index cae47d35fba1..171c70038cbe 100644
--- a/dev-ml/ppx_fields_conv/ppx_fields_conv-0.16.0.ebuild
+++ b/dev-ml/ppx_fields_conv/ppx_fields_conv-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_fixed_literal/Manifest b/dev-ml/ppx_fixed_literal/Manifest
index 7dc0400088d8..0cbfcd629907 100644
--- a/dev-ml/ppx_fixed_literal/Manifest
+++ b/dev-ml/ppx_fixed_literal/Manifest
@@ -3,5 +3,5 @@ DIST ppx_fixed_literal-0.15.0.tar.gz 3655 BLAKE2B 3599a5eea1cc691dd16feda7bb9586
 DIST ppx_fixed_literal-0.16.0.tar.gz 3679 BLAKE2B de5a474feba17ae3942cce33a42b0634c4d144e9721c9ef0cf53afd0c286043b71c2d281f3ed440c6d089f68e4566a75c636625945faaeeb06fb0ba88509a14a SHA512 9d83d578fb34b3fb2c5351c3934d5f35e509f66a72ba75126a44362b7e4de07c4d43a33b4eb8630999a7010410a8300c7740cc79bf16609ce1144ad90fc38751
 EBUILD ppx_fixed_literal-0.14.0.ebuild 650 BLAKE2B 563572aa68ea0a52874bc294e237fae6c151831fc951afc78a346d52f673976fb392e7da4c1ac77e07b94c73a77faf8dce5a8c23e850760cd8179a04f3dc8069 SHA512 c8385cda8f0435e796ea16a508822b7bfce2cb69a4cc4c0afe48dbdf15b220f6f4226975adcae0f79ef9b148e600e009833dc1dce8a51217ffebf0cc1aaef3da
 EBUILD ppx_fixed_literal-0.15.0.ebuild 578 BLAKE2B 988db2ea700f3af9f1ad99540b8cdc381b8144b0bb5d02a029eb2dc2682779b6bd6883a2243eaf65161b0f6d903bea2ff7244417c080851ffe30eb9b40f3990e SHA512 47b5ce945228e9a6a0ae11eafd021b7d97bc761efbcb7f62dd679ead90a99f8cedb689aa3288ebccda2ba1cb4624eb37507c50fc34fd5bddbb779a212bf4a3aa
-EBUILD ppx_fixed_literal-0.16.0.ebuild 583 BLAKE2B f337ca8169c69f8e419d76f99b0313a085d963143f4113a86b4f10a474491d40e500c6cdac7ac666d9fd10cc460d3f6303a27ba16fdd5272ba1a64ce395de9a9 SHA512 5e9734d366777e0050d11bdaa373a8990152cf9a177ff6d91495f868196cf9b1548826c5f0f72dbdf80df6a5b260b8e1b83b8e5b1b67a2c8d32999e8dc350d36
+EBUILD ppx_fixed_literal-0.16.0.ebuild 579 BLAKE2B b7a9d2525fa2e88abff189a2a4d2b219eac3476df8b75ba6da629c70f7c6923b771a9cae53233392c90a00eb9c4ff7f09865db1bfefabb1887d73a44571e41b4 SHA512 6ca73fe994e454cdb7f532987b95fb6a64be4262813accad364659a6f33241d9182bbbd6802e14e49a4761b7e4c7ed69188e1a2ad590909f1078b70f03c5307b
 MISC metadata.xml 326 BLAKE2B 9e076f31e03566b8045b67519496802c7e4fd9c8f851362543c83c3cc4881dd484c32f853fcf4ad09135fe789d9a3ffd91b19bfdf3f7489d3a85b7883c60a4f6 SHA512 1d85068dd7224b4c5b084b474f251af2c785600cb280d023177c0aae215cd5541ed9a0a8e65419db38ddd47e08eff5d71ac6573015934fbb41ee6c707faf4cfb
diff --git a/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.16.0.ebuild b/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.16.0.ebuild
index e2919b0631cb..7ce6a939a4aa 100644
--- a/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.16.0.ebuild
+++ b/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_fixed_literal/archive/v${PV}.tar.gz -
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_globalize/Manifest b/dev-ml/ppx_globalize/Manifest
index 8b56ca65caed..124fa2c5bd68 100644
--- a/dev-ml/ppx_globalize/Manifest
+++ b/dev-ml/ppx_globalize/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_globalize-0.16.0.tar.gz 8328 BLAKE2B e8ba1a500fc244d53d07dbe90df6b18f3088c9496d309002a177725e1990b8108c6972dd2b45caeecdbad62c466e73ee3ae944701dec489c2613a8b71ea88787 SHA512 76618dc1cc436c437e7911a2b793233f9bdd559dc37419df6f94143548bcfe09a0f29eafc3a36e97a5f8fb886aa94ca641f10f56078a8558f642a2cf564e4c75
-EBUILD ppx_globalize-0.16.0.ebuild 557 BLAKE2B dfc61daad8b1125ff44f1e8a0020817eb465cd8de3748ddbfb812ca2158a50971fcb5a459fc6e7f95bd4840bb464dcfe9480f83abc8bc1e924342861f43ce027 SHA512 68f8f9c76addad33159197a84f0b573c11b17a653326a22c9febe44e7c52b5db648ecdf16981842d9264549d9d112c2b2cd8d17f344d1a80cc5a8a544f21a3c2
+EBUILD ppx_globalize-0.16.0.ebuild 553 BLAKE2B 58502df49fc88a10b0812de445187f1d6db84fe113561c1c805e11e88824ff7fbf231369e3a5b645d3bbe15ec6acadbb76f0036649a417f77ddc0c1fa8d0e950 SHA512 6da4887f6b7c9f8e976d7280ff55da52ef1dfe90a58a29e9c46f209fd2fd74239dfd15d003618e9e5147c7f7b12b028938aa85a5fb833e86d4bc58739ea8cdf6
 MISC metadata.xml 322 BLAKE2B 8ce89cb150e376cca21af341cb13f2713f72f7a255ce8f6f334779a47110dc2d0b1b450ed41bd387137f0dc0fb1d76050a38a599c106a24f91e32c4146aa672f SHA512 d77c2c98b95a8ab66f71a295a0f9979dcb23c7e89a76e0988a02a3c31e6085365371af4a71e93adbf7ad9982a959e0bdc8b103e910800c382c4b3fa0172f027c
diff --git a/dev-ml/ppx_globalize/ppx_globalize-0.16.0.ebuild b/dev-ml/ppx_globalize/ppx_globalize-0.16.0.ebuild
index c4d019a043e9..5f65948daf4a 100644
--- a/dev-ml/ppx_globalize/ppx_globalize-0.16.0.ebuild
+++ b/dev-ml/ppx_globalize/ppx_globalize-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_hash/Manifest b/dev-ml/ppx_hash/Manifest
index 42547fc6e729..bc5d3359c1d4 100644
--- a/dev-ml/ppx_hash/Manifest
+++ b/dev-ml/ppx_hash/Manifest
@@ -3,5 +3,5 @@ DIST ppx_hash-0.15.0.tar.gz 28632 BLAKE2B 07c2416bcd1504bc82970a569984fdf225bf74
 DIST ppx_hash-0.16.0.tar.gz 28660 BLAKE2B 8cd12ae26beb6a6828ebb1ebd5d3168d37e9b0dc61feca742a9cee0e992e9be84b9a7b1f32e708e68d4644a3cd6dc29c6d302ae780efcd466731624821dd0238 SHA512 b06f67fa0550a40a96fd02e1b65240470a014fcf6f6d4f0f21f77d2d7f2eaba3b86faef462d329b416f9e6234f287ac3a3c72875cbac53b0532d8ab82c0199e7
 EBUILD ppx_hash-0.14.0.ebuild 706 BLAKE2B c066d3f77f8386f1742a19f4021f7448002cde99d7903de60529fadab43dece013798b01782f01e8f558d2e55e0b28fea955b2bec8313e89662b473a26db0cab SHA512 fb89a08de712d6bbc8e885be7d6249ee764372f8f9c2d7ddf5c9bf1a3931fea006b20adcf3c02b8b84a08823a6959fefeddd6923a6e69ec5cdea9e20c5b5a91d
 EBUILD ppx_hash-0.15.0-r1.ebuild 581 BLAKE2B 95eaf23c4fb468a518963d7c8190a1fd90d120e279472c83d9d7ba4589e2ab89b902fb82cf1506af5a9cb053411c13be2e7ab9056107657420599c1b5466bf20 SHA512 17f1869a20c4812f33ca654d70b43cf55869ff4348fe637bab0a9b238592e32b8455b66fa4f3579ce9a8f13d498bec2381f691de18b77a14baaa679d115a76f5
-EBUILD ppx_hash-0.16.0.ebuild 586 BLAKE2B 3bd293282e02cbcfc95e95139c75686403901c492d04ec183f90dd17f30e6d0da5b29eee1e96cf1cb55afe5c422f2453cd9a2e21557ebc1af8f2ba9d8f6d64ac SHA512 1362a980f0df85ea9915a14ab88addecc62ae238b0dd6f3b336382b73cbc0372fc77f39de698abb5ba0f691e3a279e93cb0e1efeee1cf614a3d3b2f41d35ffe4
+EBUILD ppx_hash-0.16.0.ebuild 582 BLAKE2B b5b0a54536bc38d981214dcea0915e94005650fabaeb604ada37db2b4e21b346d2e47587c4e87c5b84b55c2c2adf1d61a2b191907b9a3ddadb850d0ea7bd4a55 SHA512 98a400de048f6e237cf4627197296cad0290cc5545c21673573dcc8260a65719b9bbc2a884bd55ae4522666bb8d8da599f87ccd089c97910e2d3c66522485434
 MISC metadata.xml 317 BLAKE2B 24c922ea1e1c889d2e46b441e3927cbdd983e685b1c997ebd55d4ff0ff4317bb73864c45ea59fbd316d0125d68b57ce47c3c7fe4146d1cf60f990b820b70cea7 SHA512 cc98ee4926f393ee9b19a9b1bddbb02966ff9dc0b7d88a51579e9476d70416cc13a0de5db8c9e477084da205d48cd18609fce7ab03e440917f3cb9efd2ec09d6
diff --git a/dev-ml/ppx_hash/ppx_hash-0.16.0.ebuild b/dev-ml/ppx_hash/ppx_hash-0.16.0.ebuild
index 9c0369a11436..20a0d7cf4e3f 100644
--- a/dev-ml/ppx_hash/ppx_hash-0.16.0.ebuild
+++ b/dev-ml/ppx_hash/ppx_hash-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_here/Manifest b/dev-ml/ppx_here/Manifest
index 18a3b61043f5..a790da3c18df 100644
--- a/dev-ml/ppx_here/Manifest
+++ b/dev-ml/ppx_here/Manifest
@@ -3,5 +3,5 @@ DIST ppx_here-0.15.0.tar.gz 5010 BLAKE2B c04e72c8f78cc87f8edcff830c7e07094f013d8
 DIST ppx_here-0.16.0.tar.gz 5034 BLAKE2B 6bd768d87b838677e471964b290e1779da0b041f2f45f20d6fc9b77e1032dc313b49ab5faf9e613e4491b402ec0351281693dde92af342d67f286d0667ad3503 SHA512 8729ad57caaf512de4735a3017272d052f322be0847f051ab17bc687ce54f24c398dde8e6ffa10126e035750ec5268e9ce1ee678da7588b718144239fcc90bc8
 EBUILD ppx_here-0.14.0.ebuild 672 BLAKE2B 7e31ae9dc5c0dc3ae45f8a7a56374be68c95bb161cbb0ce8a83879eb2b735cec37e214a08016d347194cf249033fa36197522e87400cfd292b51f9485a2e2b0b SHA512 b82fe6d9a228d674cf82172fb76141de1f1d45022851b59468fc23d432c2fc2da53cca7eee4d561de1a9cf3f7240c428f3df2fc5216973b2b61992af4a70fe9d
 EBUILD ppx_here-0.15.0.ebuild 615 BLAKE2B 822122dd3f51f72ab3844eceac457b0b9c8acc96d52df1705a863574b987ed74387c49ee533ad2e553d785040dc47f9031a08b9679b94929b88653b51949ba43 SHA512 d424a4ca020f7ee44f1aa87722e5f09bcd6a22c837226facaeb052925c1c44742e5c333d16cef2cdde8b388bfcabe2070e3e996c4f000053f802a80d25a53f35
-EBUILD ppx_here-0.16.0.ebuild 643 BLAKE2B e2d6d24fe3d6d6ae9048093694592623a7f7100d933a1987517d488774e8a2f0ac9f28496cbb201daf4f1dd90990645d06602d56b67705ea525272c47e5bb093 SHA512 a6b666fca82925bdc1a73e1c655b443a94063a4d8007ae3021d3c40fcf64614b76039742f87dda1c7177fe20b449eb8d7211eb51777598fc1c228ea50f34e35c
+EBUILD ppx_here-0.16.0.ebuild 639 BLAKE2B e1bcfa45b96c9694d8b7c547926e0a5634ca802956d66fa8e169d35fa186f3aaedb4eff38f1bbb48db2c3f71320f66db593e132c39026525b9dd4ba0c7550a4d SHA512 84505a322811b48c19b0f98e33e8997bf3319902b8f8382971f8bc253824f341c72d02a3b590d9f853c7f15a92ac5f8feecda6176b9219ea802759a25b031f7f
 MISC metadata.xml 317 BLAKE2B a2865ad546715c8163fef97c48b582005a499dc19f14dc60efb046b0618dc6ce6a293b83673123eb2f95063177e7830a269a479c77f02d4452ffa1a66f61c79a SHA512 8d6170ee242152df811698e9a878866200e248d1bd4119dad7e229dd4c8e2cd285ffbe5618a2b6fbe1a219f582fc57fd879ec79e993ae3cc721ace89a47ccb3b
diff --git a/dev-ml/ppx_here/ppx_here-0.16.0.ebuild b/dev-ml/ppx_here/ppx_here-0.16.0.ebuild
index 1b59d478fa66..beb519650138 100644
--- a/dev-ml/ppx_here/ppx_here-0.16.0.ebuild
+++ b/dev-ml/ppx_here/ppx_here-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_ignore_instrumentation/Manifest b/dev-ml/ppx_ignore_instrumentation/Manifest
index 2ffda2f329a4..8ea600e75d68 100644
--- a/dev-ml/ppx_ignore_instrumentation/Manifest
+++ b/dev-ml/ppx_ignore_instrumentation/Manifest
@@ -1,5 +1,5 @@
 DIST ppx_ignore_instrumentation-0.15.0.tar.gz 3679 BLAKE2B 3537d4336a2299e277fcf1e58690233a9e1ecd94c80d144376bef90b45b3c2c94a8eaf5e5ba2b90b12d8f4e3afc257461c4732a2fadba8aa91c7f35ff036fb0f SHA512 ec411cb7a191fcb36f9a29f8ff3839db6f4031e30fa3444896a07235950ca04562a701b3bc7bc5df95e3ff82cfe8996be75bd5dce4bcce8a491898df1bffc50d
 DIST ppx_ignore_instrumentation-0.16.0.tar.gz 3712 BLAKE2B f7d4bb193fd1296b2bc9e3ea12133bd71a63dbf85dff8049f9d779db338a5725df12e005fc021584b98d0e09b2d69bf0198537ef69356a1a46eeeaee5c4b0f2e SHA512 3ec3a706b2c0d8d170860d2a6fb24f6f95dc7d1b28e88d292f536302ef005158d76e4c586721f924e3c7c5098981e3d9569e28300dabaf0348585b56c62bb245
 EBUILD ppx_ignore_instrumentation-0.15.0-r1.ebuild 529 BLAKE2B 0f51a0df4c5482cdab85206dd900d01c5f69281b3b24aed357bd73133548ce9d86e49eb3f37529030c1d1098691938044c3aa35ff13155b5441c71e80132b621 SHA512 3cc6a4c3d781589c758897831a47754cf56bed0ee263e6b0c7b8814a766b8b0741d0e6d53c03e1f7d2ce4860e9536dbf93b7d17fed271f23a17fcb1e9e280547
-EBUILD ppx_ignore_instrumentation-0.16.0.ebuild 533 BLAKE2B ece2a446a2b3179817c9975aee879c84a4e12e7c67547a1cddf9ebcee24ce0b86391534fc202a95813275697b49623a640e56b0ef8b114ce8a21cafcdf0cd038 SHA512 80e10d8790a50889e5bd7ace76c626041843ced0e81e00c5c80d64529eaa9afb9705671dec507ac25a654952c30886c3976630e7e38b575c5cf3288281951f94
+EBUILD ppx_ignore_instrumentation-0.16.0.ebuild 529 BLAKE2B 7f60a061965aa1e05a52bb2a11824497232da2fb7afed0f6e2ab26a2dc1cb43adf86b4607892e810c174d7fec01c06c623f4a0621ddcf907d8773fe4a0228015 SHA512 b65413c8675fb10c8b2b947e894d2c17a8cea473c874962066632091f36dd4ac31b60585130b36c9a57721793c75688ce2fe35a58da875f286fc11b72a3d081c
 MISC metadata.xml 335 BLAKE2B e78fa9416dac3fb12ccd82e965f1c152b7dc905f3f54c6d0c96b14daf9644ab2afe4f307656658049a89c8baacd507bcbd39ac2796648fc5c75d94ff2a5f8d39 SHA512 8c07521b5ed071d427b7cf30e05105be47f0ca857b0443502312d5080c4501612dfdd36f3858e7d6020def0efd9ab2630fbe13ffa0bfa751d557f8695bb48ca2
diff --git a/dev-ml/ppx_ignore_instrumentation/ppx_ignore_instrumentation-0.16.0.ebuild b/dev-ml/ppx_ignore_instrumentation/ppx_ignore_instrumentation-0.16.0.ebuild
index 1242ec81c0e0..5f939140f5d3 100644
--- a/dev-ml/ppx_ignore_instrumentation/ppx_ignore_instrumentation-0.16.0.ebuild
+++ b/dev-ml/ppx_ignore_instrumentation/ppx_ignore_instrumentation-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND=">=dev-ml/ppxlib-0.28.0:="
diff --git a/dev-ml/ppx_inline_test/Manifest b/dev-ml/ppx_inline_test/Manifest
index 90b61b57b935..9cd482c916df 100644
--- a/dev-ml/ppx_inline_test/Manifest
+++ b/dev-ml/ppx_inline_test/Manifest
@@ -5,5 +5,5 @@ DIST ppx_inline_test-0.16.0.tar.gz 21926 BLAKE2B 634bfb8966b73c65a609b6581fb9e2c
 EBUILD ppx_inline_test-0.14.1.ebuild 703 BLAKE2B b2658c99cd2e850e4c958406a74565026f7b8f3472539c8b89441c949fd6944407df51f5048aaa8634d9489a0c05194b8837fdb5ccb65fbb9e9210086b92f6e0 SHA512 4af0761bb81cf8d00732d1a49097ba3f48ac98076cc2b85e9173eec92cb78e12aed92a8b33ffc35cd21034908259ba32c020359fa9e1814af24eb67a008482ae
 EBUILD ppx_inline_test-0.15.0-r2.ebuild 577 BLAKE2B 8b074a57f23247b7f0c206ebd5f09743e3f7551c26e2902f230806daacb46cc407db87276c8d60ae49b4d2d08111fc703a216600e8904e8285c058619215b3f6 SHA512 9b9891538340e326ccfcdcba2059301f240f3f642c89495f7a37729cfd764da78ffabf2ffcf1363105e7dfd278dee12561a84eaf95c1323a92aca91013194def
 EBUILD ppx_inline_test-0.15.0-r3.ebuild 646 BLAKE2B 0710357fd3a80a044d6c085f178cb96d4bb7ab8a7784cf5dd26c33a9f48c3447e4b2587ea275e98119c600cf3bc7c8cccd08e76810bdc10f9d6e633ab2758c80 SHA512 d02167e8031f7e503ebf4b1b1df8a7bbb192a076a6f2a1869913bcebcc0f365b9f557147383ae11e7976c4d1da57e4d036d358bad99e467af0b1c2ad73f4b803
-EBUILD ppx_inline_test-0.16.0.ebuild 637 BLAKE2B 4056252b5a93e85cfadc50aee331d355967e4b67cc30e92f6b1c93d0d3ecdf30dd28ac43e8a0e242fae1d649804f7b8078b27bf030ad8d61fa25fa76a2c3a4f8 SHA512 7b76fcfd527293942e858b4cc6ffeb6294a45554dcb655991ef880562367450bca07c1d7fdabecd6f559d14ac99347637ded0f91aac8b77fa5f7bd05d0f14dca
+EBUILD ppx_inline_test-0.16.0.ebuild 633 BLAKE2B 95f3ccceffce7c6c4a6588421c119b2fe99ea146d746aff4278a0a5191909d84884aee0d500e5f36b7c21133e251b16c6961b60b50063cb8b35046f791b904bb SHA512 cf1e14c8b1750e65fda7b5e97b2d6a0f2b43992b4ca704a283c2dfea81a13e8b3159edab0587f5d57d6a4e938f9e0a008504ff491114ab723dbc5c3358ac4104
 MISC metadata.xml 324 BLAKE2B 98e51216ab36e55841792dcf4ef10163467a10ccc8c664c545c43270f86aaeaf9affbf9050ce34b8b0eb0e6b5d3492b8d3424bc21b24323fca542303070a66ce SHA512 34660326b38c0fd281448b4a34353e05149313a7fb3d1a9eb6b487e148c40b15bd1ce9e9a7f5069f8a77929e67ce586602ce77f450327f6968ab06d421685048
diff --git a/dev-ml/ppx_inline_test/ppx_inline_test-0.16.0.ebuild b/dev-ml/ppx_inline_test/ppx_inline_test-0.16.0.ebuild
index 2a5cdd1f4511..9f49ca1f5a94 100644
--- a/dev-ml/ppx_inline_test/ppx_inline_test-0.16.0.ebuild
+++ b/dev-ml/ppx_inline_test/ppx_inline_test-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 # https://bugs.gentoo.org/749291#c2
diff --git a/dev-ml/ppx_jane/Manifest b/dev-ml/ppx_jane/Manifest
index 07c4bbabccbc..38b2c85c8b6d 100644
--- a/dev-ml/ppx_jane/Manifest
+++ b/dev-ml/ppx_jane/Manifest
@@ -1,7 +1,7 @@
 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
 DIST ppx_jane-0.16.0.tar.gz 4688 BLAKE2B 46d2b4c6c7924fc6ff2bf4cae2171dd022a1ef51d8354c5393884a121cbeda001157650843c4409a22491a16445d36e374fe159cb826839e2b2a6950c0606d2c SHA512 8bb5997eb33a2f8ef7ec88d5a31c03828cc6f7070641463ad5af318b865fe8638b1affa359db07e8880364598b43ad19621882cf4c3311e38cf0638a59271652
-EBUILD ppx_jane-0.14.0.ebuild 1215 BLAKE2B fdebce6e9ba624aba1868cc9dcac1dede1b29a966cdc4c964519c709a12f39075682ce695f1299f596310216cbf68ebf83b76499dc3b1a4c78e55822c26804c6 SHA512 d0916b659619b7274e8b5d49f9d912bda2d4fcd5bf0e5f493a0ee06e928bc9520dc0497d6296766030218a9df864fea3c13ac05e0374399aea24c2e7bb18f4cc
+EBUILD ppx_jane-0.14.0-r1.ebuild 1147 BLAKE2B a1d2a80ceaf58ea19b924dcf8a1a2db158585d8b6add9175e9795f0e6c775e1852daacbf16c18bc2fa1bc6bc94a58cfebe62cf2fc2f02e2a35999d020b1bc5c5 SHA512 4caba5e57b112310a20b159018b2fb8d618d6c8668fddeaead786b05d48fec8c4af822b504c08a37bfe470b56eaa022ad2fe54b7a092b19f46884c277b1330de
 EBUILD ppx_jane-0.15.0.ebuild 865 BLAKE2B 4f5a4a239537c2c6830a759457106f67cdb791821f066c8d7176f2b6eab3ab8171ead78fcd5fc3b3fab052a93a0c9fb9b7b560104f6632b08650734754ce0984 SHA512 69dbc2635ac2777f0a47633dcd60ce9f4f7e8dd91cf4cff10dc86f4e22d852734cd6910f385ec778ac0bbc1a157b776ea49ca01222185e50269d94016f9b4707
-EBUILD ppx_jane-0.16.0-r1.ebuild 1084 BLAKE2B 7a893dd89371e795429ce09fcaf0639d53dcfa32514efc3e4e775cada62cd0f65703e82ff6b5cf838ee52f98e08c6634d6a270321e5f35771987374a0e7cd727 SHA512 bb903922dae3cdc693703135bf238062dfe4fc6aad119047d3d48bef07643cd08d52c7d26e25033bc913b86af424aa0418b80e91a49ac00259cb0fc98d660652
+EBUILD ppx_jane-0.16.0-r1.ebuild 1080 BLAKE2B b0633c8321d4f8f6190e77e69338d7b0620d4b7157280115e794d566c4b09f72c6fa22b0d9b1d45dafa36ab6d906d0b7f37774f11e1fd95fefa8abf99102f4ae SHA512 38f3362fb95accb83926f0a965d1bb982d50532449d17dc305a40c385594a2c5cef5cf238930a6aede324f1074341b94f68beb4a2e88208cd9babd8d4a6d4e4e
 MISC metadata.xml 317 BLAKE2B 682c5db3fa96d9c53b02b6706212a5a3b12c38179fe95fcb9729e308f4ce320d68c6848e329edc873da53010aea9795c0593e8e9130aa4613e16d0e8aa735fd3 SHA512 1e8d470579ebb9e0113b944a1bad14ba8c1e5cd76e78782e162a14ccd5b9b23e69dbadc3f00904c2f5c0d189902525317763fe78fe04cb9a593c86a2f4d08e49
diff --git a/dev-ml/ppx_jane/ppx_jane-0.14.0-r1.ebuild b/dev-ml/ppx_jane/ppx_jane-0.14.0-r1.ebuild
new file mode 100644
index 000000000000..c0a22ad27ef7
--- /dev/null
+++ b/dev-ml/ppx_jane/ppx_jane-0.14.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Standard Jane Street ppx rewriters"
+HOMEPAGE="https://github.com/janestreet/ppx_jane"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	<dev-ml/base_quickcheck-0.15.0:=
+	dev-ml/ppx_assert:0/0.14.0
+	dev-ml/ppx_base:0/0.14.0
+	dev-ml/ppx_bench:0/0.14.1
+	dev-ml/ppx_bin_prot:0/0.14.0
+	<dev-ml/ppx_custom_printf-0.15:=
+	<dev-ml/ppx_expect-0.15:=
+	dev-ml/ppx_fail:=
+	<dev-ml/ppx_fields_conv-0.15:=
+	dev-ml/ppx_fixed_literal:0/0.14.0
+	dev-ml/ppx_here:0/0.14.0
+	dev-ml/ppx_inline_test:0/0.14.1
+	dev-ml/ppx_let:0/0.14.0
+	dev-ml/ppx_module_timer:0/0.14.0
+	<dev-ml/ppx_optcomp-0.15:=
+	dev-ml/ppx_optional:0/0.14.0
+	dev-ml/ppx_pipebang:0/0.14.0
+	<dev-ml/ppx_sexp_message-0.15:=
+	dev-ml/ppx_sexp_value:0/0.14.0
+	dev-ml/ppx_stable:0/0.14.1
+	dev-ml/ppx_string:0/0.14.1
+	<dev-ml/ppx_typerep_conv-0.15:=
+	<dev-ml/ppx_variants_conv-0.15:=
+	dev-ml/ppxlib:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_jane/ppx_jane-0.14.0.ebuild b/dev-ml/ppx_jane/ppx_jane-0.14.0.ebuild
deleted file mode 100644
index bb4eaa6be97a..000000000000
--- a/dev-ml/ppx_jane/ppx_jane-0.14.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Standard Jane Street ppx rewriters"
-HOMEPAGE="https://github.com/janestreet/ppx_jane"
-SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-IUSE="+ocamlopt"
-
-DEPEND="
-	>=dev-ml/base_quickcheck-0.14.0:=
-	>=dev-ml/ppx_assert-0.14.0:=
-	>=dev-ml/ppx_base-0.14.0:=
-	>=dev-ml/ppx_bench-0.14.1:=
-	>=dev-ml/ppx_bin_prot-0.14.0:=
-	>=dev-ml/ppx_custom_printf-0.14.0:=
-	>=dev-ml/ppx_expect-0.14.0:=
-	>=dev-ml/ppx_fail-0.14.0:=
-	>=dev-ml/ppx_fields_conv-0.14.1:=
-	>=dev-ml/ppx_fixed_literal-0.14.0:=
-	>=dev-ml/ppx_here-0.14.0:=
-	>=dev-ml/ppx_inline_test-0.14.1:=
-	>=dev-ml/ppx_let-0.14.0:=
-	>=dev-ml/ppx_module_timer-0.14.0:=
-	>=dev-ml/ppx_optcomp-0.14.0:=
-	>=dev-ml/ppx_optional-0.14.0:=
-	>=dev-ml/ppx_pipebang-0.14.0:=
-	>=dev-ml/ppx_sexp_message-0.14.0:=
-	>=dev-ml/ppx_sexp_value-0.14.0:=
-	>=dev-ml/ppx_stable-0.14.1:=
-	>=dev-ml/ppx_string-0.14.1:=
-	>=dev-ml/ppx_typerep_conv-0.14.1:=
-	>=dev-ml/ppx_variants_conv-0.14.1:=
-	>=dev-ml/ppxlib-0.18.0:=
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_jane/ppx_jane-0.16.0-r1.ebuild b/dev-ml/ppx_jane/ppx_jane-0.16.0-r1.ebuild
index 3e5799899e73..a189e4b98aaa 100644
--- a/dev-ml/ppx_jane/ppx_jane-0.16.0-r1.ebuild
+++ b/dev-ml/ppx_jane/ppx_jane-0.16.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_let/Manifest b/dev-ml/ppx_let/Manifest
index 08e858f685ab..61b3d468a98a 100644
--- a/dev-ml/ppx_let/Manifest
+++ b/dev-ml/ppx_let/Manifest
@@ -3,5 +3,5 @@ DIST ppx_let-0.15.0.tar.gz 17400 BLAKE2B 3276944addb1dd01c1f461512452ee2bf32fee0
 DIST ppx_let-0.16.0.tar.gz 15460 BLAKE2B 8cc4adb4fae276a11df36d91690ae9fa609ac923b971afe783102fc854f212dce58826d1e743e2e2a349c278ca103e80cbb203fa18dbea21adb7c6849b0c8132 SHA512 d81c98f4f87c2af2f8121ce42bd5de8910ff4d588eb1bc3a18a9594c070f261b7c7a173bb86a5fbcd67d09ad8ba436df9a210577ac05c6a98625a0bc553fb4ad
 EBUILD ppx_let-0.14.0.ebuild 614 BLAKE2B b8eaea758368a049092176e3256df0be4bf7e210a159e3fc8f9822bc87e3985af5d6d7237070cfe606c710956d9e3209405ae5782ac735ec631837fede92b612 SHA512 62264f5614d60af924c8629d787c0a7eec888144200aaef99bc88a2f2a51a787810f5922b68e522efb37324b57f3899c321678c64a7532e278950b894b41ec02
 EBUILD ppx_let-0.15.0.ebuild 561 BLAKE2B 96da1d4129192d00c14ce9cf4907fa03dd07cac26bdfc4aafed4425a954b1d734f6df820b5c3e0bbe6c31de24ae8492097b4836c56d572e5a18d39fff90c7016 SHA512 fa7f779a6791b4746714eb22fef4581dd59e632182cfaed04a1b8a5549e9e591481de382c55eedb97f68398dcd50458ea36b825e2a5a5312cd7a4c66545484ab
-EBUILD ppx_let-0.16.0.ebuild 566 BLAKE2B ee52a7fddd95c4970a10b620ea9c72726a845d78a209653c1f087841de38f5f9ef4f04c3dcf2c9425dde5294a77b96ae4809884591b9050da8101bc15cc39f9f SHA512 bb25c7cd0e69298e41ed2074f30c9e639564f181fbac05992ae8b7f8498800fba7adaa4fb4872c3ea21b7f9c65563a1ecd383cc413d09230606c667adadcd516
+EBUILD ppx_let-0.16.0.ebuild 562 BLAKE2B 99b42fd6f2a0b3de7d08530cdfbc2ce73e43dbdef1ddf3a66e030399b93b4cff59119c672a8cb77ca9daa48fa8a2596fc19dd4ef513564d2241dcd14f7c225ec SHA512 34b11f8c21c5010130367d3a0b0bffcfefbea0bb187cb2c3a5b30bd25344c7449544c853374124a41870c22bcbc0d6bb36d1cf9a3cd7b4b84305f647e5e246b8
 MISC metadata.xml 316 BLAKE2B af01d4696cafcb4e83f6b9758cc61c0280527f25e0dfbe5d3f8988c899dcd48f58cb16ad9cf51fbc947e9a9b0228aa6f3acbffe1945ff949cb996272705dfbcd SHA512 49c2ac4f24e01b5315b83d420610f61ab101990207550b41a91df86ff2a4cf62c9681dd1d709e0d6745f8c84615125af72bfd93274146adacc1f4d9f986c4a72
diff --git a/dev-ml/ppx_let/ppx_let-0.16.0.ebuild b/dev-ml/ppx_let/ppx_let-0.16.0.ebuild
index d81a90d46db1..1e40c1aa79de 100644
--- a/dev-ml/ppx_let/ppx_let-0.16.0.ebuild
+++ b/dev-ml/ppx_let/ppx_let-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_log/Manifest b/dev-ml/ppx_log/Manifest
index 3f3082a873d0..8dd6f051a611 100644
--- a/dev-ml/ppx_log/Manifest
+++ b/dev-ml/ppx_log/Manifest
@@ -1,5 +1,5 @@
 DIST ppx_log-0.15.0.tar.gz 6672 BLAKE2B 3b45e705dfe6256d95e52b3fb1b1f98599d48fba6d4c565df95319566d5ab62965182d265db68a9b2f0b7e32103861639ff9ca46e1980e93e63abdeae83e79cd SHA512 1585f82615def2fc1c94853e9a1b9e3ebd2ef8193067f229f24580ea124c06736a2b361377801b9a44b7347e1938da051ed652764142e2270de3d3e8f375bf46
 DIST ppx_log-0.16.0.tar.gz 6706 BLAKE2B 7da65372fb1ad0f25023f1236634a1cb790f8ab3098a250ea1fac6056213973b02efac54c659c5dc950b2daf64673b761f6af91976bee3781f18f8e62c7c8d3f SHA512 6560720e4c329d8859850f06aa9c80f9446f361221ce57223ee2872944928079898bb644bf762d4907673368a18857390346a94d450ba4d2787abac77dea9e87
 EBUILD ppx_log-0.15.0-r1.ebuild 540 BLAKE2B 6afce962ba4b96de70038a4f5bec258a0ca11d3e9efbb1260dd866311a830b73bbd4e86ad335da1b4b6a19dc85d81e40d2271e38c7f5c002a256f7a2774b6391 SHA512 92b63b9bdeb45d3700e693264e18a0d61d3735aabeb22bd7eb2fc115d07b0ca4738b20b5fd1d66b569f40d2ecebaf3458816bfb3cb34d4167585370a68d3be13
-EBUILD ppx_log-0.16.0.ebuild 588 BLAKE2B 54c35867c15c9a555bf222a93241e5cc726d4bdc6aec97f5bce32a6608ec7e90ff537e230df7f8cb91e76ecc9cd74e8fbeb956686079784bb342ac75ee21cf1b SHA512 a1dfea870a9759db6355e4d3026abf101876746f301f475784e8d3f78e4ca9674abb09f6674dcef436088d9ae53ef806226c8e76bc8f3d63245d037f4df367dc
+EBUILD ppx_log-0.16.0.ebuild 589 BLAKE2B 49c496d781deb320625a722b0428eb63c71d0a408ffcee64aa241075dafb5928bc16fa3232f85175f251266073a305e0423e8ac9310e435f5110c9b556d72c98 SHA512 22f63bd7d3a606f612d42702b13355b33935ae2a7c7f19166c4dfb59886aad3085e3cb95b1b882698fa828f3eb18afdb38ea66444924b62e2b0b04dc8efa17c1
 MISC metadata.xml 316 BLAKE2B 67c67501b1b464809f108550e0185b2ea88ac412684b5324232f07bfa8c79592780673800f88cfdf6e907e82743da67a1da8c3527d93f9ca0b9901cfc4849a00 SHA512 1c596376ab905bbb0dc74b176f0e37b4afae66c79f5a04dec08d28025b852feaa625e434853c6cd290da0fc310b2d926261e97597d68374eaf4e52a2fd022827
diff --git a/dev-ml/ppx_log/ppx_log-0.16.0.ebuild b/dev-ml/ppx_log/ppx_log-0.16.0.ebuild
index 68dfc4d4bf87..3c7d16709e06 100644
--- a/dev-ml/ppx_log/ppx_log-0.16.0.ebuild
+++ b/dev-ml/ppx_log/ppx_log-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_module_timer/Manifest b/dev-ml/ppx_module_timer/Manifest
index 636b0059d0b5..c0d1e65f5f4f 100644
--- a/dev-ml/ppx_module_timer/Manifest
+++ b/dev-ml/ppx_module_timer/Manifest
@@ -3,5 +3,5 @@ DIST ppx_module_timer-0.15.0.tar.gz 7242 BLAKE2B 66c2bfbfcfc594ab568dd30cf874fea
 DIST ppx_module_timer-0.16.0.tar.gz 7281 BLAKE2B 3be0d87198cb15c7a95b8b72648a8e986c6ef83dd173538931f8fc9426bc6bf384c76f62dea7440d637caa40548e19832da07c32528c46c3eca10d354a0a98a7 SHA512 6125aec05e91bb11d1b41fc4fb9a1030561403c7f27ea9d9512a6050da4cfdc796cfe3acb1d96e5333f65b6beab6f5b16b044529ccc6e99e90c019923adf85d9
 EBUILD ppx_module_timer-0.14.0.ebuild 715 BLAKE2B 356a257c57e9c96a0617de02c6456e6775585018c82b1e6ca48038143ad71399cd4d54677873b3c18db5e9a49dd57ef0b07aaaba9cbd665cd58d904f0d8242f0 SHA512 35724b8c078856b6703f2052258b1806157e65cf22861fea2e2597a04847f5037ce8f49a8b3a983461627a5d936467f3aebfa108479988438f21c251f98c2ac3
 EBUILD ppx_module_timer-0.15.0-r1.ebuild 528 BLAKE2B 637bdd3b2e3321f303dbc310b2b81a9162d1182c1493e030f2a41be6a58dd2218cb22aa6cac7b04853a5e011e9959e70c1e46e22b58737671194f6b652bbe55c SHA512 006bd6de07e965e5265fbac1fc9ef27fcaedc4649954676b14e5f9f08a8194689a36b9de4ae20ee4972aea70b0315b8a550da32ccb75fb6fa688c905f15c3f11
-EBUILD ppx_module_timer-0.16.0.ebuild 556 BLAKE2B 98c33687cf3f78104a1397c802a349ea06b44463371475f10d49380b39499b62397ad031d76d6eb5c72cd8ec2bf278ee520a11536e7234ae4a99bd385ef89231 SHA512 2d028018b029dadcba19ca4f0e0e2aab8aff3a16d7096b1ea3ffe1a58bd45e6871dd66c8f8ff4f9970104118d4b557ef167c490a0314b1e3c8abfa4a91bb2bca
+EBUILD ppx_module_timer-0.16.0.ebuild 552 BLAKE2B 945a3c758b0f238f121349415decc430bba0d97863b44d8ddd5ee84372cdd15c24e39d01cd68b90d9dc66969f81a77be2efcb619c219b8cc507952afabaf68d3 SHA512 aea6650a1e8a03ac18b7362e2476055061882fefc098adb701c1698d5261e233dda2add52f5454690a74889c4d1c447ce2f0cfbb5b441d9c259900cc13b9a765
 MISC metadata.xml 325 BLAKE2B 23cb6d1b6bd67ada2aa7434344b2502cda10569b169a30951741fdef8ea269e0a81755fa837405c880e83049619b213e12fb63b49b0e4b4c013c14b60c12338c SHA512 f669337f74ff792131621c5af8c86aac19ba428f23fddcbfe47b590a8dbc6e40f9e7f9cd130229c37e142941ac1c54b12ae54c955de9b80f30e1489ecd5ff9d8
diff --git a/dev-ml/ppx_module_timer/ppx_module_timer-0.16.0.ebuild b/dev-ml/ppx_module_timer/ppx_module_timer-0.16.0.ebuild
index 689ef33b1ce5..b97b6ec7ac0a 100644
--- a/dev-ml/ppx_module_timer/ppx_module_timer-0.16.0.ebuild
+++ b/dev-ml/ppx_module_timer/ppx_module_timer-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_optcomp/Manifest b/dev-ml/ppx_optcomp/Manifest
index b7e591a3c700..ee13c5ef13bc 100644
--- a/dev-ml/ppx_optcomp/Manifest
+++ b/dev-ml/ppx_optcomp/Manifest
@@ -6,5 +6,5 @@ DIST ppx_optcomp-0.16.0.tar.gz 16789 BLAKE2B 102c9daa01a9fbda926d0ce11546bb7a5a9
 EBUILD ppx_optcomp-0.14.0.ebuild 689 BLAKE2B 852331cac1423131dc1670afef9b80ef26a940124cff9c7a9717144c9de2fdd972200631e05e263f9d7f843edcd8a1ab4dc9a35a1cc2cfa09de93b166a5423d5 SHA512 fde7e5abc7b8f0ce308e2bd0ea7144713838e86bab502f8f912fd44d5908b8f4460f508811d5a4fe3c53c0f3fbc2243d9e2070b16ba9c81a7ebab06d296b1584
 EBUILD ppx_optcomp-0.14.3.ebuild 640 BLAKE2B fddf9319d163be15d0e1299761f1dd5d8e236e1a691cb830833ab0cad6e2fe8af5d2d1250081d3a99ebb93207bf6580d14f5f97ec7ffefdfe9ce658b7d5089cd SHA512 ee4e6517c72dd3f9c5756d1916b13e60b92e10de520e6e880c8dc5f0bc658c03f9d35eab08f2a0f003a9278f64d758e3533971dda845fde8ce32a29a3f0de677
 EBUILD ppx_optcomp-0.15.0.ebuild 584 BLAKE2B 286dd1c84d4bd82d03a0cd671893c77afd3c3907fcbec933881fb14665502ed128cdc4797eae62f061a0fa84d83adf2e6804f548fbe2efb5def7cf1b8ab1f916 SHA512 adc89a6c97e786d921615a4a3fbe67fb03a1491bf0e7496d8a5d9678f6d13aa66b66168dd4b471bde91a27e4d943cb777a413f598cbcf10d4ecb5e04bf90702f
-EBUILD ppx_optcomp-0.16.0.ebuild 589 BLAKE2B 332ee9d083f4c09c4395212e747cf6a3e89e19c5102030f8020b8a4ad39fa159f83f22bd7a6123bab5213e94617c8c0dd9b4984dee6ae9e3566d951fc39e24a8 SHA512 867d7714d60f2d5ce2fbcb50b8fddb27f0dc0fbae0d17adf0e321d1897fcf0e642d6ef542e4a3e37485674686eda9d65f2b45d6b379365c1bf45a73a003d4c71
+EBUILD ppx_optcomp-0.16.0.ebuild 585 BLAKE2B 7217e2d40e48616e5cfdf999027deac53e6627e1de9398667a1b7a1a8a101ff2190205b3f7586857b94d933a3a447a56c37a2dd8853e32e9c584a16dd36e3fb8 SHA512 45525970ec51139332c49dc13330d176d2f9316c94a756da132b33e031d56950a8c2e44b504f8a847333c24d867fa30f2f674581900bfc951dfa7925b046168e
 MISC metadata.xml 320 BLAKE2B d071eb6aee59da2d97092e7c4efc45c4a831a286efe949d5b0892e2a943ab1333c2e8dc1afabb1425a82d7b5f5972393aea31d757257f10849dcafc8c2cf2cfc SHA512 fb2e56b5087494a96fc9d4e30bff20028fa4de13eca13bb9065fa2c4e489a935c84bd49f1887049662d2a59d0f6b3f6aac63d2754003072afd714b700aa49572
diff --git a/dev-ml/ppx_optcomp/ppx_optcomp-0.16.0.ebuild b/dev-ml/ppx_optcomp/ppx_optcomp-0.16.0.ebuild
index dc80a49fa3c3..5630f092d5ef 100644
--- a/dev-ml/ppx_optcomp/ppx_optcomp-0.16.0.ebuild
+++ b/dev-ml/ppx_optcomp/ppx_optcomp-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_optcomp/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_optional/Manifest b/dev-ml/ppx_optional/Manifest
index 52066329b97f..4ac332f59e51 100644
--- a/dev-ml/ppx_optional/Manifest
+++ b/dev-ml/ppx_optional/Manifest
@@ -3,5 +3,5 @@ DIST ppx_optional-0.15.0.tar.gz 6090 BLAKE2B 89752ec6175f0334b922689b2f1b47ee078
 DIST ppx_optional-0.16.0.tar.gz 8333 BLAKE2B 1e977c8c06a9db1247d17a4795d7cd849ca6280b2a2367de3ffe7071f18a88d2e0afc1dbbed3e8b1a01b454623e730d2b7b8e4d378ed0e55df016ecc36c8a4cc SHA512 07e812d46aef13e835dfc31e4eab17c656ad98e85843337d8f9361038c78bbcfceedaa64774784ffd84cb11e58c142e6c9bfab6d6c31eddf86b0e860f9a315a5
 EBUILD ppx_optional-0.14.0.ebuild 548 BLAKE2B bc3ee17937fa1c3060c0ade1fd1348f69c13d3876bec06d09eadf63c0fccac5fb75cd6e7ae0a6621652de6360ee7cb55ba0a7134322057a11667417302a6cbf2 SHA512 60c61bcc1bfa597276d80b1d4728ee415e035245457d1a1dd3eb7cb197d163d7435070addb019f80744643db680c280354798fe25bb7e65733533b995d935643
 EBUILD ppx_optional-0.15.0.ebuild 519 BLAKE2B 2a7d8f102aa51812f0dec2fedbc81a036930343a32f4cf7d98234fe41a64e9b30440ee5388d35a4d4ad3d16e76490264877079d26d5a97b912c0a122316019ba SHA512 9fbd8ec41d361ec44bc4caf6f11c9037c11ee67593711cd86170b9eb4e30aa80bc4bf22eb565bc3407ad1d8eeaa8a425ac5c96fdf409b15d534ad8d2973c5d58
-EBUILD ppx_optional-0.16.0.ebuild 547 BLAKE2B f824795dd19af4ff2317ddb288cc20ae467d1342034cc79550a0cbdde681cb0a621965f6d3b44fb974bc4df9e7d53febf1f937ea633eac50e3f4c72acb0271e2 SHA512 a5749ab0529a051c034ac857333ea91edbfcb209f912a69faa5825494f3bae3a6275a8faa7d87073ffe8d0aca2a4d0de2f84c341725a51ca8c52beeb814b3d26
+EBUILD ppx_optional-0.16.0.ebuild 543 BLAKE2B 343f5072f7025b2a59622bccd1399875e048ebad307ae2e27af03d5bb0f1e03cd088411b83fb17a0b1727f5ab976f0de012bbc1f0a2e81bbf54ade0e443e79ac SHA512 3adf79879aa9621af383c9d0bb33ce5a6b7df588897ca949109cce1fa53820f09a18253c88d1566f4de1bd029b10d725924d9be41d923ac3df4879416bdeb6c4
 MISC metadata.xml 321 BLAKE2B a6786e5a7137b56862af4172af306c4e959dfd6fc81ee5db00a0884032dd85edf817e54a92b17efb8db7bf01a1060c70cb59f4c558e4d384a71d1ed4726884bb SHA512 10ab82734c258f76e38a70ad757e07959e420272cdce1eaf95902f641ed3aa0c753181caaf4ae5c48f5194b9e8c1e81adf5cc75cd64eb8a6ee8c9fa55d167745
diff --git a/dev-ml/ppx_optional/ppx_optional-0.16.0.ebuild b/dev-ml/ppx_optional/ppx_optional-0.16.0.ebuild
index 6ee953269bce..7d6ca6e257e0 100644
--- a/dev-ml/ppx_optional/ppx_optional-0.16.0.ebuild
+++ b/dev-ml/ppx_optional/ppx_optional-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_pipebang/Manifest b/dev-ml/ppx_pipebang/Manifest
index 42668be707e7..74428fdda6be 100644
--- a/dev-ml/ppx_pipebang/Manifest
+++ b/dev-ml/ppx_pipebang/Manifest
@@ -3,5 +3,5 @@ DIST ppx_pipebang-0.15.0.tar.gz 3759 BLAKE2B 6d2a45a4b803a777dcf055acccbea3e54a8
 DIST ppx_pipebang-0.16.0.tar.gz 3755 BLAKE2B 2aa33958dd9b6abdaed4d38c7d627fa3cd1b0328bc01fc3eb8761ef9d60f9ba26b8be17975712d91c177fcf8c20e17da69c49ff676b2946a783e3674e30597c1 SHA512 b333d189c2705b3c7175af5636bd63c38ed434b3828227c7db8d2cb0fe9bd4caa05975d5d28d8fb4d61656bd3d7a15e2db2b36a1672107c1557c5012c19cb445
 EBUILD ppx_pipebang-0.14.0.ebuild 624 BLAKE2B ddd9e2886699510e2b122d00131f2cdf3b8fb9b9b634944f072fedd82cd3e290b7f9e08feae52502f8e3a093fc3cbf4a4a62d1772ac8a7714a3798160a7c9b06 SHA512 92ce9b54f3bf734ac5d01150029762b958de9f3f6a78cf79c5426cc9b4d52f38fba10f6dbfdca12a9f51ef0c166272ffe294c167fc8a4f27095bdf5455813136
 EBUILD ppx_pipebang-0.15.0-r1.ebuild 578 BLAKE2B bd1a4f814f5b8f751b12cbf70e137455bc8ad4bc50e4460740c28130d72137cb176f8a260325d59170b2a27c063ef4af874731d3614ceae5eb32aa47b8ca70a3 SHA512 96c560a7ef7cf6bedbef93d1e60ac132d8560a472b99b52c59e50469e5f7dc6fdc612a2b0b8e871505bf9a92411e3bf8dcb5c41d589f4362fc6d5a6c4f86bfd9
-EBUILD ppx_pipebang-0.16.0.ebuild 583 BLAKE2B a6dd8435aef5e574c4ede03d76bee9560214ca5aafd81c4af22714404f1ec1b3585f28fc06ec18d1c3238166cc15735ae2875914ba4055e76c21bec1d4eb3815 SHA512 235b8d95a989ebc20e25bf4f26d2f9413d1f44f7bb33438682929702849775640d08b5e23c7b7ea4b5bd850a2fe193be0106cd99d3201b205b518ce740a32219
+EBUILD ppx_pipebang-0.16.0.ebuild 579 BLAKE2B 61889d43d1aa3dd67d71e8b21485533037a4076726a673c62ab8098df53227dfabef69c68c0b4b41e1e19631a33b184a06eb29d637f50628521c18acdb719eb0 SHA512 fb4e757bb22497f5469ceb463f3c24e06bbe661ac2a427d65cbac225b8eb5510f32bc3e2647507ac5bf7904b3ec6af5945c723e6df4b0cbc5d586c3624cd5177
 MISC metadata.xml 321 BLAKE2B 17e2967cda84584db24109269998b3bfa25b1a67e9a1ae4c2c00f76edf61584fdc9c855ac87e2bbf730c52195573c4ea57ba522f196b2a3efde967a229fba579 SHA512 3b9d3feb7763e1fab6b4e4d5b0bd7347e5e2298f984202bf60b5470cb2c9db38e526a7f56c2e8e05303263cc7fa134e40602da7b6350dbee3427f0ee68dfdc2d
diff --git a/dev-ml/ppx_pipebang/ppx_pipebang-0.16.0.ebuild b/dev-ml/ppx_pipebang/ppx_pipebang-0.16.0.ebuild
index 8f9642ec2657..ca7aaf3eef1f 100644
--- a/dev-ml/ppx_pipebang/ppx_pipebang-0.16.0.ebuild
+++ b/dev-ml/ppx_pipebang/ppx_pipebang-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_sexp_conv/Manifest b/dev-ml/ppx_sexp_conv/Manifest
index 3e17aecbb715..3b39c79350bb 100644
--- a/dev-ml/ppx_sexp_conv/Manifest
+++ b/dev-ml/ppx_sexp_conv/Manifest
@@ -8,5 +8,5 @@ EBUILD ppx_sexp_conv-0.14.1-r1.ebuild 763 BLAKE2B 6df87a39f1fe77acbf47370679c980
 EBUILD ppx_sexp_conv-0.14.2-r2.ebuild 746 BLAKE2B ee1b2a803a90133ebdd5028af48b7e44e4c8051e27a01af6ed5d12755748f48fcd3aa16a019cddcc22420b9a5a9160e2159bac53cc8e527f296b2facf6454fb8 SHA512 4e5c6abee58c8b8068c7d202d1b8570d6b7c37ee148cc5df6980a5d27584b115d9ee0c0f601e05935786c83e5362547b94122274c006696120b88b1c5376f9eb
 EBUILD ppx_sexp_conv-0.14.3-r1.ebuild 790 BLAKE2B 776fb87d5e6f1130e17766973461da7d62d0c70ca948f2b74e721bc2b06f56249efdf7b08e4f83a4b0630fd433f65d32b7577cc8f2e548824b28661dad5b28aa SHA512 b6b935d4a6432bae1dd44c1bee9507786d3dd7affbd33e6d0cbb91f1480e7c184bd303aec6faabd258b16dbfdc09f9bcf7979f82ef2638396b09db85f141e53c
 EBUILD ppx_sexp_conv-0.15.1-r1.ebuild 649 BLAKE2B f1300fb96a7d462fde3cb0ea4ba29277defdc5bc041504d6a9aef1e9f7cd789e27c4fefa1f95a84afa8d8bbafdd25fef3342ca833c8e13714f9040910d38623d SHA512 b20eba3f7f5fd2138f5bb4f48f88d32fe57655e76ea9f1bca83f101bb49b1f381555bd4265857eb73832b1998d866869d63fdae0a9d10fac635b4172a92dcef6
-EBUILD ppx_sexp_conv-0.16.0-r1.ebuild 677 BLAKE2B 82a61f7e06b7af3d081214a47d4f09cf75ef7086f8ce1b1ccdda0add66e70394d1d4881fe5ab39b814d014a96a5633779d3caa78fe108be0e8a70ba101fc9f0e SHA512 28925cbc66a5eb85eff45d05f39f16f8ebf7aa10ab2bb4ef1f7846da0469d67444670d6644bd9d78a6f65db217fe5ef4c27b4ae796e02b096e4fa37e89431a97
+EBUILD ppx_sexp_conv-0.16.0-r1.ebuild 673 BLAKE2B 4ce9cc30c53549d80cbe1c4b57277e68a30fbeecbb1c4f01b5476b320e412a6a4655d258062643d57d9784ed05988856212c36f6dd6bde9ad3d1fb5d42b2ead2 SHA512 ccef02aecb3062f83918196fed2e0c7f7a516c783e6a40f98dea0d6f88261f422e25a373ee5635e6bf51cfe4313971c02f132f06bc8483cb88978633963eb695
 MISC metadata.xml 322 BLAKE2B 1450f65964724f946e2ab8a6b1f6e66744b25a7c738944b3b03bdc2c7917e88ef212b66286ea4e73464cdd2ef2570831a56c89aec59684b44bccaaf0018c36c3 SHA512 e9e1921e6a678a6e9353e033c3db3cd8f6d7147da2d9035e7bbbf53c7caae41eb55512ae1dfeecdc6acb5465965dd6320355a2a16b37feadf1514e70d8450c82
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.16.0-r1.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.16.0-r1.ebuild
index 0ebc5e9d824a..e6f0a4416773 100644
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.16.0-r1.ebuild
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.16.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 # Upper bound on ppxlib for bug #769536
diff --git a/dev-ml/ppx_sexp_message/Manifest b/dev-ml/ppx_sexp_message/Manifest
index 47a4935fe012..215876c36faf 100644
--- a/dev-ml/ppx_sexp_message/Manifest
+++ b/dev-ml/ppx_sexp_message/Manifest
@@ -6,5 +6,5 @@ DIST ppx_sexp_message-0.16.0.tar.gz 8435 BLAKE2B 00d0b3a9c8090630968f864b968ea89
 EBUILD ppx_sexp_message-0.14.0.ebuild 762 BLAKE2B 7b9685e172165c7de18b76f2d3707897ac9e02f5cdd4f5698eb1d4b86f263e403bd90b50df9caa55690605b615888cb03e00a8f0d95c07bf745ee6378b1ac0f2 SHA512 9f97eee48929478700a35552a44ca8d532b3ca09775b995d4c9195385fdb1c90352754534c6e6e2f14346f6a7cb9e143468876cf7e44618caa0be84c14480853
 EBUILD ppx_sexp_message-0.14.1-r1.ebuild 722 BLAKE2B af67dc51a5e6bc3525371ca196d4f99c2574d99138f70e311dba075429a5229c7a24f703bb6d4eea272a01d11208ecc54a7072d2f236005cb6feff03bd4c94c1 SHA512 f6dd7f8c94be9b7b5f2f815c552a034d34c227caa41c97eceded04d78acbab07d9d59076cb110c09e1ec37b01a696820bfdd9627710271da8dcc59c558875232
 EBUILD ppx_sexp_message-0.15.0-r1.ebuild 561 BLAKE2B ee43cbd94f183d2522c709a30cb0c8a7ef4877224ed9bebf3fd6665e7ef76179bfdcf82501abe2175adfbbeb5e059d71571790f2032556e558b1baa96b534ce4 SHA512 7e887d49a9702003b5d11117481c6d09c75e2a54322d17bf292af61cf2572a836ef99371fc7a435a80b78f2c54a397c2bb7f3a346aa2bcbb0c3770d1cfe38561
-EBUILD ppx_sexp_message-0.16.0.ebuild 589 BLAKE2B fb036986dd914662187a758f2ae9f555f43293da8e0df8557bcacfb14b133dbd30270c8e2ae21c86151cf5c1c49784d7d3e9bfed6d8a09ea72aac93110938541 SHA512 4f649c9f2588a1cf6dcc165f8b5bf57f7bea1f4cf2d3ba520f6527d219cc5da5ead6cb8149a20f40630553b7c684e942dac1dd01847ba9661ab32e1e63d03d49
+EBUILD ppx_sexp_message-0.16.0.ebuild 585 BLAKE2B 9e4f07d2ba9c3e02a50df680ae7316978d52ada4864893ffcad8ad64021c19b71bbbb5a6824a8288006a6660d86bddbc1984dd2d5fbab8535b0efe0cc7271a6b SHA512 93efd6129c3bf71650b27f5b7d8eca60337af3b9d042c554707e9ac7c0db644534ecd9421d662635d579378698316e6f7bbff8da4a5b878a6a34c76b83ce1c40
 MISC metadata.xml 325 BLAKE2B 8571b91af1ad5fb7ba47372575d0004b599200681797f7303d216c273b23ac86023a5989a9ad1f1db93f6a1f1ea5070ccd0559bdcf3a6f9acf50e32f1e73220e SHA512 14d21ce254f2f0c5dc6b0a51b6094d4fcf5250c7a29222ca3c7ccced4f058c3a07f9e495c617635e031da5243ee44e0d3cbe655394e91f95d709ddca281ce8f2
diff --git a/dev-ml/ppx_sexp_message/ppx_sexp_message-0.16.0.ebuild b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.16.0.ebuild
index 1f40044ced08..9520218a9de3 100644
--- a/dev-ml/ppx_sexp_message/ppx_sexp_message-0.16.0.ebuild
+++ b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_sexp_value/Manifest b/dev-ml/ppx_sexp_value/Manifest
index 17b7d25198cb..8618065c4baa 100644
--- a/dev-ml/ppx_sexp_value/Manifest
+++ b/dev-ml/ppx_sexp_value/Manifest
@@ -3,5 +3,5 @@ DIST ppx_sexp_value-0.15.0.tar.gz 7839 BLAKE2B 72ac20f7bae60979f2b90c2103773549a
 DIST ppx_sexp_value-0.16.0.tar.gz 8460 BLAKE2B b8d616e9c2d9a1f86a0727c4f05f630fee705b8fea5add83d71b94a5c63905c198c69dd5ac3676cbf8c6f8ebdbc2bfbae01ec1d0936eb13137b1107f3d1aed28 SHA512 f38c6045dc9d5136fcfaad00039fb7f0caf34ca1fb2031145fedb0b5d4c39b13c58c8d744ca77ebe291526b9f0b995d6f0d0f4cd18136b92e1125fb30e2ae2bd
 EBUILD ppx_sexp_value-0.14.0.ebuild 678 BLAKE2B b3137693608f525ca6fa7e3c26e5bdc918f91539f19ae348491cb7f17498a1194f3d4be3dd3f483ebb78a0b2106eb6cfd46bbb18640aee869ca68bd94715e587 SHA512 283764c18ef9570737f351ab461f8303969e897627262235c4285b4835045d4d65129eb5eeec538b4bf05c030896b8b4cb5c25281059324935a724dc50ba76f9
 EBUILD ppx_sexp_value-0.15.0-r1.ebuild 540 BLAKE2B 8c38c75ab746106d183b8994480b042d3c0e57aa8ebbfc2b06acdbac5abb4807820a62770eff620506c0894f35f0b3d7c94639d918dfc64e6b6ba8906a0c1c4f SHA512 4e6271352d93ad2196b4d0e3db9df1abc4610b06ce6f4eee711e9f2ca085f40e4e6a30e3df4cbba4b91ea872e011f128d99bc70cd283234c069c58c5b51d365c
-EBUILD ppx_sexp_value-0.16.0.ebuild 568 BLAKE2B 7f877deeacb51f7bf3ca874f68d1d98b07da5059da2dfd038d4dde0fa6857431cbf6bf06801be00ad5d730e1c3b54204a1202647940190f85a28729558efda28 SHA512 e04f0f0e0933a9a29cd9d4b9288ca1fef23ad9875f7dcbebcaed433658bfed78ca0960fc8b4b9be123277ee374b0ef930bb90d731d521d625cb269a33329e153
+EBUILD ppx_sexp_value-0.16.0.ebuild 564 BLAKE2B 9635283666c2a1c52fd00e094e2b049bc4cf8c4852b19dc0ab9dd29f37c0806b9988aeec17ac33a7baa10ee4667000ed3227b9afadc698909155a9456c7b1cc1 SHA512 c9883970f0a98ad8398391c1f17d748116337e67a19290d207fefa02b133a4bed35a6fa9ab980d3005cab6332cbfdeb0325874fbd378c3831eaacb838e2f95d0
 MISC metadata.xml 323 BLAKE2B f8a88ac36ee600ef55ab4be4a75628f044d28a08ecaa0754cd459c0ae9749d8cef9aff91dfb11f8ff5cef64772981b7e126d5cb67ae931495304c4881210680e SHA512 cbcabfae8f2a17cb429b729edb487196926733c1b0e72793ed723b5dbbd88d4ed09e6a0b9bf300aca9f31afb0210d8f5036248a19929afe59034cbf7face587a
diff --git a/dev-ml/ppx_sexp_value/ppx_sexp_value-0.16.0.ebuild b/dev-ml/ppx_sexp_value/ppx_sexp_value-0.16.0.ebuild
index 1d7d16261863..0eb238af68e0 100644
--- a/dev-ml/ppx_sexp_value/ppx_sexp_value-0.16.0.ebuild
+++ b/dev-ml/ppx_sexp_value/ppx_sexp_value-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_stable/Manifest b/dev-ml/ppx_stable/Manifest
index 54eaea9ab392..b041256b8194 100644
--- a/dev-ml/ppx_stable/Manifest
+++ b/dev-ml/ppx_stable/Manifest
@@ -3,5 +3,5 @@ DIST ppx_stable-0.15.0.tar.gz 18143 BLAKE2B cfd317f98c7683bd2faf29eb386939f07b30
 DIST ppx_stable-0.16.0.tar.gz 18298 BLAKE2B 3308ecc99f3c5a6c9b5a270f04effc62dfdb52116b91255eb0383e3244a2710124a211a81d52954ee5ac94251f84847d12787dd79b7c3d96a68d1bd4abf52458 SHA512 bbc40494718d99228e194f766be75c67a657cb50fe6090d05ba30606be40406c93323b64ae3d2400ab6a1563c3e9fa04c2ba82da7db47b7c1cfec103f75d19cb
 EBUILD ppx_stable-0.14.1.ebuild 606 BLAKE2B 9a37f7b5cda5bf05b9517823575ab9f403dcded17d8f52e87060ebb6b4fcca7042ca10b349d90a308cc6e39d412df8df748c711fac02d8c9b3a8176d475e69c2 SHA512 c7bb5ae253f5521358faf6300282e4fbd37824054db3d5bdf8d90150c50ed9a8f59e9427b0703d8928727b2ec99fcd22d559dd67b47d556ff7af32a8b163b12a
 EBUILD ppx_stable-0.15.0.ebuild 534 BLAKE2B 7bb4e6f1e22ced583b35e5c4b548092e9dd5c2cd424b619f4fa8543a5e11ac4d06b958a97d26e2b5a6efe54eaf3a7fc171d13f3b53277fee24b142c5884c6800 SHA512 d04ad567e913a867e387dafddac66ebeba72b8c4139db77198cfeefeedec16c383cf2e550f0f305090a0a506ace2f681e6f13f01783651e14a8078727b9e89a3
-EBUILD ppx_stable-0.16.0.ebuild 562 BLAKE2B 419d96316e6b1902545a429a657dd503a91d54456e180fa11db9af35d896236932a0cde3e3c5966543aef3fe7de29b0d5d836771caf6f0563988eeace6a4dc8c SHA512 994f5933b78dec6a5514a7646ba5a900016d851ce4168bbdaa791b57a4a41a52dea22816ecedc77eacac1e0741d7349cff2e5613f90e6575b67f913a051cce9c
+EBUILD ppx_stable-0.16.0.ebuild 558 BLAKE2B 6401af874864ac07787fa2e3230e46bb6b72908a03cd26b52295d0c0a9bb41c96578dd2b7f91a3f84b4e9c8c19475054ba0a02546792499630b535ea3c271ee2 SHA512 78ec47e04d49d8685e21c227bef6e2b34348a34786d4c2e14d481ae73b23da4de899007f5c498b4bf4c02aaf4f97820165cb964579595e4a32f669dcb5a51c79
 MISC metadata.xml 319 BLAKE2B 35347449d8e7b9849c791e0e1b2fff68d12218abb7d59885d6584d2fa6141b5c5d7af6f4ef5968c1116bd1a7683bd33fd1a55ce446fe975e3ab5aa379c5df10c SHA512 b5b67e4926f69febd8834fbbd751ed595012fd481c130ba17dfcc163352e9d31e3486c62b9fef9a48b8afda82b72eb7b89cdb132f554379313cbc0dc6fd1172e
diff --git a/dev-ml/ppx_stable/ppx_stable-0.16.0.ebuild b/dev-ml/ppx_stable/ppx_stable-0.16.0.ebuild
index eaffd572aa50..acdde7b3d443 100644
--- a/dev-ml/ppx_stable/ppx_stable-0.16.0.ebuild
+++ b/dev-ml/ppx_stable/ppx_stable-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_stable_witness/Manifest b/dev-ml/ppx_stable_witness/Manifest
index cff6481f31b2..834027ff0920 100644
--- a/dev-ml/ppx_stable_witness/Manifest
+++ b/dev-ml/ppx_stable_witness/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_stable_witness-0.16.0.tar.gz 7641 BLAKE2B 45bbdb187c1dd9dcf1a3d51fe932bc7e93d7b23f40203e065fd5ba6f4bc4d418c241bd1c9550c09c78638865a3f17b22dead0e22bd8c04037d99691f8dbf6a1b SHA512 386688f6b9bed1fa481030f881b124681c18a49c8a1933233a7cd90dff5ddb4f1739cfb2d1c5262b2e7c2c2e593c9f141af6565a5596547c1770e19e2422ea36
-EBUILD ppx_stable_witness-0.16.0.ebuild 590 BLAKE2B fe03767221857bef15d4d5df9047674360118d593e762d7de23da8b8d3b87ef74cb65e2fc415b1ff86bcf0cefd0de927d1f516454096c414a3410e9414d2a4ac SHA512 6d361a81ca5d72199f942e0d33e342405681e8ee74a388bc7c1bef802207b431bbe9316e3dd726f5d6add194995f22fc3b37d72b80387c5220981d108a547d81
+EBUILD ppx_stable_witness-0.16.0.ebuild 586 BLAKE2B c2d69def3e487fe272cc793e715a96e61260c5c3df251e25324e10264a02cea358ef864aba8d224b57c58a74f79650f6145da6d774d343ae1a158ea1cf600f1a SHA512 1afd02ab9a8cf41a1502d7594adc8d1f167a4dbd84221387c9f781fb22c148d4ea993b770a07f6ec5789daee70ef71944fed812811efab4a07edcff66a20f1d7
 MISC metadata.xml 327 BLAKE2B 9662914fb58ef24f4e1c4cd64f9dc281bdd76f1c63a37f14e2d5908266d485faa8be9dd70c560971083bc64fd4de6320770d932edc1d9e7666dd7541c24f0e88 SHA512 ce44243ecbd26eed538e909accecc114d7e7de77ebdaabe55ac4183eeed386fa7ec546274c298a018ac4b5c4b0da366ec7b45c4cb3b66e4a959c50c3e8929ed3
diff --git a/dev-ml/ppx_stable_witness/ppx_stable_witness-0.16.0.ebuild b/dev-ml/ppx_stable_witness/ppx_stable_witness-0.16.0.ebuild
index 17af7b1d4285..6b4479460f14 100644
--- a/dev-ml/ppx_stable_witness/ppx_stable_witness-0.16.0.ebuild
+++ b/dev-ml/ppx_stable_witness/ppx_stable_witness-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/janestreet/ppx_stable_witness/archive/v${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/ppx_string/Manifest b/dev-ml/ppx_string/Manifest
index ac7f96d06da7..42065de8dd3f 100644
--- a/dev-ml/ppx_string/Manifest
+++ b/dev-ml/ppx_string/Manifest
@@ -3,5 +3,5 @@ DIST ppx_string-0.15.0.tar.gz 6071 BLAKE2B 06e4761732db5aa5ee0214c68ac8ff95a85a3
 DIST ppx_string-0.16.0.tar.gz 6105 BLAKE2B a23f81846562accd1bed9df7bc491a8b9c94751f8432fc0909106d0dc0160ed848ce5181e67e34273b05a627ef3ada6770c98eafac8d1c790272eaa8d77d9ac5 SHA512 b1310551e1548fee5b99e64635139189139791f2ea2da93a4751b04c78a5519c5f3833c515d93a25e9d7aa23945414cbe690e5cd3f34630cdca4819c3d8ec1bc
 EBUILD ppx_string-0.14.1.ebuild 675 BLAKE2B 9695ec5c36068ab29ba12283604fb9607354940da97d00a5cb5f889e8f4b2521a88d1d41f48b702d7010eb35d12ccd75ea12bf7a37e8391180180c176a891352 SHA512 e412b9a1a39fc8ae807ad422c1c32928388d6ad57b30126f5ed00c18e337421ed10b9e03f02adb58118d8b70a815049cafa90f49f3f0830ba567cf26f96a222b
 EBUILD ppx_string-0.15.0-r1.ebuild 537 BLAKE2B faa533b7dd2f5143d41698855f540983343f16aa3c8fd3ae72266c253268b6712723adbe9dc0960df4d876dc700a6d1c27696f4b219159c136692e44f569c3f0 SHA512 bc1c1c1158ee86109c10867a8cfa5b4601db93c9520fb16d81420ce87ffa324a3211d7585d4b6807bce73fc8c835b73509e7c41f72a756318eac4ddb613dcde6
-EBUILD ppx_string-0.16.0.ebuild 565 BLAKE2B 1a1a2e37ce073e08102d87b81de5aa4b464885d10218c78619d8d8707f7507206d4c84356994946c1ff760a9ac1b8193220e202d78069ebb60c1f2e4a8932a9a SHA512 03c919e43f13c4c8f8d7b44f47cd1845a25e14d6abd3c955f7126034565de768ccd84eab314e70f19dc60aeba492098bb191ac503e4c647e67aa4e9c6a1eaa20
+EBUILD ppx_string-0.16.0.ebuild 561 BLAKE2B af4c9145c7bd34854ecc8d3388e2d9456fdaa62df48a17d1d77848beae7a38ada2fddb7825b61b0b69e32ec4cbb35a2a88edca72fa6e51cca02bba6d45582df3 SHA512 56c8eece51ade4ba3e2cb2f44662875f8d61910b2d58b046bcfa412e9ac36e781c68667bfed8da152e175ca593538a438865e4b988addea5c28c2b1997656fb1
 MISC metadata.xml 319 BLAKE2B 8a769162af0e87b61d20b39a0b057ca142b1b00c605fa43bb46004cd7d6e98930346fbf343c80175c718e53534c754132e3ab4cb15bea2f0923a27951353ce71 SHA512 cfea4e3d764daf3617923f7bd5d2262f9315177d7ee0a0aacaf693fa1067e1f2a27f4176f3905bcff1535ef0c9e93bfc5e3a6dfe364cfaf774177e6cdc9aa8ae
diff --git a/dev-ml/ppx_string/ppx_string-0.16.0.ebuild b/dev-ml/ppx_string/ppx_string-0.16.0.ebuild
index 88f540a39a54..672443b37d2b 100644
--- a/dev-ml/ppx_string/ppx_string-0.16.0.ebuild
+++ b/dev-ml/ppx_string/ppx_string-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_string/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_tydi/Manifest b/dev-ml/ppx_tydi/Manifest
index 5f11d558abfc..217a2f40f995 100644
--- a/dev-ml/ppx_tydi/Manifest
+++ b/dev-ml/ppx_tydi/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_tydi-0.16.0.tar.gz 4583 BLAKE2B b0390da844dacdbe0492dcf9141ae4356ed8b08af328b51a8f6bd7190b58dd4590606f2375338ce5f799ed140b4652e400c5e68ea2dee8a939a464fe9d681513 SHA512 83e72699901af6dfb786f1f0a381f4a2eec6c5d51c98ec2ab76f0f107d87da7c406278a9e71c09fc7a43b8cd19cd97f87f3ba7adea2efe55fb882cd65b81d60b
-EBUILD ppx_tydi-0.16.0.ebuild 548 BLAKE2B f95ac469d9500b507b0c629f0f64fe4b3619d801e4a25d75baa31f743760d2985dcaba0482e82bd42e37494c2bac45bf0ca7f59b8f7447916ee52d4791057929 SHA512 319e2bc2b86d49ae501400676236da5722ebc8301894e7f18330d9497cdaeacfa93553d0b3fc0e06013090d37ad7005dd8ba6f047a62c79ecb3f32d065f52111
+EBUILD ppx_tydi-0.16.0.ebuild 544 BLAKE2B 5b18a0db2a61d074dc7ac775f0b8a41c42e1b79b28e9757d254fb4fc4681a9ca01525000f7375134e1fe74053933433959e5d657fe27166f024cf3072b02472a SHA512 7fed90e9e662ebbe7c538c27efa1fab92128cb4391b9fe51bee58e31e23c0c2cf7dddb1c3bbc5684dc0a283f4b0931fb35ff713040737fc6b3d62153090c0405
 MISC metadata.xml 317 BLAKE2B bd48a90743a10aaa29983000229f110c8fc645726305eb1264e38c296cdfb5e88977919d27df10012074ccc6a42b3f182cce2b6b5f1b4cda265a0ec7118d34ef SHA512 00dce33034a79ce1f4386b21f00f480f97818f7319d760def1cc05927f3fc893b5a590465928fcf94a43e3d1a139026b7a8b09111e94422cf85a2958fb3ac8a9
diff --git a/dev-ml/ppx_tydi/ppx_tydi-0.16.0.ebuild b/dev-ml/ppx_tydi/ppx_tydi-0.16.0.ebuild
index 0ff29936db4c..cfc5475772da 100644
--- a/dev-ml/ppx_tydi/ppx_tydi-0.16.0.ebuild
+++ b/dev-ml/ppx_tydi/ppx_tydi-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_typerep_conv/Manifest b/dev-ml/ppx_typerep_conv/Manifest
index 40d8e3a59fc2..2c7a048bbef4 100644
--- a/dev-ml/ppx_typerep_conv/Manifest
+++ b/dev-ml/ppx_typerep_conv/Manifest
@@ -5,5 +5,5 @@ DIST ppx_typerep_conv-0.16.0.tar.gz 9421 BLAKE2B dbef20e205e550ab4ef16cf0e53bb47
 EBUILD ppx_typerep_conv-0.14.1-r1.ebuild 673 BLAKE2B f5941755ad27b1e2fab3022501133d2660f712f8de6e459dc954fbf35d83ea702683779effd0125058d01df00f6bd4b221c7a20862489ea55b06cf17645e1c51 SHA512 757c2973bdedde54f43148b9bab8f06e22747333079e69dff4b6714742517cf13ee93fe5cf7984960c28facd6427d54fcd27f5653371d0e72b0f7c16dab7575e
 EBUILD ppx_typerep_conv-0.14.2.ebuild 655 BLAKE2B 296353eb65f47d1c5d568b0128d900870203566787f0bea0e696922814bf5fdfa682242547b48a98b0ce5ebfe63d95ce04b0efcb3ec54f4f4232f79a49fce89a SHA512 cf516d4bbe3e9406a9744e68182b3e77c5886a3c5d3918919a52d1c692d07593f4f80d27ecc9da430b0a732c6efde77551dd91ed7ee8efc089c4679c9aa03cbc
 EBUILD ppx_typerep_conv-0.15.0.ebuild 559 BLAKE2B de584c20372003253e5b52a774941268bb7820ddae5116e487ff92630bd646c416d5cfd7165d6677755ce896de7de060a856229970bd104e21b3a318bbaa742c SHA512 1bc19eef3ab2e98ebdcc3effe33c82c627af02d8183567b7b7eacb76a8a7d25fc302410a2504f8a946b92acd4346e8151ca95c67ff742e19e86586b362d0249a
-EBUILD ppx_typerep_conv-0.16.0.ebuild 587 BLAKE2B c67bce2a6566f765ad65cbaa2132c0306faf83dfc80c8ec1ca55e4f968d42e924dfe85c6cc68287f237d6bf090cee90d3054f4db674ac6e0a46bd788baa4cb43 SHA512 01e5033d13c90f088b88d9e09d465f57a54391d55854a46ef53b6d274021f8f7dcdb35cde9a665239cf9aa5affa015be2164bf6353978f27070c42473874a854
+EBUILD ppx_typerep_conv-0.16.0.ebuild 583 BLAKE2B ea49024dc64e505152b21d760fed2961ab66db282789bf56bc4c97031b1d3d73279e0c6ed5256d8cd9744439e194a22295634b54bbe3f065f7943e0e34bcf9a4 SHA512 96ff2ab4d6b3a4967d2d12566105d6998f3357c41cabcaa55ac1121b1163d8ede84b351a4eeb6681ac09616cc5a28c6d3039a7d07075d0e605b9ab252b68d468
 MISC metadata.xml 325 BLAKE2B cfef8265f93a712703491ff4f8e4314b3b6b2be68d5c58605d511d907e7ed8fb1a8b80f07c565e1bfd00cb2fa2198266a7e7983b03a3e0338c01a1b26700e700 SHA512 5949305bf942a0e3f6e82bbd647ab3329ea5bf7e37efeea69de228f7d23761a291a6654c07849c55e3bb34373c590b944f686b01f1f5ba31be8acabc7abb0bfe
diff --git a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.16.0.ebuild b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.16.0.ebuild
index 2810a82752c1..45c8faefe479 100644
--- a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.16.0.ebuild
+++ b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_variants_conv/Manifest b/dev-ml/ppx_variants_conv/Manifest
index 8d6648130d71..cf98a88d28aa 100644
--- a/dev-ml/ppx_variants_conv/Manifest
+++ b/dev-ml/ppx_variants_conv/Manifest
@@ -7,5 +7,5 @@ EBUILD ppx_variants_conv-0.14.1-r2.ebuild 758 BLAKE2B 5ebf81aa63cba68579023bb9e5
 EBUILD ppx_variants_conv-0.14.1.ebuild 705 BLAKE2B a29dacf99ac6b51fa4a2f419c4c8e259b4dabed9319b1c1e3bf9d54c57213850b8c692acb2bb6fa03b4607e77559b759ff9432ee6be89b4dbff5f6185fa988c8 SHA512 e64875030ec7e7948d52c5508972c4f604b490b0559bff06ed742cbfa07e90f19effc71a8ce61bc234de4ca57fccd5d760c6e7c8dbeab74e36e37cc1e3811c94
 EBUILD ppx_variants_conv-0.14.2-r1.ebuild 692 BLAKE2B 10b77e795cce83c20a0fc7072a25bc38a27ec91dc3c330d2c35395f29e0367a62cc79c8f2932ea6af98319f91ecbc2f03c5c3468db94c8144626f18a439a11a5 SHA512 fd498d576f831ba09f16cef1f0684b65d8881c618a97128c8252cbd4f7e09da67e321b51a7773e1babcdefff2a7563b29ace9bfecf0fe20c4a0380aa004a17d8
 EBUILD ppx_variants_conv-0.15.0.ebuild 591 BLAKE2B a268ea9b42805cb10c76f9a4e7d486e7c630bf44436825694c863a4ae63d3fddca8786a2a7cd3c1042dc92dd9c6b9b186e142213a0a4e579b356a31fcf7bc6af SHA512 c43e282246d3c892f28b67ed14fb73603460ce20c81ea1b9933f66c04edc097b2e2c701ddce5a7820de96beb30ce75a602828e2c6b6d354ba7e62b74a7dce116
-EBUILD ppx_variants_conv-0.16.0.ebuild 619 BLAKE2B 701c74dea4b0766f64c607f7bd1ecff0abaac5b62518dc3dee66913b20c6304ef081837fde3d4725f2b7c68ae06fc8974fcfc52a93d0186ca2f3f97dd6129a11 SHA512 7ad523f6dfdf2a26987921035d60abe16a81c3d86e917958a0bc33fb817bc3a013e3a55e69192649d8990db3c16ed5e23af64b66755c068eebbc2b8d32c42c9f
+EBUILD ppx_variants_conv-0.16.0.ebuild 615 BLAKE2B 6ca147cb65adfcf3002d200fdb228337a8bc32e9c40e930b5d6c89eb4142798c5a3540f0164b6d76d9a8c574155213eb10ab237b36aac5787e13419095c5af75 SHA512 a530cc44dd1fd3365cbd91083aa980f9e1dd65450c0bbfbcfce70db6e0b6e9651d082a012f81fd34c4c80d548faafbe4a98598b9fe79f196a74aad096912608c
 MISC metadata.xml 326 BLAKE2B 240758c3dbd8524f7466ed62dac5306b1cbd80c45f4ccf31a6645443b00db0e1893b368c844a6fdbf6a09ff20116cf6e2ea3484ce651143c0d6c7ec17c399b81 SHA512 6988bd8c2e31a9294d1768e9dd86ce0468fd44f0e956a2b1f34d7a2574b7fbdae9485d8780b323d3e746bebbe3cda8d840ba15e7c1ce6b70af0c7fc58051f072
diff --git a/dev-ml/ppx_variants_conv/ppx_variants_conv-0.16.0.ebuild b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.16.0.ebuild
index 5966431ee5a2..935f0f74b07e 100644
--- a/dev-ml/ppx_variants_conv/ppx_variants_conv-0.16.0.ebuild
+++ b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/protocol_version_header/Manifest b/dev-ml/protocol_version_header/Manifest
index eed2d9d6be23..b8def4bac072 100644
--- a/dev-ml/protocol_version_header/Manifest
+++ b/dev-ml/protocol_version_header/Manifest
@@ -3,5 +3,5 @@ DIST protocol_version_header-0.15.0.tar.gz 7704 BLAKE2B 208254706a2d8ae9f77a9c9c
 DIST protocol_version_header-0.16.0.tar.gz 9189 BLAKE2B d61ebb49e15d47e76fc01911a6c9e5fcacb05bbee39cc5e40557c8882226edb8d2b78eed0c23a14e9241961511412f44f5522d146851ee0e3ace85b9f1b20838 SHA512 ac11dd81f4afb47ad670919e2b3ea49a7e05d193e45369f145711b2266fc54c8eea180cba285effecdc2a59e1cff65c59acd182fa3d88191e9813855dea370c7
 EBUILD protocol_version_header-0.14.0.ebuild 473 BLAKE2B eafc19470e9b6ffb5dabc7fd01336ec4efb94889b87943e6016977a5951ef9bba447b89b868a68d806ce9cf4dd94843de07a70bc655e3a77fb84ae0efaa546e4 SHA512 9259ad472c822cddd09f352e821de17fc412ea302ff2d8c5e152e28778dace239615021cc3838f833f60426aeed6f61ed71803f816c27ffd66016adf8a9abd71
 EBUILD protocol_version_header-0.15.0.ebuild 491 BLAKE2B 31e0356de62e02675241ff3cf935eb91d5866120b165caf3ccb1dfbb0f86d04355cf585ce801cccfc63cead8e8b4d82ef4a8b0563b76b6a0f5e622cc7200bf28 SHA512 e9833e4c0e0d8aaf193a0a97e6e357f1818afdc87805c8119c994c8bbb7fa9ace9e490f5e16cd069dde0700afbcd7df1f58ae8d22d6141f85a4f6f5fa7f5b5d5
-EBUILD protocol_version_header-0.16.0.ebuild 546 BLAKE2B b66a8835d386c6aada5256719c06ae9b8d31308ade5e3ea5807830cf32818feb46c2ff537e6b22ccf854b92267802b436e1d3f77fc9c8560428a7f7102cacaf0 SHA512 21009927a37de2f54e69f28ba44321d235a00de556b99b02fbe699ceef59daf3c9fc3ce26156757c8e3d8538d5560a72bcd05babdca6d361af6b074b365efc19
+EBUILD protocol_version_header-0.16.0.ebuild 542 BLAKE2B 43cd124eab5d0029113158a165b3fdc0bf86a14c423dcd7abfeb9dfd600caad618df8aa105e6a50226f9eca565a97ce1cf144d357269a3dfd4d599cb12991fbe SHA512 d45ed5ff68c6d95226c663b1fdf9e17dc14f9f61f622b21f134478d410e678538257bd5be0848dbe5dd5553018d6b2277b8c4672faabb29df8f367c6d3670d74
 MISC metadata.xml 342 BLAKE2B a7b48596216aa424b7230cd1fce7d24599e3699e832c8a79f01a9d93d806b136c908a20457e2fa5409f26ead689b3ea040b2f5568735c4344b77fd0eda3c7608 SHA512 1d69289bb0d37de7a0e778f5eafaa459c2a29faca5096e13b87c0ece8dea6fc388a785e8b69814c01646f59f07ed43db807eb55783104600aff82fea7ce1eea5
diff --git a/dev-ml/protocol_version_header/protocol_version_header-0.16.0.ebuild b/dev-ml/protocol_version_header/protocol_version_header-0.16.0.ebuild
index abfa5a73185b..a5c19a6cd54d 100644
--- a/dev-ml/protocol_version_header/protocol_version_header-0.16.0.ebuild
+++ b/dev-ml/protocol_version_header/protocol_version_header-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/sexplib/Manifest b/dev-ml/sexplib/Manifest
index d69d5eea382f..9cf17f15bb98 100644
--- a/dev-ml/sexplib/Manifest
+++ b/dev-ml/sexplib/Manifest
@@ -3,5 +3,5 @@ DIST sexplib-0.15.1.tar.gz 55000 BLAKE2B 8f93590ad1cf5fc8286a3a99711d977d36e875e
 DIST sexplib-0.16.0.tar.gz 55015 BLAKE2B 3d4157cfc0e5906a351c0a04380582895544f95c9ad88e576764967c46614c0553b606064eab75a8561c59a9fcb353ae695f743e0eda1a61a4c66a57b24f51e3 SHA512 f924d92ddf11f12be51073a3dfca45486d90b05533f29804518ee86b93386b8ff8d7e692c71d77b11347b78e9f6f6dcf7d79b71540efe54b013fa09b3bab414a
 EBUILD sexplib-0.14.0-r1.ebuild 610 BLAKE2B 7cf36d737be73681ee103eaca7d9f3ee7ca405ed99e6cba8a4b39053bb54fb01f733b1e2d0b6c3abdb569dd74b81cf431251e607cb10aa6c376b638182c565ed SHA512 7d5a603cea8737727374fe04ec4c4cef436c23ee6bce3bbb21b2df30235732881e0492e4e3188094058be12747d7e8d8cdb97b9a00142939ca1316dc4c3540e4
 EBUILD sexplib-0.15.1-r2.ebuild 622 BLAKE2B e01bd46b5be4d7648652a01af86b88346ed3e0cf8a62dec16d233e7eb6d9ec5c8d9756cf5f661d73853169862cfe14bdb1f7904a277f8c56e243206a2c93fbb4 SHA512 0408cdc6ee8db39cfec2de4c8903ee81b7255a1eee25a0f70a0a969575d3c4d92435774bad92d3a9ade646c47e801ffe013570e0c2ea267901f0a637860065cf
-EBUILD sexplib-0.16.0-r1.ebuild 629 BLAKE2B 7180479a03856cb7ca5a5850ff51d6966b70f907365e2438a9926b174a0ef3e3bdeed2ddea9f2a5f2069b3f9a99a090184e077ecac61645e8b36745e75cc5528 SHA512 5feef99854a045c02f22c484a3de20789e37a4dc8378402f213acd01d404d31fb1f29893dfd71146187239fce9185f1cee93f850e59c253e7b4651f4b7c87c47
+EBUILD sexplib-0.16.0-r1.ebuild 625 BLAKE2B 68d4a59cb11b0823208465c55f04d467edd44b96ad6ddd03182175444bfa336b6c9e6e5e0bebbae6223986ee33873df03a0a4ccc179e74e756b57bbf5d835f8a SHA512 b509f3bbe1217820089d5bf8d0992b582645be4411ff678b6d558e09e38a56a60b27d665a0ab5f040b398bb2c9460fb9fb90191cfbbe615d7fe444b3aafcadf3
 MISC metadata.xml 377 BLAKE2B ff9de38ca0c9fb9c2cde8f1154d0bb687a77578e74bee5851ef2f56b3c3589720b45a57af10921b88e02ff33e7f3aa1a5fddf5af95fc798eb379a8e3d5f8eb84 SHA512 65cca9602a8ba45d944ad29b2a9564ca4d5f031fb2b37944518f2ccc6323d1538ea163c1f790151ad0f524cd343318c198247f56e183c3dd63832d80bced16f2
diff --git a/dev-ml/sexplib/sexplib-0.16.0-r1.ebuild b/dev-ml/sexplib/sexplib-0.16.0-r1.ebuild
index c8f4857f46ed..9e2a0f07bb12 100644
--- a/dev-ml/sexplib/sexplib-0.16.0-r1.ebuild
+++ b/dev-ml/sexplib/sexplib-0.16.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/sexplib/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/sexplib0/Manifest b/dev-ml/sexplib0/Manifest
index 054555fb6591..1e96fa946231 100644
--- a/dev-ml/sexplib0/Manifest
+++ b/dev-ml/sexplib0/Manifest
@@ -5,5 +5,5 @@ DIST sexplib0-0.16.0.tar.gz 22171 BLAKE2B a280ce73278acd4c16a5f063ef90a7406edec0
 EBUILD sexplib0-0.14.0.ebuild 455 BLAKE2B 5760d5f430d84eab8049fc4f0ca7419e70ccbdcd6a7438f41264913b651edfff2b7dd6aee33ed6974ec1d54a9f2bf915e6eab2d9d18c36a5851461f99dc719ce SHA512 97d43640f86a62a6b304c5f36706d831e4ee5d9cdcfbcd402581ee8a7ff130e1bdf73165f82ac95f2bd82f1048d5661b39342911fd4cc084bd67ca660a37f039
 EBUILD sexplib0-0.15.0-r2.ebuild 460 BLAKE2B 3fe35afc0eb118bddd871fd59d67d36c83e0e10b59de6e6f607a872be712b0da1e47b09f6f3a09c8f57d90f65e6581dd5e7646a6d371ab5568f5b11844d6767c SHA512 fe1402826025c65eaba821ee075b13329f0e0e0d8aefb3a984893f45d4fe6b9a1b108fc4ba249506e5b41b652e7ddef0db14894483f9dd175b2b0b37184cabe8
 EBUILD sexplib0-0.15.1-r1.ebuild 456 BLAKE2B 78affd477ee8d0d59dcb142b7a71f079686af6902aed1bc5fbcb6aeb11125ffcb15245a4fe99e5d531933e1cefe8d9cddbb9d02973413470100fdf37d8b72d5d SHA512 986217acb121025641b69190a9832373254a39e66bd47fa6032ca4a17592d7a2e338bc28cee5da98e3ae898cf735f82f84f2843ae936d3cc7a8dc375186500e6
-EBUILD sexplib0-0.16.0.ebuild 461 BLAKE2B c053ebf0c7c443023fb6ccca597a0e7eed926ed8717a0df7c4e6a58d73fd9059fecf0a317451b9e2e464e7414edc8a9a2d51186aa5a7fe7c8824c20feaaae84a SHA512 b8d1a85a7cc63f0c4098be41a9856a1cacb88707a1b8f0e12da5219ba9bd0c8b0ce19b32284a4dd58f96742782c453e448a2781f45f5820cc96bb3b42d4a4f66
+EBUILD sexplib0-0.16.0.ebuild 457 BLAKE2B d1a897e9d87dca58fb999b62eff82031425556751caab9eaa71984767fed34fd83a1e3f2a87f51598c2569b9f59576d916c5241483d4d1c248c2e58d046c371f SHA512 b74c11e6f3eac1d6271f0e1949041691e8b74c4f4acd4a908c164ed37bca9ffc85799c754bf8dfabb152147d1e5730230f848cf0ee13c084b9816138307152b1
 MISC metadata.xml 317 BLAKE2B 86967cedfe93a25621cf87096708aa5ec5c842bb502cac40f3d2bf1d3388e44b54bed673c7b7570dc0a22178493ea27e1c6303b9c973c46fdc9cc7ab687b9436 SHA512 9b76c0680ff0776a20613497e3eba8f8af66694f78f9933e03c99156fff44fac055bc7f0c2fc4ec8a08ccd88da7fe632e9e9d5e60b1b0196477bf1e62d928cc1
diff --git a/dev-ml/sexplib0/sexplib0-0.16.0.ebuild b/dev-ml/sexplib0/sexplib0-0.16.0.ebuild
index ccee44d06d08..ef6cc9c71fce 100644
--- a/dev-ml/sexplib0/sexplib0-0.16.0.ebuild
+++ b/dev-ml/sexplib0/sexplib0-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,5 +12,5 @@ SRC_URI="https://github.com/janestreet/sexplib0/archive/v${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
diff --git a/dev-ml/splittable_random/Manifest b/dev-ml/splittable_random/Manifest
index 4cbbe9a2f22b..31aaa51e8457 100644
--- a/dev-ml/splittable_random/Manifest
+++ b/dev-ml/splittable_random/Manifest
@@ -3,5 +3,5 @@ DIST splittable_random-0.15.0.tar.gz 9945 BLAKE2B 66083ed6dba1acad98570431497074
 DIST splittable_random-0.16.0.tar.gz 9978 BLAKE2B 55c351cd36fc7f41a3abcdad1ca81bd8da67e8d0eadb8d28306e42de9990cfb00b8c7812e7a15c3ffb447c9180347395e403de38740344baf54e48760fbc9f91 SHA512 eeb58de6cf8ee6fda61997ad06e9a3d807eb4e296320b2fcb17bf2ce41dc9ca4dc75ff1caf257dcbb94bd6f205ea2f9b1e2d91a42cf4ee34964ba91f8a0bebd3
 EBUILD splittable_random-0.14.0.ebuild 576 BLAKE2B c18fc964ac2aadf565ba34938336707a84cc3502ba6e974a0e4a5ba13573b46e0e9047f8b4ff208e9e0d903fa41c0b4c9b19fcb00a1255e3b5fa09460a63f332 SHA512 e808883cf057d86cd19a872f7e5843f9b434e8d6e20956087200812b2bacbd4d0dfcc8963b39ec000f027919a231ffecfc95b7fe4e25c9e0559fc2cc0fc75d04
 EBUILD splittable_random-0.15.0.ebuild 535 BLAKE2B a40408634868349d1d2550f76cbb326d86773136671237cc82d6602c46441f354287f67c937d8f901d4120e9efb574fd27e6a85f6143cef87ba27fde589786fb SHA512 5aa0d43b048d5be222c1d3dec1d5e22d0e4796c22e8ba3c230285b654b20113fb6f8a93c013195a6e50c8c4709cbebcb01871d627ad186970d8a78c87a0d550a
-EBUILD splittable_random-0.16.0.ebuild 704 BLAKE2B 8678acffddc0505c240c4db16dc6bb0d62f952f7d197f1eebf8d94edb3a01d9871417b55abf1d216af1fd2101ad7b6d526b3bf0db0e239e553fa76eeaff20fa3 SHA512 a4bee1e414c63c828782dfafcf78d114f7769af64f8ad75ba55171556108ffb82a4e97cb38820c54df11e1413568c2be89a38e8e940a0d9c00a6b9ea41a8bbb4
+EBUILD splittable_random-0.16.0.ebuild 700 BLAKE2B 1652f555cdf1b568e84a8f64706fce8666527307ebe28f296636b39094b4b63b7fa570ebaaeb2993ed6ce08e168408f126fe88bafc5e9eb0395ea83325f58b54 SHA512 6852d2b4a1c0a5f46dc29592a0872cfee021be22da67c1f099a5544877dfaf148181c27483389d999efa7622f8437beec9659ce4376adb096f2f758262fd3a62
 MISC metadata.xml 326 BLAKE2B 7c21633dd73c00cffa4400b23dbc01773f2d87b26918b63cc753b1ee75576045856de0bf376cef245c3fdbc21b7e15d2d7fbbc563e09f4430fb464a7fc359d3b SHA512 42d481d793a9bc0bc1b156f1277d8d452db37178ba6a0e4921ee56b07a0eec17441f8c2356e5095bd73ddc89fa0e6ff722cf62b12079322e35bacb2ad798db40
diff --git a/dev-ml/splittable_random/splittable_random-0.16.0.ebuild b/dev-ml/splittable_random/splittable_random-0.16.0.ebuild
index 4e4c7a4d1db0..5f6b4fd2e2f0 100644
--- a/dev-ml/splittable_random/splittable_random-0.16.0.ebuild
+++ b/dev-ml/splittable_random/splittable_random-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/stdio/Manifest b/dev-ml/stdio/Manifest
index 3717ca6342b9..08dd925d773e 100644
--- a/dev-ml/stdio/Manifest
+++ b/dev-ml/stdio/Manifest
@@ -3,5 +3,5 @@ DIST stdio-0.15.0.tar.gz 7811 BLAKE2B 8343c6b4c42be64514efc31d59d17522d7b33dc840
 DIST stdio-0.16.0.tar.gz 7836 BLAKE2B 05f1d26d9d67996d6221ef1f1c8053afb4c53efbc8b9c75c83b72a4ca18e255d0df540461ad85e6bb0cbe8458bd09bf0029b3983ae498f91c1ae7cf9c85535d2 SHA512 fab88e4a869a88566e0f7143bec45db9572f40dc0e9528b6993edc75fbbdace46593912386c417b317daaa1fd07d4212a4e40e5afae0e682b61f4093b423f3a8
 EBUILD stdio-0.14.0-r2.ebuild 460 BLAKE2B 5c7546d6cafa1a9034ef0ebad667509ec5724495c145b1c23f1c211db0ef7d0e53d956b4cd41cd67a9a2e194308ee7559862966c7f8d6c7451d96ecee33d8fbb SHA512 b7dfeaab1c06fbca00e61489e6deba2041952041ec689e98d7c52af7d9e4a9fe29981219edde20815e1ba95118cb6f06b0641b2c4875d9652e9867a9e1cf2325
 EBUILD stdio-0.15.0-r1.ebuild 464 BLAKE2B 07e3d33ae3a8414f4edcaed0d92b4355893c99671adc4678df6ccf977c3ba191e2c7bf622d0071506413d30f3df0fe24adb56ca77d622942c13a57dca5d69839 SHA512 65e63dfd4917684bdfa4a090d8bd8eac8bf76946248249789ccc9fb03b3292aa01a5de0815a7aa5e819b1812a9642108272430a5965aea802a7fe3990e54b77f
-EBUILD stdio-0.16.0.ebuild 495 BLAKE2B 78388464bd9bcad039311711b25ecdb561b372ba47280a836bdbb74a90649e5e9074cd0c4ed59dafa94bbc4d469452d0ca89fee2c3645e5c1abe338d4c6f24c4 SHA512 32aaac23125244b177b7e7b3d4d4566d2123a842d06be8455bc02191355c5fc1172dbb793d3157ec9bab4767957a954aa9f29c53753b793da82d2cddd9fe822e
+EBUILD stdio-0.16.0.ebuild 491 BLAKE2B cc6e8ed9742ab74ca4fdd9301bc086466b2a26b29e928b46c84ed58b133e2593f145416ab248ec469c84ab01750bbb47968dc48b9bb5e1cf94d9e53a6b59cff5 SHA512 2f8b7ea9bc422ea689bc0520648c2216033ec4d520834b7c0154368b60df86a2a375c89bb305ac8908b535c87a3e67570d9feb7247fb1edcdf04a7b15e28def8
 MISC metadata.xml 314 BLAKE2B 5a109afc6ee14c452d0856f22ea628259a7aa3af1a59d6bed0ee030c111dd8b66c42e470291f7d4dc5ba572a88899b4b421c37c5441ce436c43b4648918e4c56 SHA512 5ee20bc8646784521adef283a94a64cbc3854e4c0955dd7955aa1ae0c7b82c08f487b617ca06b7bc22efc1f6bcd8132634c6dcc4533b041c7c751a9ddf91ab44
diff --git a/dev-ml/stdio/stdio-0.16.0.ebuild b/dev-ml/stdio/stdio-0.16.0.ebuild
index 171197bf5c82..f0559d20b9e9 100644
--- a/dev-ml/stdio/stdio-0.16.0.ebuild
+++ b/dev-ml/stdio/stdio-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/stdio/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/time_now/Manifest b/dev-ml/time_now/Manifest
index f845974a81c1..7106cb6ab756 100644
--- a/dev-ml/time_now/Manifest
+++ b/dev-ml/time_now/Manifest
@@ -3,5 +3,5 @@ DIST time_now-0.15.0.tar.gz 3697 BLAKE2B 142e848aa17f3cd14ef9d90a758f21b2ae3881e
 DIST time_now-0.16.0.tar.gz 3729 BLAKE2B df7569be37f608bd3f466dc8da96357d42c7bf48f299dd90543222213bdfad7e40f89f368e7dd5e0c2ee53f2b59d43650bd3006ade9bdfde1261cda26d4c306c SHA512 59c380bc89ac5185e344ef051180270bad62ccc7ad60aec4279aba5f71bae8dae6ac29136a6ca85ad7b24e204615fd84cd7db0901b6550de490e8992301c0ac2
 EBUILD time_now-0.14.0.ebuild 534 BLAKE2B 71f087ce034042b12702611cda29d0855dfe37fc6e930d878e234024fee2f1cb4403e1a79cb55906de792e86eb4bdccc4cb84194e1704b4bff86c2ae36623b92 SHA512 49d77414540a8d367036a162a5de2861f6ccae244e9b6474cd228672d03066d03d7a37ce7afc4ecbfbdac90d7a24d86abe45b6a8640f4157371dd36cf5762d4d
 EBUILD time_now-0.15.0.ebuild 552 BLAKE2B 9138bd774e4329f650fd4bba736890840c92807afd0bdad198d443a9ee64b1ebf7b057af21ea7d52f354ee0c58eff68570550175f1a444e6735061e0a04522f0 SHA512 5ebdee81c82b4cccc939bf66036032a01b8fe8f5aa68badfa50652b52bfef529e4f26cc0db44cb255d64024bdaf391aedbf9ed95fb97fd91c891bd3177364d2f
-EBUILD time_now-0.16.0.ebuild 660 BLAKE2B f820897fb10f840f6eaee790173a2d4635c7dc81cc9ae6474ea85f3d950b8c547a4514adc22220d446d97725b63138b6e0e623d4b4d194a37bbc4d84a54f03cd SHA512 2a2a7f13c01994cf4df255c6d67e45875c20ff463fbf3bcf419f077a6f13f71ed2c904fcb4632e1e768183cf5683ba91c9e1085cbb2972d6a50a9618722e5ba4
+EBUILD time_now-0.16.0.ebuild 656 BLAKE2B 6ce50fbedb96130568ddc3a7c688a0ad28c8483c1839cb9ad0118e7b5c5032db2ad73b825381d2fe90c48409df72b965d8ab37ccfbca5ff3f53accd7de8b8857 SHA512 333b3480dc5efa48d597de78003bf77ceb009c4ec563c72a952e8db322e8eae929416f9e2b3bf2c681a016be08fdad3ba91889f9264c6275bf7728eabdcd9403
 MISC metadata.xml 317 BLAKE2B 54d5dd3dfe8c633ca9c384c2030d0d786f53e89edefe10125c2db4251125b1c25933bbeb107193ace089167ec1a33fb7b6541be3819f32a71bde30d26bdb6074 SHA512 bc148cdf93b72f5bcf86453417fb55f9097223bf7f602482d4c6473331be1566d13422f1d2bed9a7c583f2e2c39c40ff213875a485a4b0f4b0e31711b01ecb7d
diff --git a/dev-ml/time_now/time_now-0.16.0.ebuild b/dev-ml/time_now/time_now-0.16.0.ebuild
index 18c454106009..92761d2a291c 100644
--- a/dev-ml/time_now/time_now-0.16.0.ebuild
+++ b/dev-ml/time_now/time_now-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/typerep/Manifest b/dev-ml/typerep/Manifest
index e38d4dccefc6..ee3fc02b5011 100644
--- a/dev-ml/typerep/Manifest
+++ b/dev-ml/typerep/Manifest
@@ -3,5 +3,5 @@ DIST typerep-0.15.0.tar.gz 22737 BLAKE2B f94587cd3b4bb9efb117c1ce228663fe91ad115
 DIST typerep-0.16.0.tar.gz 23002 BLAKE2B d0ec7176b8354a2734b13317f2084eaac154a46567f2286ed33702908afcbe7ceeacbf15cc6fe6fb03ceae4f975d32ff4eeaafe05477abbf11849a0a70e61dd9 SHA512 1a93552b3ba83d0b1fee155a083cf929949089372dc21419a62a0f3ef0ea0171b6294833e3ff06cc718e2cfd761072f1c835f5026a17bb3fb17a0dfc7a23718e
 EBUILD typerep-0.14.0.ebuild 479 BLAKE2B efbf5219d78d3854764470687f4489ff5ffeb0d7c06d41373acf356c92fac981e3572878e02c2cef1e1daa58caf6c56cc8ffa029553f1fc4affbaa6a43872e29 SHA512 86e107cdb761bcc042132e27dd3ebbe960429c7587fac9c067acd9a7b3dd5664fc8896fc34429a2c589c1156f1773058c10658d4171c0aeb0ab9a62d45148f12
 EBUILD typerep-0.15.0.ebuild 494 BLAKE2B 6888131fb6cf7e7eaa7b4b26ee23f49b6627983583dd40fe3b71cc28a15d271ad8c2a17d07107a8666db6332a99c7aa614488df384d164779f12d165f00c5785 SHA512 ba825c815630e7ec15b14f98b2cd921a64bd8dd3ea73f00fed546b48ece5b269e3eb15422275769e2a5dce59131c263939ec6158e43426f52998f42456c80400
-EBUILD typerep-0.16.0.ebuild 499 BLAKE2B bc0a954d0fb3a7c492f23dfe6ca926331f90ff61ea8a190dc53d14f21085bd363207a16f5cf5cd561df0c185fdcee05fcab4598c89efd0e3feb94c3cef1ad6a3 SHA512 8fda3e34a62cca2fe1f874f5ad6644eafc89646789d9c9e4260e03525e11489f4aa6de7c3371d9d2fcef7ff4052acb2098bbe88371d310c8e8f6d5a261fcc63d
+EBUILD typerep-0.16.0.ebuild 495 BLAKE2B ce4506a9a19eedf68ece10c18b000fb5fd9a579b22bcc6ce35c2fdfd8e52958127422ed5b0f1eac92db5e67fa575532e4d452648b360f2b8659625faa22d77f7 SHA512 8f082d049bc0154a8914b3d3f19f5a407ad24bce6c50853d9374c8abdb36ab752109f3e906d1a5aa456d748514abfe0becefa67c7dc05e5344f2bb227df17e5c
 MISC metadata.xml 316 BLAKE2B 52c8e9305438751e99ca3df54e49896a80d206885090142ea0d219b6184cf0ccbabaf95e0ce7bc1dc06ba397c33e87bdc4ef9c9f4db47bcc0d14472df967a8df SHA512 9063d1b227f10e42ebfe37ea4c2040ceac27afe7e2f972a7d0aa0b3461e9966450c7e82ad6ea297cd7a2813996e9fd275e8e297d75340550b4284a548da3d39c
diff --git a/dev-ml/typerep/typerep-0.16.0.ebuild b/dev-ml/typerep/typerep-0.16.0.ebuild
index 173c15d4dba0..2d2a3b1b966e 100644
--- a/dev-ml/typerep/typerep-0.16.0.ebuild
+++ b/dev-ml/typerep/typerep-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="dev-ml/base:${SLOT}"
diff --git a/dev-ml/uunf/Manifest b/dev-ml/uunf/Manifest
index 19abaa2bf3eb..e62c35fd9ae8 100644
--- a/dev-ml/uunf/Manifest
+++ b/dev-ml/uunf/Manifest
@@ -1,5 +1,5 @@
 DIST uunf-15.0.0.tbz 42418 BLAKE2B add1dda2f6af07ccaec26d9715eddf31dc398f0cdae85eec0297bcbcd9f5e23f59846813d96e554d88b18096c9419490265c061bf5835a4b67daacf3938c2876 SHA512 204d923d4e8d910318180c15087fe53d98d8ec0a8d3c3f6c54219e5e09ee5c5bdf57585e5570d895f8d90647c4eeaa45d9e6e75d58edeb9febee053e0dd47fbc
 DIST uunf-15.1.0.tbz 43837 BLAKE2B 1af584fd25f1a1c0f15ba999ab11f155c607fdb54b208094d5586a274b54a823dab94a655ae0d80f6f75b90e1ef42d36295dc03dfb82d4c91fd9b6230689cb11 SHA512 1df1edbcb37da80e6d96eedd5e01c43c81275eca727a53d91a777d01f30cf0b964968c7be1d943e574e40ad4acb75c86e42976b3048dacb2c798b38475d0a6d0
 EBUILD uunf-15.0.0.ebuild 642 BLAKE2B 9c470eafceb3673aa6c48ffc8fd525b35d1938b18e00d18c30f495c1dfc8a3f8a675b85263e2caa88bedc83efe09e9db2f70929c06ea37d756cae284f7b8a764 SHA512 7ebf6145adc0c15a60ed5d23af57be16e61567e35de5f1b07e46125dd87a6848357279c0b203b8ab6eb5aab79271d63618b579f3e411377568e5af50911ac72f
-EBUILD uunf-15.1.0.ebuild 710 BLAKE2B 571b4d6e01f32d7c1163a2cb6459f709f95ffaae90d8d0db362bd7649c4455d3a7a6bf3d42f6e03be90e507c57f1304e679f9dac3b4723182e17f53f2e9cdd2a SHA512 1bb5b93df036e2cfbfeb3ceb8ccda8d2a4bf4ae3182378dbe36237a45043e9e74bbf35de44562003e9a29b68eaab3a06744cbb09e808a6d3b0b6ccdecfe2c299
+EBUILD uunf-15.1.0-r1.ebuild 718 BLAKE2B bd6d8ac7ca5f1e6434ddd08caac9105977218c1915a5bdc4ba41d44cd0ac88195fa6a3fce5c05bb7bf7d6ae2ac0b34cfe16a77ea4d231cd2689439f8281fe9d1 SHA512 7011841cca9f67d9a402cbde2a5a129474b569a491fe56140ce2e55883746d3b2c6c7d3f519b348fe98082caa92d6dcdbe454a9b808537c2d761de83885eb595
 MISC metadata.xml 311 BLAKE2B aac48b9d1bd548674249d1bf7e6bffde917939ee8a30a9975871db0ae1ac6b3649286ac2ac5f63f767d489b41894a4e02155ce77a890a06e4ad9b981edeb7af2 SHA512 acbee992f129174ff16ec565e878627096346afc0b99c4b2a2f56efb7932b069e8bbc7d8918c180ebe4753593848deb5f956a2cacdf54445529b6b68f7d238f1
diff --git a/dev-ml/uunf/uunf-15.1.0.ebuild b/dev-ml/uunf/uunf-15.1.0-r1.ebuild
index 60ec54b1ba24..fcbb6d3d29fa 100644
--- a/dev-ml/uunf/uunf-15.1.0.ebuild
+++ b/dev-ml/uunf/uunf-15.1.0-r1.ebuild
@@ -12,12 +12,12 @@ SRC_URI="https://erratique.ch/software/uunf/releases/${P}.tbz"
 LICENSE="ISC"
 SLOT="0/${PV}"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 DEPEND="
+	dev-ml/cmdliner:=
 	dev-ml/topkg:=
+	dev-ml/uchar:=
 	dev-ml/uutf:=
-	dev-ml/cmdliner:=
 "
 RDEPEND="
 	${DEPEND}
diff --git a/dev-ml/variantslib/Manifest b/dev-ml/variantslib/Manifest
index 72bffb3024da..54d5c02f8a3b 100644
--- a/dev-ml/variantslib/Manifest
+++ b/dev-ml/variantslib/Manifest
@@ -3,5 +3,5 @@ DIST variantslib-0.15.0.tar.gz 2948 BLAKE2B a85fea8d994a8488b1aa6a64826bacc4b2d3
 DIST variantslib-0.16.0.tar.gz 2982 BLAKE2B 201c96a87391930292df170e7fc6d6e113e8cb652e20acc341dad4a3608849ec60827497905efdbfa8cd86d783681236ddbc3ef73e67d019a244c13802073af4 SHA512 c20cedbf6599b66028d77a5ce0d54a8fa1d2b8302344a434f9714ebd4714b159df143966bc480852e8ac54b44bd59f66646ba614419ea7cffa6710228e7a6fd6
 EBUILD variantslib-0.14.0.ebuild 465 BLAKE2B 63a7f3a58c77b39c4a41e9c9f76cf2a24a3c8262e3e3115bb2fb3772fbf29e74d4f073783b27c513f69ded831b2339d521c669e6a57ca853959f022cfc0076a4 SHA512 632e849314d8a8deb5dd4ed6b220c27da80cd4d6d34e29e14e1a4ec2515c05b0b5633f4f22ad994ec55dae776af5bbcbc0ae0bd112b44bad52ded7fa15150c9f
 EBUILD variantslib-0.15.0.ebuild 477 BLAKE2B e9b2847b34e764b3acc6e9b5ffbe658fe61a7423be2e8c6685436565f2393bd3fe66edcf2ca00d8d2ac534eedceb47a6159c6730e6c9fea1b6eeead397db0735 SHA512 404d27a6b9a273f5d8300fba205d291049c42c1b9d162fc3514d4ca16c3a1bb3a53e49be3e76ea48795fc61f2ccf0941a789d007ee46e00923ac197c9bd826a6
-EBUILD variantslib-0.16.0.ebuild 508 BLAKE2B a68ac367bae0e101bcc6d583c45f5c9f8d1b98149990769d7b90973fa8b19487c2b255fbadaf583cf37461e27f9b4c405e8baf59012fb020265bedc3212d1f52 SHA512 91e36ddf339b738b8c54c017ff1bd0f25fbe85adbf9e322b70b28188197f5f9870d81d818ff0a27bcf5411d8c6579d6c6ec9188a02b0d4d597ec59e01c62964a
+EBUILD variantslib-0.16.0.ebuild 504 BLAKE2B 1fc0dc3f30638adda8a739cbe84f301ee391d951e9075f5d99a01e2b18a097f39f5acb9e6f0fec64e0f215175069fe5f2db9e97bd6a2ed93034fc85d1bb9b6f2 SHA512 9036d10e03afd988f62a83a1e75072b9475895a351d9553c9a81e13a664d80be3d39aae473857f9c273c6742332d6f17539659f2e5d53c600d383a6f04f6849e
 MISC metadata.xml 381 BLAKE2B eefe97fbd5997b21e8516ec811d13f57af17eefc6aff30163dd2c8979c400a8a02419ea8e522581fbda5c58e69083591827c1b2af931fb360e52b741840cc231 SHA512 afe98872494d630e0e1f6a53a244eb694643c350329ed9e62e5c9818c03c3434edd8c0d017c1d4be5d1d44f737c76cee81ebc1db8da62dc63c11effdfc2d4b33
diff --git a/dev-ml/variantslib/variantslib-0.16.0.ebuild b/dev-ml/variantslib/variantslib-0.16.0.ebuild
index febadbdff6ae..f60daa665715 100644
--- a/dev-ml/variantslib/variantslib-0.16.0.ebuild
+++ b/dev-ml/variantslib/variantslib-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 770fceb7ccd8..4bd754120d8f 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/autobox/Manifest b/dev-perl/autobox/Manifest
index 7b933dec9896..2f52f4a6606d 100644
--- a/dev-perl/autobox/Manifest
+++ b/dev-perl/autobox/Manifest
@@ -1,3 +1,4 @@
 DIST autobox-v3.0.1.tar.gz 87047 BLAKE2B d83aff0e68eae40297081d6213290e80b62f2a318627d2490b0cb6e66e94c7efbcc7b984211474393926d8f281f1afc838f605489175a5ccd4ab6432735d165c SHA512 401d5e87e15cf26362a88e5d23d8c9e842b951c03ac7010da2317af5ea897fa1fe2e4862cc5c691f25851fd5ba5398935c27f6d9f87fbc2fe52bb68a25d3d3a0
 EBUILD autobox-3.0.1-r1.ebuild 580 BLAKE2B fac81ff2f8c2c0d3d22a0c61d97d541e2fe64dbe6d661c200f8edfeb24d73075cf8261c7ee9cafd4cdce0324e4bd830745cfbff9986a24a6f44a431a278e27cf SHA512 dc91f979bef61806bb2947ffb4f4156f83623d3354cd7eb8a3cd81e1bd00612dce50e496a08c4c5a42d6edcb894353e14845c104a88cdbd30ac60010fd51e104
+EBUILD autobox-3.0.1-r2.ebuild 468 BLAKE2B 62666a9bc7c08dce4974ecc21aa49857b0d2daf4e43858e26d77c023585925f0a83f59e56528c7bb395057e7f1bda25c86167f3f20052fead7a97ad8d74ab65d SHA512 0eb4e2d740e16dba283a1acbb9a25a7fefec543dd4a9ceb5ff2d372515b777580bad57347bd253717ef1a6ceaa321825ba9d0b756deb70ae8498cfc761282b88
 MISC metadata.xml 451 BLAKE2B 543aea380961d3b28758b12cb96ccf71dcef1d38593fa6acd4197e0439616df87b57acbb9b4e57b8a2fd17b6f29ad26ca848377db6165283be0ba66d7746f9a5 SHA512 a422d3a9eb825898a9bead5c3bb49c281269bf793bc1a803fe4d252394475b7c2402e47ee6895a9d53fa29d355d01b94918cb5c3505cf3314c1f0f2797464e82
diff --git a/dev-perl/autobox/autobox-3.0.1-r2.ebuild b/dev-perl/autobox/autobox-3.0.1-r2.ebuild
new file mode 100644
index 000000000000..c00cc9bc40cb
--- /dev/null
+++ b/dev-perl/autobox/autobox-3.0.1-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CHOCOLATE
+DIST_VERSION=v3.0.1
+inherit perl-module
+
+DESCRIPTION="Call methods on native types"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-perl/Scope-Guard-0.210.0
+	>=virtual/perl-version-0.770.0
+"
+BDEPEND="
+	${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=dev-perl/IPC-System-Simple-1.250.0
+		>=dev-perl/Test-Fatal-0.14.0
+	)
+"
diff --git a/dev-perl/autovivification/Manifest b/dev-perl/autovivification/Manifest
index 09d05f2ad63e..9f3fb8f17493 100644
--- a/dev-perl/autovivification/Manifest
+++ b/dev-perl/autovivification/Manifest
@@ -1,3 +1,4 @@
 DIST autovivification-0.18.tar.gz 55854 BLAKE2B 3f429ca462b685c4b02de265b7bdc5e3ccc9a2fcfd7a182834252a1a46a8e173657613c4e1391df8c9139f9b0716c10c25767d419343275b8e64b37aaef78cad SHA512 f5058bf1672a53281d70431cbb2bdd1a37dda8dc3d4191ca3c68c469089c5a1f2a36522f2a0b5d19847d91296f43e49cf6296c87b78940e786f0d0ac106a539e
 EBUILD autovivification-0.180.0-r1.ebuild 588 BLAKE2B 33b09acfa6991af69399bae10a5e80fce2f7a0f60febe15d21832fb531d63675b8c0ba649c4860516b61e45d45edf6575798470cab3eaed91b5ce2c0e02d6890 SHA512 8b4ebf811b8d4654e3ab0badcede223856144fdd4fe6b35b57f2758449332d54728685b6e0169300c4c002c376f1d7a12ee7d8444b2e327715658061c4cf9376
+EBUILD autovivification-0.180.0-r2.ebuild 476 BLAKE2B fc0a451c6ec97e56dd24d6c42e75790281cd30ab6e3029081fd0e7e20ceedac733a71022afd74a096511c67205fae9e16e66ab0bc65a10daf6ce1b943fed4e9a SHA512 25fcbfcb8b52f9b0c17b27b6a12c200e376cc34368d9c7d1b407b2eb766b5ecb08d3d1d9943966f48fda3cd1a0d53efcbc6ad173a70916c0c137a14ba0c31ed0
 MISC metadata.xml 357 BLAKE2B 9ed9b4f9d12b94921019519ee4959dc86cc7849d870f57ac8fee5f47dde7eb70f5affd2ce1c090f9b353c1ecbeff7faace6b5d8b51ecfba01fa86b392c62efc3 SHA512 5aeead68116aee7b39643e626983fa46f8cc986c803cbb4b2f05f270a33182dbf4bf7ba72c087bd20bcd49c1dc7d01deb2958cb6ffbc2038a451c4e5ea6a57ea
diff --git a/dev-perl/autovivification/autovivification-0.180.0-r2.ebuild b/dev-perl/autovivification/autovivification-0.180.0-r2.ebuild
new file mode 100644
index 000000000000..c2f844af6a30
--- /dev/null
+++ b/dev-perl/autovivification/autovivification-0.180.0-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=VPIT
+DIST_VERSION=0.18
+DIST_EXAMPLES=("samples/*")
+inherit perl-module
+
+DESCRIPTION="Lexically disable autovivification"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="virtual/perl-XSLoader"
+BDEPEND="
+	${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Exporter
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/bareword-filehandles/Manifest b/dev-perl/bareword-filehandles/Manifest
index 56bf871bafaf..44cf2419c333 100644
--- a/dev-perl/bareword-filehandles/Manifest
+++ b/dev-perl/bareword-filehandles/Manifest
@@ -1,3 +1,4 @@
 DIST bareword-filehandles-0.007.tar.gz 73269 BLAKE2B 7c16a8b68601c09d5d8a1fc616363efccd9c1b6da64de5ad8cca1ae961ec6eaf8c8575ec650b0de2725de1ee9ff02817fc4a2882d3800cdd2b4842ce30a62001 SHA512 e7bd4e2ce32b819086050d1619806a5ffedb08732a25a8786dc70f6c8bea3cb3dab2bcced2d5f02f8248ca816dcccdaa2a20c6c943dc5667f334e9e319dbee6d
 EBUILD bareword-filehandles-0.7.0-r1.ebuild 871 BLAKE2B ec345eee6ccab730315d072e47f6aacf63083fb099275b53db45e8ea334081c4d4b07098220363d8677648672ddc66d7984e4fdbda80230d278355844e1f6546 SHA512 da3c71e58f4557cfe80a055e16f6503c61916b16f29cfb6960979ad9819c4619e78dcbec475f2e45312bc873b9c42d1bb0118ed23f836e407782d2235431e7a7
+EBUILD bareword-filehandles-0.7.0-r2.ebuild 762 BLAKE2B aa6eeaf669a4212d562eacbffe7f3f2cc21bed45a1e05ff3110b6b77a5a8215755dd48e0655b201fd3fadd48066770b304eb62d415d988251b0f03d96387c76f SHA512 51fb7bd2e681a8a22a85745cd2e651defd6a9c88d203c05446a0573058e404ceac3d6083df24ca54af277daa291539c39e3b605f52d31e80272d1f26fdb456d7
 MISC metadata.xml 413 BLAKE2B a8d1fabcdd73a980e69913aa7a18d50cdd74788d96938f84c7b0ae8ae22345d113908930e1bbaee6b9604eae57c9da7987542c30427d449f9b9d0dfb5cefc164 SHA512 03d1d1beebedacbb0c5da41501e1dead2d94ac20d3650d42331927f28019ab2167282d57717d9aaeadb23aa8560f17a521e77646f914ff844b0689c2e3173132
diff --git a/dev-perl/bareword-filehandles/bareword-filehandles-0.7.0-r2.ebuild b/dev-perl/bareword-filehandles/bareword-filehandles-0.7.0-r2.ebuild
new file mode 100644
index 000000000000..7ae8c75427c6
--- /dev/null
+++ b/dev-perl/bareword-filehandles/bareword-filehandles-0.7.0-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ILMARI
+DIST_VERSION=0.007
+inherit perl-module
+
+DESCRIPTION="Disables bareword filehandles"
+
+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 ~x64-solaris"
+
+# Lexical::SealRequireHints only required with Perl < 5.12
+# We could add alternation here, but it would be work without benefit
+# which would complicate stabilization
+RDEPEND="
+	dev-perl/B-Hooks-OP-Check
+	virtual/perl-if
+	virtual/perl-XSLoader
+"
+BDEPEND="
+	${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	dev-perl/ExtUtils-Depends
+	test? ( >=virtual/perl-Test-Simple-0.880.0 )
+"
diff --git a/dev-perl/forks/Manifest b/dev-perl/forks/Manifest
index 2a51a344d914..3ead44642028 100644
--- a/dev-perl/forks/Manifest
+++ b/dev-perl/forks/Manifest
@@ -1,3 +1,4 @@
 DIST forks-0.36.tar.gz 111143 BLAKE2B 8f3c443bb5912bd952d853f5cc291bf90f6d2503d7b467e009b267e7db1bc802b2895397439f151c7474a8c4bb1e236829bdd8acf868c4d575f648d8219df96b SHA512 d361d7fcfec925b03552bb5f8ae4eb2155b7945d0a57ff04c9ed45e7620a55fe6a1907b1aef8af3f80f8eabc158ab5886628ee1a987dc674e4c25e1042425469
 EBUILD forks-0.360.0-r2.ebuild 809 BLAKE2B ab8b478d9a503258ab67bffa3f0dbd7fcc39ac0741b1eebde2e77a6a4005caa9a1145bb3b266b585193b90682b278a45c56d6ef2ec1d1c53880c94e8424fb640 SHA512 13f4554ec12344c416f1a6ffb621b9de8de9faad84d1b9eb21ef5993308987f05b9764bc607a1a16649c697aa5cf08a4121bc9ce83b877cd3bb4c2cd9efe2d36
+EBUILD forks-0.360.0-r3.ebuild 694 BLAKE2B 5c61fb9b3ac60adf55b213c4b26ed1d3e2f9fc4a009c35c83af755c0188ea8a769e572ea4d261ba3b43bcab32015a1924190a63aaa4e42b9ad7a3494452320ab SHA512 b3434e64abffb3bc18db6eb30b3fe96310941822806e5060c2e262666159256d206f357d01529d496a59af1eed4eaf13cd4486b87d755811e3017020d12a492d
 MISC metadata.xml 719 BLAKE2B 5162fb352afd2d91a690b852167883493cd04738039e5bbb532a18833b6a4834d0a95e01e8a1ed28348b57492195809bc24d328e6f2defe9b77b974ef9869988 SHA512 ca6d2923411da7a3b5887010b97d6b774148e3bb17f6fe79f7caab82dfa33e9ba43dd0b7a9f26f6df61476e8074ff60b4fb9281c3de16517a938284146fd5ccf
diff --git a/dev-perl/forks/forks-0.360.0-r3.ebuild b/dev-perl/forks/forks-0.360.0-r3.ebuild
new file mode 100644
index 000000000000..3ac82830d7d3
--- /dev/null
+++ b/dev-perl/forks/forks-0.360.0-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RYBSKEJ
+DIST_VERSION=0.36
+inherit perl-module
+
+DESCRIPTION="Emulate threads with fork"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="
+	dev-perl/Acme-Damn
+	virtual/perl-Attribute-Handlers
+	dev-perl/Devel-Symdump
+	virtual/perl-File-Spec
+	>=virtual/perl-IO-1.180.0
+	>=dev-perl/List-MoreUtils-0.150.0
+	>=virtual/perl-Scalar-List-Utils-1.110.0
+	virtual/perl-Storable
+	>=dev-perl/Sys-SigAction-0.110.0
+	virtual/perl-Time-HiRes
+	virtual/perl-if
+"
+BDEPEND="
+	${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+
+PERL_RM_FILES=(
+	t/forks99.t
+)
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 1c22cb25b721..8bb7e2ed4481 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/nagiosplugin/Manifest b/dev-python/nagiosplugin/Manifest
index 5d84289064b4..2be166bc42ee 100644
--- a/dev-python/nagiosplugin/Manifest
+++ b/dev-python/nagiosplugin/Manifest
@@ -1,3 +1,3 @@
 DIST nagiosplugin-1.3.3.tar.gz 3119586 BLAKE2B e1aecd6f69fc7afe5cbba259191d2ae540efa513ea8f61a263a453ac2b1f6a5d91bbb209d01fc83c72080b54540f7661c04b3485b5cc6c1f9aab44ee2e8fba67 SHA512 edff09b689fd767b9c8ee2ffab30fc63cb740234c830f2f8fef5054e5bc44e945c69858e2374257433b758fb33943a8b148c023a8fde75edbc188da7424a00b6
-EBUILD nagiosplugin-1.3.3.ebuild 551 BLAKE2B ae2925d6bf02c456ff55c5beb4cc5b01c0ef18b7ddb13819ce1e463d7b15bf4cb6c978d2f995533a6f1fc437a5d5fe6288181ddb03036487fa55e8d894e6a436 SHA512 527b4f419b2cf345df2a86c1a443a95fbb3c7358d4e4df8d3fba8d6e553d4a1330cc20bf06e8a92f31064b53d960263f7ff812230fdf1097791128d5548459d4
+EBUILD nagiosplugin-1.3.3.ebuild 558 BLAKE2B f4ae2480f364d5d2f6fdbd5cdc53072c02277823815cdae7f6e832605aa38998bdfb7263b33e833f2369a56b1bd158e08c4000e2d4265b0b369241e9745def62 SHA512 1176d49b5028c284afb3c5187191c204383080606cdf6e69391c7dde9a61bbb1198b3d48cfa9a798c302be3acb3bce9b50d9053caf1f67485497152852680155
 MISC metadata.xml 554 BLAKE2B f2be163e7fbd5d95a502293d86a506387f0101fa2d68f7d257e4a95a8a40c8ba37df415f598ff5eef3529da03fe1e2597e67fa74dbe1e46783889648cbfa6cf4 SHA512 53935c83a9edc9be4a8a692196087c243a74804d84bdc1857b9c1bb9e99c253401a0c9a9239deab5b27fdd2e236a424e69a5bf54110f8e0bda675eb702b30c16
diff --git a/dev-python/nagiosplugin/nagiosplugin-1.3.3.ebuild b/dev-python/nagiosplugin/nagiosplugin-1.3.3.ebuild
index f077fa77391f..8a199be49f45 100644
--- a/dev-python/nagiosplugin/nagiosplugin-1.3.3.ebuild
+++ b/dev-python/nagiosplugin/nagiosplugin-1.3.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 
 inherit distutils-r1 pypi
 
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx doc dev-python/sphinx-rtd-theme
diff --git a/dev-python/nose2/Manifest b/dev-python/nose2/Manifest
index 1ce04b6a3b63..b0ee25b84031 100644
--- a/dev-python/nose2/Manifest
+++ b/dev-python/nose2/Manifest
@@ -1,5 +1,7 @@
 DIST nose2-0.14.2.tar.gz 167874 BLAKE2B b2d1d1d026de10e9d73a312205b0562c377775016b8adea0b64213cb32930e9a58823021fa970f23e8acd79d2ea2a3df1f294732fcb2f96c454a2345f65091db SHA512 728d6c3f1c037630b6b3a4fc3012a488d91dfdcef5fe1d1f6473b317f71ac6ba16a33d33721de7422caec019eac00137e95190eb2c98edd67c4c5f7f8ee09440
 DIST nose2-0.15.0.tar.gz 168825 BLAKE2B fc61b1be549cc725a05825cc801b23fa3055b13f745f63c5a1929b87724691001cf743248cb9606b6ae11b32090b99de0e583dac175141a6a6c9e5efb5a16099 SHA512 e0c1287aec4092fba55814bca8f5ac867d2ac0f9c9da15d6eb955007050b7e4beb2f211d049acc4dce9fa9990bc42468d01f2945cc358127295b60f9a5f998a6
+DIST nose2-0.15.1.tar.gz 169809 BLAKE2B a3ae7c3036fc50851f8cc47df3c5677a1d2333a664802aa03af16c2f600366b5b51b2f6ad6c0953977edf3d63b7e5ac593f2f1ce26382256a6b81680cba7e39b SHA512 118b1144369b72c6af4153b866d19253b31cb019407f8c4b9f80461b105be8851be7b6524a822da8ddca039f733510b5e5d7871608195d0fb8d7be9de1938762
 EBUILD nose2-0.14.2.ebuild 658 BLAKE2B b41c0a780d9345f7e2ad56a38ba7e737d05b10479434341ac1efe5071adc58d10ce8a7f5669a942c81fd57b46cc57f10d13e87337375066e13d4cdce1435babf SHA512 9c391df6f9aac614a26d52e704c462109808e9ddb36e2098914278a0d63a11e44a47fc6eb76868eade8f3dfce76f91a16ae66550ff44c57f10eb3006f6ca4267
 EBUILD nose2-0.15.0.ebuild 663 BLAKE2B c23e64d461d0647b0c0ec20012cd79088a19e950ece0ce42f681eacf33f2e9af48af067f36607b97ff6948e8ff129d44662f7fc8950ce1d5ad9f8109a1697f25 SHA512 fe8a6627875d37a319ce29c6e31a1e6c343031a2a9b1ec9cebba07c5306bc15cc809056d74376f38f7e8c975e561c70c25c3ba989ce4e831f5560293af6fa0ba
+EBUILD nose2-0.15.1.ebuild 663 BLAKE2B c23e64d461d0647b0c0ec20012cd79088a19e950ece0ce42f681eacf33f2e9af48af067f36607b97ff6948e8ff129d44662f7fc8950ce1d5ad9f8109a1697f25 SHA512 fe8a6627875d37a319ce29c6e31a1e6c343031a2a9b1ec9cebba07c5306bc15cc809056d74376f38f7e8c975e561c70c25c3ba989ce4e831f5560293af6fa0ba
 MISC metadata.xml 313 BLAKE2B 6723fb509a4391fe826f0adf0de0d3cf12013c07c4090f7dc258a7be6c3903f1cdeef469712b3db285edf7680ee30b1808c8e71f433d8c0e69853912996e1ec2 SHA512 7140c75549a66cede53b1d5e54451565f5b84a8ef00843e6f1ef8737b8f103fac8a66e96e8039b2bee32e65d0f07e12e5f9c27fbe72c334eb4f37998f5e51654
diff --git a/dev-python/nose2/nose2-0.15.1.ebuild b/dev-python/nose2/nose2-0.15.1.ebuild
new file mode 100644
index 000000000000..5aa2066d832e
--- /dev/null
+++ b/dev-python/nose2/nose2-0.15.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Unittest with plugins"
+HOMEPAGE="
+	https://github.com/nose-devs/nose2/
+	https://pypi.org/project/nose2/
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/coverage-4.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme \
+	dev-python/sphinx-issues
+
+python_test() {
+	"${EPYTHON}" -m nose2.__main__ -vv || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/patatt/Manifest b/dev-python/patatt/Manifest
index d1c8b89acda9..5fb37f1b4fac 100644
--- a/dev-python/patatt/Manifest
+++ b/dev-python/patatt/Manifest
@@ -1,3 +1,5 @@
 DIST patatt-0.6.2.tar.gz 34852 BLAKE2B 2dceb179dcb96d33f7ed3bfcdd96b69520cd413ee79bed4ecd09c6385b46a9b0c32fedf74d582d1aa7fb7aeb5d4e212a96c139b62a8ae155933271d7a2d8b493 SHA512 53140c71818fd0f101a0628b770e557a3c177cd0e7207d5933eb9e73b296dd870e9bb2ff9e77fd0b25652d937d98bb07a1413e555d466f3d108c01ddfdb06f3a
+DIST patatt-0.6.3.tar.gz 34827 BLAKE2B ff9ac8bf9fd6c8b950bac1a97a57e5d413a579e004d690d17d6a1dff107f284e1abc51e649b14ff148c5cbb0816838c66bd3e33313deb2d1d05d18da174bc843 SHA512 c8947f5d2351a06f544e88aa334294f28b6cfb51302009dd6f462579b98f154e7d6e49197b49e2545e93d6b8339bd72408e79a998d934ebde42dda44c4c4cbf8
 EBUILD patatt-0.6.2.ebuild 445 BLAKE2B 7c5e568c2c8c57fe5bffd9d86018fd0280c00acaccf766e2d852982bb252cce32d7cdffc315f6ac9cdd7dfd24a0fa78935d67bf661775a4dec8ae4357599b79b SHA512 e6e0250fd68bea21dd4a4a1d986f0d02f55aa55737f72f6914ec87d10ad8587887fc89589016029825acd4843dff40aa22eab1e24b51f81e4a00056ae42f393a
+EBUILD patatt-0.6.3.ebuild 446 BLAKE2B 34e838ec44c232731e870893b6ee41a047b8325b30d52b3ac7da64ab680c1ba2b5f0ccd0be2d8b987c2e8429476d1124ebcc3afe9a925de91354abf6c55279fb SHA512 f87dfd83a0a27d8817121fb5aad22de0ef892a2832956edc216aada00c93c75e8dff3d058d6585ebcad5596c7f9cbf14381c9553c7cfc7a54926fc8b0c43a384
 MISC metadata.xml 320 BLAKE2B 3fd31b71da563854a59f507b7ccba9d226adeb03aa805b24041d2de01d348ed708076965869d098851ba70a59cf3b09ebb8852360797b8138a1fe84c2f0e3d56 SHA512 b00b0d84ca5f7f2d676ae5fc9668b7a5c69a164d089a4d52da803df4329ae70634e2299ef1946f40ab42df8ce3c865c0ea45545e69f543621057bcebc939c4c7
diff --git a/dev-python/patatt/patatt-0.6.3.ebuild b/dev-python/patatt/patatt-0.6.3.ebuild
new file mode 100644
index 000000000000..dc772ce9ac93
--- /dev/null
+++ b/dev-python/patatt/patatt-0.6.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A simple library to add cryptographic attestation to patches sent via email"
+HOMEPAGE="https://pypi.org/project/patatt/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="dev-python/pynacl[${PYTHON_USEDEP}]"
diff --git a/dev-python/poetry-plugin-export/Manifest b/dev-python/poetry-plugin-export/Manifest
index 91f7dcaa7f8f..bff36aefb556 100644
--- a/dev-python/poetry-plugin-export/Manifest
+++ b/dev-python/poetry-plugin-export/Manifest
@@ -1,5 +1,5 @@
 DIST poetry_plugin_export-1.7.1.tar.gz 29656 BLAKE2B 130eb35064104c3f22958816447ff674d1f5aed657ada2fe23a635de52338cb736f631b622b0641aae308d69494eb939a1ea659e33fc6227bb742ee01335ae15 SHA512 d472d8e4d6eb803587722854be912009a9bc0a8f86ee0e3ef0046f385ed59236af229109dae85198e3a205702cff86780576939e518fa797f3e5093537a0d2f1
 DIST poetry_plugin_export-1.8.0.tar.gz 29840 BLAKE2B 67748605964f90120be8a696b454497e53f9ff8c739a09930e31fef19623f05552b069a5c572a1a32a0ad68ee85e760901f61bfdf8ba35351b982863e250d4ed SHA512 90cbf0e79787611a4d78c6ce637d4087d375aa25e65489d770d13f2a769d9919d76512b3fad70073073a83fe41ec42a8925c8b27983d84458007356b3ec8409d
 EBUILD poetry-plugin-export-1.7.1.ebuild 728 BLAKE2B 5a60f8bffdf249153cc62f2436fcd20aba58ea38add2f32176162a7cb7c4ac07df1eee4623b8dc6765ae818a892d775e2ab346ee3c768d9f46b9da1bf6e485e9 SHA512 10515fcd955e3008c39edb3edd1ef2c748b4e786f874d34ba41d5854b3af79df6ac1c9877ffc0f406d250c4f7107ce49bc185063c4d60ef37e0eac2bdb881f18
-EBUILD poetry-plugin-export-1.8.0.ebuild 736 BLAKE2B 07fbe6f79a8c443a3950a9173bd783af83d8ae0f92a42e44f0d6f1049324bb56059f21045566dc42eda6ef3bae79838c3c2c18ea4a6a56fb16d254d34784df00 SHA512 555a3718c14222cd2a7db712c48c569776ba1b8cc9deceecb9eeb5602e67b12d83577f2796e1d31cdec809265962b81a9eb2546a2580a605bff68c55656be0e4
+EBUILD poetry-plugin-export-1.8.0.ebuild 736 BLAKE2B 46eca5e3606b3e450d4f12ac28236e341a8d790e21e9b1d3bd318f505dfb36c2f677f012ac133d20def25965bfff8f27786eea2925e2a456cf5c291e8431d3a7 SHA512 15fa219c17fee79da2cb4750fd409c8a30a3ee28172a4f86c7af1477c44f3a1f10015cbd2e1f786a8533f099855cd0d499c2a008552db4b8aea58775205497c2
 MISC metadata.xml 514 BLAKE2B 27e1402c90d372d44302449b8b826a66a9795227e72a6b30ccdc316ff0146bb011b8a9fca613e8675ebe13c360d4ba77b6b30a057981e552e3f5762c3af6e65b SHA512 b214726af4d39d3f9a082d4e09e88d1fc63541f18cbdc31e9ceac88aa01ff44eb52cfbfdcca0994f5fd86b905ebbf39af2b0d083f7bca085c1a52c6cab52b630
diff --git a/dev-python/poetry-plugin-export/poetry-plugin-export-1.8.0.ebuild b/dev-python/poetry-plugin-export/poetry-plugin-export-1.8.0.ebuild
index ca9a3d9df723..d81235a0f2f5 100644
--- a/dev-python/poetry-plugin-export/poetry-plugin-export-1.8.0.ebuild
+++ b/dev-python/poetry-plugin-export/poetry-plugin-export-1.8.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/poetry/Manifest b/dev-python/poetry/Manifest
index c21c843ef3c9..f3e6e2da59b8 100644
--- a/dev-python/poetry/Manifest
+++ b/dev-python/poetry/Manifest
@@ -1,5 +1,5 @@
 DIST poetry-1.8.2.tar.gz 1516966 BLAKE2B 6ca39b426a4117d0c2c3f12b9151d621d629f746e51ca77cda8d7f67ae2493ea9ecb7dd02f69cad3f346579fc3bb16b1117c0dad0a148763bb439c35eac673a5 SHA512 0151c264c2f353753ab7c5a248cdd30e60e33505fd915d841e789a37b18cc06f28b4f987144cd3dbf915e23f6947f6b17cb8fa316b34ce866b6b3559e73b8ddc
 DIST poetry-1.8.3.tar.gz 1518910 BLAKE2B 87c06f9d72c7fbe9f821d8a1de66028d64dfb06a274d67f14d49030c0d9a21f702fc9a5c35fa3a1e75d11c8db01516182f8523e9c466398b305d908e0e02d211 SHA512 72e604e246ec8426a29151caae81bf6b0495d17af519a41a7b934f8d50496dbf77605ea3f2e03bd41fb75a0c97d274987ac0359004544ea6ea19dcc118129e05
 EBUILD poetry-1.8.2.ebuild 3586 BLAKE2B 3727f85d9c15edef6e5bd8944933c1617305c04f372c02b124fdcd37fb00c378a1fd92c9b9cb8505eb37b23879f71070473c3f7df5f677d3eda1e7b95363a30b SHA512 44a8364b925e061688cae276c73ccb6a6bab38ca376111369dce042a4f1a18eb80e365af02b58ede8521bdd5fa8a2773f94a6bc0182c194f36b893cb45505298
-EBUILD poetry-1.8.3.ebuild 3477 BLAKE2B 39ebf9b1bdf4d7378179f6c503fdf3595de5cb8be4cc4bf1faaa4e804639d1874540a2598b92d09a58252e2cec03094b089041bc228ba0ef59115585b0727723 SHA512 7df357ea280c6a495c05ce6eecc2df0e50b8e7e1f864a7fbb928906761fc544cc2be54926437ae8a463e9c11db99021c91506f01a7f1fb133cb7efdfefb6e55a
+EBUILD poetry-1.8.3.ebuild 3477 BLAKE2B d637e8bea657326999cacf9e1ef980cd4a4cd233e08749f503b64e3c49c820c453a62cb4a5cf80eb7c9898a54ec8c8d7ce3fd2409fa0ebdfa2b805b8620da1ba SHA512 b9e7a7662832b34f27d99bc79ea7e05c3a702904848f165eee3f0c30cdf9fc17c73a5e65881d8daaf624f94f29940263fd04c563f7cb70fae05d9b560acd6a14
 MISC metadata.xml 486 BLAKE2B 7757afe2f964f49a04a600ec80af8511387c3a80105c9050755e1815cac148734f540e4da8c1da401c15a63bf5d0a8200ed6a5e1c09e5dacc7d39f5f59dd343f SHA512 541063e55b4dc5b927ef4ff6b385663bbf978d13ac6644c2537483ec42f211780cab4d881b159894dfe86519b4655c80bcfe17cdb90a2e033077b390a3842f46
diff --git a/dev-python/poetry/poetry-1.8.3.ebuild b/dev-python/poetry/poetry-1.8.3.ebuild
index 8576900acfe7..22ee4fbefb52 100644
--- a/dev-python/poetry/poetry-1.8.3.ebuild
+++ b/dev-python/poetry/poetry-1.8.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/pyalsa/Manifest b/dev-python/pyalsa/Manifest
index 213df73bcfd0..0de75a7c13e5 100644
--- a/dev-python/pyalsa/Manifest
+++ b/dev-python/pyalsa/Manifest
@@ -1,5 +1,7 @@
 AUX pyalsa-1.1.6-no-build-symlinks.patch 682 BLAKE2B 046f4cffa0b08a32360356d82384148b805544b6f05e44ec329bef2299b67e46c68401b800761e9dff2141b22bc029a55fd5cf01cd5cdb533303aef91a2bbe0f SHA512 fd3937df5a69326908da942a8926e10221bb85693c863cc06ca363ca8fb07761173d2b51113615970887442d8779b2e9ff468b927b078acf52620e944b71b779
+AUX pyalsa-1.2.7-python3.12.patch 1266 BLAKE2B 3d39d2eeebb9d7c6063144294e94e95d57a377737e71797cc8099e6bebcf096040cbb73ba7eeedc6e866885c954b215f119fb96beb048ba5b32df9584e562eff SHA512 110849f66b4475f6693a2b3d64914745407417a4ac7a6b85a6c9ba0fca17f78ac0b48d1f251875bbec870a4dac58261f0a50da05e9b3911e6ce6f650f85b9c48
 DIST pyalsa-1.2.7.tar.bz2 40132 BLAKE2B c100d16bd8c0d9fc6eddcda360f3582c55ed1b143a58a49caf76a62494882952d311271941ce0ecdf57ac934f3564dc922c80e8a5f5742b593341ff4215b700c SHA512 126501fe7b9c006f28e9290bdd3ad907ea9e053b71e21e2c6f0b0beeecdba07b4b557014041b03452f96be690f59f2e647e075487ee87054f21f66df7f39b34b
 EBUILD pyalsa-1.2.7-r1.ebuild 1114 BLAKE2B 390c4c7748e6f9299dcf88b81bad0eea1a6b1cfa1646e6731e47e5bf88df44fa7bef5e11f4284ac0ccf71eb2462295fdc61839aac8a9bedf25e9569f6b53e90d SHA512 ebe6ac3c970b3c93e5d73d7b44c9a8ccda793f9f9134c478bc63451eb166e7aa22d61650f868d640ab8b84d6d7dc70c2356b632d056d399939a80a85aa63aa23
+EBUILD pyalsa-1.2.7-r2.ebuild 1100 BLAKE2B e071290e274be860acf25a27258b830f858fc2df50736e7c7f310a71244f5bcb15ccb051614a1f79c09844b0e048d989630094e10af22eec4479f72da83ab394 SHA512 669da4f7f60666006c6f651ca593a95067234a7a31e507081f96397cb59ba788c052ed18e60cf307ddc27d754040dd23b1bd39af0ffaa7f7adb6fe06c4ac1225
 EBUILD pyalsa-1.2.7.ebuild 980 BLAKE2B f27d5b3de6b41fc70fb4e1764c4e02ff09190a3afd43f9f41baafccf965260b78c47d4073a67abb3917e274cc80ac8f6f91073b820c53ad2e7d8132df322ad93 SHA512 6a52512e4c9a2af5199749e894b4bc8daeefd96cf13a7ecd6ebeaaf15a5a12685bff87e986e4637e760f73ffdd1ffbcba5a89438961c4fdaf3c339be1413bd1f
 MISC metadata.xml 491 BLAKE2B b44d13fa5ffd8b1eceaedbfd6b4fa564d93b99be45dec176817a9665153988d6a91f892edab698e50d2ae761edc7ec11371fa07ef3dd6976977c7dd84f9ba9ae SHA512 bbafa414b3416db7abb27921ce74d532f4b16f145a91f46075be9abaf6cf46017e8cd17c61fa019c662fc93ff9286747822b4ec8f6d19f69857cc3221e3f9a25
diff --git a/dev-python/pyalsa/files/pyalsa-1.2.7-python3.12.patch b/dev-python/pyalsa/files/pyalsa-1.2.7-python3.12.patch
new file mode 100644
index 000000000000..f27a7714a986
--- /dev/null
+++ b/dev-python/pyalsa/files/pyalsa-1.2.7-python3.12.patch
@@ -0,0 +1,34 @@
+https://github.com/alsa-project/alsa-python/issues/9
+https://github.com/alsa-project/alsa-python/pull/10
+https://github.com/alsa-project/alsa-python/commit/cb75f5cdba0a29bdfa43eb56285da4917d2941a9
+
+From cb75f5cdba0a29bdfa43eb56285da4917d2941a9 Mon Sep 17 00:00:00 2001
+From: Francesco Ceruti <ceppofrancy@gmail.com>
+Date: Sat, 4 May 2024 22:16:16 +0200
+Subject: [PATCH] alsaseq: fix seg. fault when accessing `ConstantObject` extra
+
+Closes: https://github.com/alsa-project/alsa-python/pull/10
+Signed-off-by: Francesco Ceruti <ceppofrancy@gmail.com>
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+--- a/pyalsa/alsaseq.c
++++ b/pyalsa/alsaseq.c
+@@ -353,18 +353,11 @@ typedef struct {
+ } ConstantObject;
+ 
+ #if PY_MAJOR_VERSION < 3
+-/* PyInt is fixed size in Python 2 */
+ # define CONST_VALUE(x) PyInt_AsLong((PyObject *)x)
+-# define CONST_EXTRA(x) (&(x->extra))
+ #else
+-/* PyLong is variable size in Python 3 */
+ # define CONST_VALUE(x) PyLong_AsLong((PyObject *)x)
+-# define CONST_EXTRA(x) \
+-    ((ConstantExtraFields *)( \
+-        ((intptr_t)(&x->extra)) \
+-        + abs(Py_SIZE(&x->base)) * Py_TYPE(x)->tp_itemsize \
+-    ))
+ #endif
++# define CONST_EXTRA(x) (&(x->extra))
+ 
+ /** alsaseq.Constant type (initialized later...) */
+ static PyTypeObject ConstantType;
diff --git a/dev-python/pyalsa/pyalsa-1.2.7-r2.ebuild b/dev-python/pyalsa/pyalsa-1.2.7-r2.ebuild
new file mode 100644
index 000000000000..2632cb21b9c9
--- /dev/null
+++ b/dev-python/pyalsa/pyalsa-1.2.7-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for ALSA library"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+SRC_URI="https://www.alsa-project.org/files/pub/pyalsa/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+# Needs access to system's alsa configuration/devices
+RESTRICT="test"
+
+DEPEND="
+	media-libs/alsa-lib
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.6-no-build-symlinks.patch"
+	"${FILESDIR}/${PN}-1.2.7-python3.12.patch"
+)
+
+python_test() {
+	cd "${T}" || die
+
+	shopt -s nullglob
+	local test
+	local failed
+	for test in "${S}"/test/*.py ; do
+		${EPYTHON} "${test}" || {
+			eerror "${test} failed with ${EPYTHON}"
+			failed=1
+			break
+		}
+	done
+	shopt -u nullglob
+
+	if [[ ${failed} -eq 1 ]] ; then
+		die "${test} failed with ${EPYTHON}"
+	fi
+}
diff --git a/dev-python/pyarrow/Manifest b/dev-python/pyarrow/Manifest
index e68b3d75f15a..eaa3d6594c1a 100644
--- a/dev-python/pyarrow/Manifest
+++ b/dev-python/pyarrow/Manifest
@@ -1,5 +1,5 @@
 DIST apache-arrow-16.0.0.tar.gz 21695067 BLAKE2B aa5dfef3d8d46a53242075c165473635051d51ff28587ea8b80751232d5f75ee3ef89e0a027aa39bdc9dc03fa46ddb68e46ae2c7f40605258e47ff194f1d3979 SHA512 773f4f3eef603032c8ba0cfdc023bfd2a24bb5e41c82da354a22d7854ab153294ede1f4782cc32b27451cf1b58303f105bac61ceeb3568faea747b93e21d79e4
 DIST apache-arrow-16.1.0.tar.gz 21707079 BLAKE2B 5541c364351e59e8164f2461546bce3ddc834d70b3a03b815b681187674bdd89ccfb7eb113bf9010c821845b0c1fa51f5321bfea5b20927e6364f6452ec980d2 SHA512 28975f59e1fdde2dba4afaf4a5ba934b63db3a7f27656e2aa0af0f0d2a046c9dbfa9a6082de94629c36d03809b296566a37ea65ec5a2fc17fedac7d21e272d31
 EBUILD pyarrow-16.0.0.ebuild 2642 BLAKE2B 568e4596dfc28e0a3b5314358b283e8ae60d1d49fa4b872573e672574fa7b59a90a22008c872024a0649507e88aeb8bf62f377d9ad255d191c86d263d708f97b SHA512 108360e9c1e2782ccf8b0dc20fb140f9e1dd43087025255e89289b9d69d2e387f1b9f138fc366d447c4035e2f4e8ade6b6bfda3e1e5d81a24bbefe91c5de1fd4
-EBUILD pyarrow-16.1.0.ebuild 2643 BLAKE2B 42d5295ed4bfa79ff49e8b95f18f8415316433852f4fc9b03dd597b888a3de9c3a6a91c2cda1a8243efb97b91036103c75f5ff5aa1a3147644ce81eacf04a1da SHA512 28270f5ef5e17d81dda7701a997a688932e61f2d9e6ceb9d103db719f75456260878bd9c2ce3cc5162620563c9d0450a1ef2d8fe8c34c05769b48e981de31f8f
+EBUILD pyarrow-16.1.0.ebuild 2642 BLAKE2B 568e4596dfc28e0a3b5314358b283e8ae60d1d49fa4b872573e672574fa7b59a90a22008c872024a0649507e88aeb8bf62f377d9ad255d191c86d263d708f97b SHA512 108360e9c1e2782ccf8b0dc20fb140f9e1dd43087025255e89289b9d69d2e387f1b9f138fc366d447c4035e2f4e8ade6b6bfda3e1e5d81a24bbefe91c5de1fd4
 MISC metadata.xml 555 BLAKE2B 5683205ece2b0266e5792f42ebd515c1822563d2705f046ebcabd1de71efc67800616303b2fc83ea8cac3395303178f13e859b7390adfcef23da8d687fc8d6a3 SHA512 61d8f5bcbdbe92b858d0aab3040cd3e8dcb33ba0c45808649e032a165d6826c1a489ae2cfbf8dca52eda82d5b24b4c3f74a9abd6f87d5ff72f6578cf7535c797
diff --git a/dev-python/pyarrow/pyarrow-16.1.0.ebuild b/dev-python/pyarrow/pyarrow-16.1.0.ebuild
index 068c9a2aba85..37167ff75b2c 100644
--- a/dev-python/pyarrow/pyarrow-16.1.0.ebuild
+++ b/dev-python/pyarrow/pyarrow-16.1.0.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/apache-arrow-${PV}/python"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~loong ~riscv ~x86"
 IUSE="+parquet +snappy ssl"
 
 RDEPEND="
diff --git a/dev-python/pycountry/Manifest b/dev-python/pycountry/Manifest
index e75a5e7d27b8..f8480e4b4195 100644
--- a/dev-python/pycountry/Manifest
+++ b/dev-python/pycountry/Manifest
@@ -1,6 +1,5 @@
-AUX pycountry-22.3.5-fix-tests-for-pypy3.patch 740 BLAKE2B 192233d0307af96304a8fac1454389b81488365a1d44088b183cd3e2455ae600066e00e39a1ee68974961e5f5386967f24a495734490768f9423e21f15d259a9 SHA512 c593e382150bfea0e19446bb720e0d4f733aaf8964bf07689e8c8f238c8fe9ca2e89c957249c46cc489f9ca84540f0184659899945562e728bd35c965e2aa911
-DIST pycountry-22.3.5.tar.gz 10141551 BLAKE2B d645eade8ce9be3b99f4f2b189cc50c3395ecb3899ab9fa668066993abbfa576191cfcc05b7bb2764d088a86df492770bcc0a8834f04e6fde58a01defe8a1b14 SHA512 07dc507ee94f1880727761df197f81704386d9246163c9a5872f47083d37c7d1205dfbd28c6663ef0731a0b05277ade03a1a1929ab84087e0e85c05028c68b89
 DIST pycountry-23.12.11.tar.gz 5927399 BLAKE2B a8d32593d80a881abd03b482a99afc22996a730d911577f91eb8035336f07a25a8cd74cd19f9396675acacbab953098bf831119f8b9f7c72fc6c2807713fe6c9 SHA512 25b5a74c0dd8115473571976a64b6fed7010f62c1b3b4c1888b9e13a7cf4f533173f51d4652d55c426adee4e0ff119bb6e3132d04dce150b9d1ca4b11366c579
-EBUILD pycountry-22.3.5.ebuild 742 BLAKE2B 24e1b4cd4fa3c5ce13426e9789ce4a050383d2706b692c566d4a19df0252aa71268272320852e565e02a55ab6d674fef074b314f2e0bc19d598340c4e7b75eb6 SHA512 9effc0b629931bce29883dbdbf1973f5afc007cc94e82c0f5ad650d70e0d2f4c19782f95e30b54e4baa64cc861f3c5b52da770c3a0290cecaa639d4eaccc2f77
-EBUILD pycountry-23.12.11.ebuild 615 BLAKE2B bb8f1830c6c0efb9c92efd6bdb22d3be7ae182e8295ae86592273a7b66fd60f6283d0bf25a9f3042e07383449b3c76d402023504ed1062ec9cebd1aabf582de3 SHA512 c38609dbc1c0784e3314015efdbfc0af909641bbfbc163cfceaf19885271db1ea035e88e998a32271910ea06277f9d8564ec99b3503961a09998bc13ca434b9f
+DIST pycountry-24.6.1.tar.gz 6043910 BLAKE2B 53e5f3bb89edb95a10cc7bef3d5cef463d957b9bd80da1aea57c274f76f9fc5f4848c9ceabcf97d369343a5bc39f6b8e7fb2e80344ff29ccd5856a4de9770b3b SHA512 36d8f68b830d74259a5f9ac1c9c97c1b228b0072613229e6f579ea5af587ab1cd25f0637a2cdd1dbf2ae8225e2aa2958d25f1e6df42d577da821d85c4c49ae93
+EBUILD pycountry-23.12.11.ebuild 611 BLAKE2B 750387d940ad6461d5cd1bfe6e99c895e3408fa0cf2a7109fdcdf68a5e63c76c43898d158d31878fc6decb4a9095340db36f344ee95db2326c8e656efe5ab920 SHA512 0ec6c5b84114ecb16f624c4255c0b3ce1e2f1279f210e0e00678b86875cff0e3bde59131938dad81ce35b016c8d0205afd622e16424f5284070b8640f994d06b
+EBUILD pycountry-24.6.1.ebuild 723 BLAKE2B 528609151d654b13178810bd206bbdacbc3a0d8f89a1785c32b142ee32bda93f7753948a59604a36b9a01d839c5be6edfb2e116dfee5ef14c4fd0c46ddeb384c SHA512 e8cbb75e7aa1a007e8c5515240a9007484863dacc18d833dda49952224a63883af46941519fe8a96851c778fbbbfc7db815540b4e17ed271fe3279138feb97ca
 MISC metadata.xml 463 BLAKE2B 59f17132a93f1409b1cc14bafcab38887eedb9f66fd220c8c0696f7d1cfac3ac6005d9193f400d4f4a913343c6aa6bb8b6382012bb716af14d900f903f2c1b0d SHA512 2ed9620b00447a881a0f5311c13696105d149d72ad3b649519ba6dba93487e41cb5ac381741ed9e0388ff1780e3ba3699fea01bf1e7453daad4161a4d9ff0c9f
diff --git a/dev-python/pycountry/files/pycountry-22.3.5-fix-tests-for-pypy3.patch b/dev-python/pycountry/files/pycountry-22.3.5-fix-tests-for-pypy3.patch
deleted file mode 100644
index 2de5d0bb7630..000000000000
--- a/dev-python/pycountry/files/pycountry-22.3.5-fix-tests-for-pypy3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 57a64b69704640bd85270d886c369ef5a31eee80
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date:   Thu Sep 17 13:01:07 2020 +0200
-
-    Do not rely on CPython-specific __builtins__ for tests
-    
-    This makes test_locales pass with PyPy3.
-
-diff --git a/src/pycountry/tests/test_general.py b/src/pycountry/tests/test_general.py
-index ea697ae..ad1090f 100644
---- a/src/pycountry/tests/test_general.py
-+++ b/src/pycountry/tests/test_general.py
-@@ -149,7 +149,7 @@ def test_locales():
-     german = gettext.translation(
-         "iso3166", pycountry.LOCALES_DIR, languages=["de"])
-     german.install()
--    assert __builtins__["_"]("Germany") == "Deutschland"
-+    assert _("Germany") == "Deutschland"
- 
- 
- def test_removed_countries():
diff --git a/dev-python/pycountry/pycountry-23.12.11.ebuild b/dev-python/pycountry/pycountry-23.12.11.ebuild
index 3db3277b69db..dd397c07b70c 100644
--- a/dev-python/pycountry/pycountry-23.12.11.ebuild
+++ b/dev-python/pycountry/pycountry-23.12.11.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pycountry/pycountry-22.3.5.ebuild b/dev-python/pycountry/pycountry-24.6.1.ebuild
index e0fdeac24dc3..48fbe8ffcd2a 100644
--- a/dev-python/pycountry/pycountry-22.3.5.ebuild
+++ b/dev-python/pycountry/pycountry-24.6.1.ebuild
@@ -3,27 +3,30 @@
 
 EAPI=8
 
-DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_USE_PEP517=poetry
 PYTHON_COMPAT=( pypy3 python3_{10..12} )
 
 inherit distutils-r1 pypi
 
 DESCRIPTION="Database of countries, subdivisions, languages, currencies and script"
 HOMEPAGE="
-	https://github.com/flyingcircusio/pycountry/
+	https://github.com/pycountry/pycountry/
 	https://pypi.org/project/pycountry/
 "
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-python/importlib-metadata[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest
 
-# https://github.com/flyingcircusio/pycountry/pull/51
-PATCHES=(
-	"${FILESDIR}/pycountry-22.3.5-fix-tests-for-pypy3.patch"
-)
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -o addopts= -o required_plugins=
+}
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 64e63dc3e529..270c94e2360e 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,5 +1,7 @@
 AUX pygame-2.5.2-error.patch 3723 BLAKE2B 3a3196e5eb4fa24f7246c05f016d78a94b40d620ec3d60ad48342ffb1d5c6d90e87dcb37d42f9b4987286645c92862377a1eb314bdda86a568fb4700438123c5 SHA512 63495f55322499a80e46c284a4cda52014f071652608dcbe7c45ab164ae5c1c49588da6c8bc7e61fb63852ef2aa3ca9ab22a61431b8ae932d5f811622cc484c1
 AUX pygame-2.5.2-gcc-14.patch 1422 BLAKE2B f633ec57ac672ebe0eb0e8404f27152ed732815296f9a06439e4385e7bae4ae55f2c13f166a954c05e19e2165da82b1ec089e1e3e2befff912fbba779c4970f3 SHA512 0dee5a832cceb65fd5ab9fae8ee81c982be5eea63e02bd3a463bd1d7f1af2877bfa68d7a53659574eed926ee54dbcc3d9cbd6c63bcadd181f0ec628ea7d63b0c
+AUX pygame-2.5.2-numpy-2.patch 5216 BLAKE2B 3fbafbbd16b0f2d82c640bc5f86658d00a27631d7b1b80d1576ab300d78047d9f82e836754507d7b3f08692430f76117c3e0e00b7d60e58ae125c4cba31f2911 SHA512 a80f12490d900ad5f8da17fb1e5b6decbcd09df609ff3ff8b40fa0dd828f63a430ca16b836e8dfa82890e7bd3e6c2baf7991a16303e65dbf38d010ff21129ae7
 DIST pygame-2.5.2.gh.tar.gz 5970857 BLAKE2B 523874926a8fd868f5674ed2997a44decb928fcfe246d551249ed7320a0e908ce46d00f459d187726edf74a4c1038cd56821f6466559fb7d24aa75d16769cbfe SHA512 b54e9b80951c8a9e75666621aafc26874c6dbdab27330146f7217346c76be5627a5464a0102a5968eca0dbd7cced4b2143cd2ff1b6227e3e17e5634854b27f19
 EBUILD pygame-2.5.2-r2.ebuild 2309 BLAKE2B c7e5a39aa5d59a947d51894b6968368199a5ba2618b337efaf7c565320ba3056e82c3d203c7b7a20cba9047afcfa32ced71504c9f010618fe40de7db14da816d SHA512 73c27c978a6eefab8405cc7360331e24739369b4661048f1c3df36d02ea6f3857c4939f0d798ab127a6ccabf9bbd8bdde5276efa46223892b52879174af6dc62
+EBUILD pygame-2.5.2-r3.ebuild 2488 BLAKE2B d2a9fabc517af93be11bf41ef023ffa3b5cf6905c8c1d7b1538d7b13c12b821390b631106d8cdcd7f1b34a273e87944233879381ce9b76d3b0222ab0b6cfe9e6 SHA512 80002e9ea6ac2a2b2765796e2fd73c1e85f98274a7a79c407b9e65ae532698f362ab28765ff7d86e881dd892c99aa3c9623051de215d466af3f1bb7efd9a4f3d
 MISC metadata.xml 363 BLAKE2B a942b91aded22ec850a7b075703ce4037af9f0a61155717ac455f7d2b7779cb6f5f953b2ad8d61d7cc5254307951a20dd3edb9853e21d907e1999f7570a6b821 SHA512 15403754c9b13f9b2d8c5e7615ae0ca9359b5079e22eb5a7049424e414ebbdd8a06f6324c31594636324414e35ca34bec977b7dded9f9ea14027497b5097b060
diff --git a/dev-python/pygame/files/pygame-2.5.2-numpy-2.patch b/dev-python/pygame/files/pygame-2.5.2-numpy-2.patch
new file mode 100644
index 000000000000..37b702e57280
--- /dev/null
+++ b/dev-python/pygame/files/pygame-2.5.2-numpy-2.patch
@@ -0,0 +1,135 @@
+From 21859cd1b108c2073dfd5fd197714c2b391e3824 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ren=C3=A9=20Dudfield?= <renesd@gmail.com>
+Date: Tue, 21 May 2024 10:24:52 +0200
+Subject: [PATCH 1/3] test: Fix numpy.alltrue imports to import all instead
+ thanks @mgorny
+
+---
+ test/pixelcopy_test.py | 2 +-
+ test/sndarray_test.py  | 2 +-
+ test/surfarray_test.py | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/test/pixelcopy_test.py b/test/pixelcopy_test.py
+index 6510fd99..46051cd4 100644
+--- a/test/pixelcopy_test.py
++++ b/test/pixelcopy_test.py
+@@ -534,7 +534,7 @@ class PixelCopyTestWithArrayNumpy(unittest.TestCase):
+ 
+     def test_map_array(self):
+         try:
+-            from numpy import array, zeros, uint8, int32, alltrue
++            from numpy import array, zeros, uint8, int32, all as alltrue
+         except ImportError:
+             return
+ 
+diff --git a/test/sndarray_test.py b/test/sndarray_test.py
+index 5b624caf..7a7a51f3 100644
+--- a/test/sndarray_test.py
++++ b/test/sndarray_test.py
+@@ -1,6 +1,6 @@
+ import unittest
+ 
+-from numpy import int8, int16, uint8, uint16, float32, array, alltrue
++from numpy import int8, int16, uint8, uint16, float32, array, all as alltrue
+ 
+ import pygame
+ import pygame.sndarray
+diff --git a/test/surfarray_test.py b/test/surfarray_test.py
+index 0863da77..a9d53fc4 100644
+--- a/test/surfarray_test.py
++++ b/test/surfarray_test.py
+@@ -9,7 +9,7 @@ from numpy import (
+     zeros,
+     float32,
+     float64,
+-    alltrue,
++    all as alltrue,
+     rint,
+     arange,
+ )
+-- 
+2.45.2
+
+From 4a2ede7b8a1e90c77ab90aadd9c26a2757124923 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ren=C3=A9=20Dudfield?= <renesd@gmail.com>
+Date: Sun, 2 Jun 2024 13:15:26 +0200
+Subject: [PATCH 2/3] sndarray_test: Fix some overflowed data sizes
+
+---
+ test/sndarray_test.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/test/sndarray_test.py b/test/sndarray_test.py
+index 7a7a51f3..57eb71c3 100644
+--- a/test/sndarray_test.py
++++ b/test/sndarray_test.py
+@@ -41,7 +41,7 @@ class SndarrayTest(unittest.TestCase):
+             16, 2, [[0, 0xFFFF], [0xFFFF, 0], [0x00FF, 0xFF00], [0x0F0F, 0xF0F0]]
+         )
+         check_array(-8, 1, [0, -0x80, 0x7F, 0x64])
+-        check_array(-8, 2, [[0, -0x80], [-0x64, 0x64], [0x25, -0x50], [0xFF, 0]])
++        check_array(-8, 2, [[0, -0x80], [-0x64, 0x64], [0x25, -0x50], [-1, 0]])
+         check_array(-16, 1, [0, 0x7FFF, -0x7FFF, -1])
+         check_array(-16, 2, [[0, -0x7FFF], [-0x7FFF, 0], [0x7FFF, 0], [0, 0x7FFF]])
+ 
+@@ -78,13 +78,13 @@ class SndarrayTest(unittest.TestCase):
+                 pygame.mixer.quit()
+ 
+         check_sound(8, 1, [0, 0x0F, 0xF0, 0xFF])
+-        check_sound(8, 2, [[0, 0x80], [0x2D, 0x41], [0x64, 0xA1], [0xFF, 0x40]])
++        check_sound(8, 2, [[0, 0x80], [0x2D, 0x41], [0x64, 0xA1], [125, 0x40]])
+         check_sound(16, 1, [0, 0x00FF, 0xFF00, 0xFFFF])
+         check_sound(
+             16, 2, [[0, 0xFFFF], [0xFFFF, 0], [0x00FF, 0xFF00], [0x0F0F, 0xF0F0]]
+         )
+         check_sound(-8, 1, [0, -0x80, 0x7F, 0x64])
+-        check_sound(-8, 2, [[0, -0x80], [-0x64, 0x64], [0x25, -0x50], [0xFF, 0]])
++        check_sound(-8, 2, [[0, -0x80], [-0x64, 0x64], [0x25, -0x50], [-1, 0]])
+         check_sound(-16, 1, [0, 0x7FFF, -0x7FFF, -1])
+         check_sound(-16, 2, [[0, -0x7FFF], [-0x7FFF, 0], [0x7FFF, 0], [0, 0x7FFF]])
+         check_sound(32, 2, [[0.0, -1.0], [-1.0, 0], [1.0, 0], [0, 1.0]])
+@@ -123,7 +123,7 @@ class SndarrayTest(unittest.TestCase):
+             16, 2, [[0, 0xFFFF], [0xFFFF, 0], [0x00FF, 0xFF00], [0x0F0F, 0xF0F0]]
+         )
+         check_sample(-8, 1, [0, -0x80, 0x7F, 0x64])
+-        check_sample(-8, 2, [[0, -0x80], [-0x64, 0x64], [0x25, -0x50], [0xFF, 0]])
++        check_sample(-8, 2, [[0, -0x80], [-0x64, 0x64], [0x25, -0x50], [-1, 0]])
+         check_sample(-16, 1, [0, 0x7FFF, -0x7FFF, -1])
+         check_sample(-16, 2, [[0, -0x7FFF], [-0x7FFF, 0], [0x7FFF, 0], [0, 0x7FFF]])
+         check_sample(32, 2, [[0.0, -1.0], [-1.0, 0], [1.0, 0], [0, 1.0]])
+-- 
+2.45.2
+
+From 184f8b78e6952aa619e961553835c442b3db8d5c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ren=C3=A9=20Dudfield?= <renesd@gmail.com>
+Date: Sun, 2 Jun 2024 13:27:34 +0200
+Subject: [PATCH 3/3] surfarray_test: Fix for value out of uint32 range
+
+Was in signed 32bit range.
+---
+ test/surfarray_test.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/test/surfarray_test.py b/test/surfarray_test.py
+index a9d53fc4..ee74290e 100644
+--- a/test/surfarray_test.py
++++ b/test/surfarray_test.py
+@@ -113,10 +113,10 @@ class SurfarrayModuleTest(unittest.TestCase):
+ 
+     def _fill_array2d(self, arr, surf):
+         palette = self.test_palette
+-        arr[:5, :6] = surf.map_rgb(palette[1])
+-        arr[5:, :6] = surf.map_rgb(palette[2])
+-        arr[:5, 6:] = surf.map_rgb(palette[3])
+-        arr[5:, 6:] = surf.map_rgb(palette[4])
++        arr[:5, :6] = surf.map_rgb(palette[1]) & 0xFFFFFFFF
++        arr[5:, :6] = surf.map_rgb(palette[2]) & 0xFFFFFFFF
++        arr[:5, 6:] = surf.map_rgb(palette[3]) & 0xFFFFFFFF
++        arr[5:, 6:] = surf.map_rgb(palette[4]) & 0xFFFFFFFF
+ 
+     def _fill_array3d(self, arr):
+         palette = self.test_palette
+-- 
+2.45.2
+
diff --git a/dev-python/pygame/pygame-2.5.2-r3.ebuild b/dev-python/pygame/pygame-2.5.2-r3.ebuild
new file mode 100644
index 000000000000..5c10b9bc4adc
--- /dev/null
+++ b/dev-python/pygame/pygame-2.5.2-r3.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for SDL multimedia library"
+HOMEPAGE="
+	https://www.pygame.org/
+	https://github.com/pygame/pygame/
+	https://pypi.org/project/pygame/
+"
+SRC_URI="
+	https://github.com/pygame/pygame/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="examples opengl test X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/freetype
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/portmidi
+	media-libs/sdl2-image
+	media-libs/sdl2-mixer
+	media-libs/sdl2-ttf
+	X? ( media-libs/libsdl2[opengl?,threads(+),video,X] )
+	!X? ( media-libs/libsdl2[threads(+)] )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		media-libs/sdl2-image[gif,jpeg,png,tiff,webp]
+		media-libs/sdl2-mixer[mp3,vorbis,wav]
+	)
+"
+# fontconfig used for fc-list
+RDEPEND+="
+	media-libs/fontconfig
+"
+# util-linux provides script
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		media-libs/fontconfig
+		sys-apps/util-linux
+	)
+"
+
+src_prepare() {
+	local PATCHES=(
+		# https://github.com/pygame/pygame/pull/4035
+		"${FILESDIR}/${P}-error.patch"
+		# https://github.com/pygame/pygame/pull/4236
+		"${FILESDIR}/${P}-gcc-14.patch"
+		# https://github.com/pygame/pygame/pull/4240
+		# https://github.com/pygame/pygame/pull/4254
+		# https://github.com/pygame/pygame/pull/4255
+		"${FILESDIR}/${P}-numpy-2.patch"
+	)
+
+	# some numpy-related crash (not a regression)
+	# https://github.com/pygame/pygame/issues/4049
+	sed -e 's:import numpy:raise ImportError(""):' \
+		-i test/pixelcopy_test.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_configure() {
+	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
+		"${EPYTHON}" "${S}"/buildconfig/config.py || die
+}
+
+python_configure_all() {
+	find src_c/cython -name '*.pyx' -exec touch {} + || die
+	"${EPYTHON}" setup.py cython_only || die
+}
+
+python_test() {
+	local -x SDL_VIDEODRIVER=dummy
+	local -x SDL_AUDIODRIVER=disk
+	script -eqc "${EPYTHON} -m pygame.tests -v" || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# https://bugs.gentoo.org/497720
+	rm -fr "${D}$(python_get_sitedir)"/pygame/{docs,examples} || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/pypax/Manifest b/dev-python/pypax/Manifest
index 287a77e85208..2f319f1dc0f4 100644
--- a/dev-python/pypax/Manifest
+++ b/dev-python/pypax/Manifest
@@ -1,5 +1,5 @@
 DIST elfix-0.9.5.tar.gz 401722 BLAKE2B 184f8944c62412675819ca86f13bcf23039ebcf069df528267f3e4272859e6cc442a1e05a7a121d88987c282d7e2f513d02f28ce41a8e3c0c226b456fa256aa6 SHA512 e15ab664357796f3a63ac54912eb43ae659947088a10ef16aafcbdd713cc3670fb0319cb2b95a2d29092866d322ef69df1d63847dfc0c4ab2cdd49e6eaa4635e
 EBUILD pypax-0.9.5-r1.ebuild 1103 BLAKE2B e8fbcc39219d7338aba389b49096cb39e628d366b37d4d8581ed5a87f3f500ae66c90b2319a3eede42ef6ec7e8e8e9ad4141b66a9eab373981e412eefd26bf14 SHA512 8fa3144a7d761fa7e8f0a46832ece4f15a3edf3903c023021531b2156c40b1443f92e39da0313f740abe8352e3778e1f48b65737cba453334d18cb26f87720d2
-EBUILD pypax-0.9.5-r2.ebuild 1105 BLAKE2B c45f045d1693dff676c61d5d978e2ad3d6aa263c8232a6e11023b6125a0b5e37d01861758721345c5aba9c399feef2b4aa27d270aff308583793ea696ad87321 SHA512 6d6e3cc40b37ba0647cb0b8fafa28bd349504ef126c7e958789ab7764793b19453fc94785f38a4d99c3929d61d3bfe48e06928d68f247167f4c383bc518c3344
+EBUILD pypax-0.9.5-r2.ebuild 1104 BLAKE2B e21933d6f4610442e2b9ca272a4d618070b2c9833bf9cb711a369bab84fff7827e3b4f09e0037e918f99d0ca1cb828dedced1efe09c0b6aa6492e6405e398832 SHA512 72fbf27dd51fa5760726beb7ab0c51b1f1b8bb881d4b29c51320c2511c01f178d7ecb35b5654ded74f9dfd3826c4339706a5b37307e08022f8339648f645c3df
 EBUILD pypax-9999.ebuild 1080 BLAKE2B 4264bca5d80467456961ddab04a40fa4b948ee22c245c494bc76db568412008991e266a69f26dbde6599779c24c1a188444fa8d26c194023a44f138339c693b8 SHA512 3f8139ce721b7e4545f5074b02e4c0d003c7de2c2602e1fb5b5d5a5e2f2637093327a6f967a409ef83fdeaf8833c8531d287053a3e82bff8a5fb6efa6fb62316
 MISC metadata.xml 612 BLAKE2B 098958af51ca2eda318701a6e321400131ff0c34ae84353d46a42e2271681eeac9a6bede38284a678b1d25aec579dcafca93ce1257f0c24980ff95a7a455ed36 SHA512 0668039cd6310b64d905c8dc5c9b2ed1ea237a049a076e7b62588118a0c772e4f8142e63ce452cac6357f31488fb00cdca02a14e4945bcc4cc7275fdd4fff9c1
diff --git a/dev-python/pypax/pypax-0.9.5-r2.ebuild b/dev-python/pypax/pypax-0.9.5-r2.ebuild
index d2f8cedc581c..dd3e589bc9dc 100644
--- a/dev-python/pypax/pypax-0.9.5-r2.ebuild
+++ b/dev-python/pypax/pypax-0.9.5-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/elfix/elfix-${PV}.tar.gz"
-	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"
 	S="${WORKDIR}/elfix-${PV}"
 fi
 
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
index 8d8130c699c4..11d346ce1787 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1,3 +1,5 @@
+DIST pyscard-2.0.10.tar.gz 153351 BLAKE2B fb600032321ac0bd372c7aa8fcdd82273af9edcfb51eb5d455296a2a685a291e442209d5c59d60b81cdd8cb3b0699f733e41528fe06ed827558146ba4085c97d SHA512 231d5abc0ad31ae7f0e394f928045346323f1040b313394a3d235282feb79bfec0d124ebde84017178dfa1983beadfb245a33bfa6a75b4fab9e65c3090b9e9cb
 DIST pyscard-2.0.9.tar.gz 153513 BLAKE2B 00a7676cb0d987b7a6cd0c2cdf061e4e4405c78a0289d0c46abe95461b19d61a964792f69fe2a2f268653d332e8c21f17d03a8f3b05456df8475b0c51370830c SHA512 0503c29dfd288237eb17fae2a6387cdfce5e34a3aa6cdbdf58aef04ad91ab232d14d78b999fd1d4b7d7c8ad6282fa0d7983a65030f896f1e8098597f182b10cc
+EBUILD pyscard-2.0.10.ebuild 870 BLAKE2B 1fa97c0a61d35c4f8944d771ad068a7c536d692e1d93725a63c731fbd6ab68ed69f4fc6bac5d5eca4be453ff91f41d24f41923983bdaec8f08a625f2b5fc3a0c SHA512 3adde1528061867d394f111c01c6d9fbd3de24a11e95348fff56085bb94c20ea9d53aefe51d1e2df291a64052dbeaa6440f86651faf5fbc790e041c76985ab58
 EBUILD pyscard-2.0.9.ebuild 867 BLAKE2B cfec5ef96d3232c564d34f4580ec18c1e77db12e4af777ecece41b861545e99ae22fba860701391682d320ae8492a7e6dc2a74d33b6f1b9329d1d4fc8c7c850f SHA512 523ffa70b2434988de371f9a9124cad4f64c16b345cee5ea1c796a04ae9faac7f40f0ca2969597b7917cac3e33a3cb99e8733ef6e345e57cda1ccdfdab0ca29c
 MISC metadata.xml 426 BLAKE2B a4819bd37d610cf785d4b0e5ba2a709c941000d5cea8e20c8d49e513e7167b55e8e149da9e318281dce7b4eb92cb61e355054c273e3758262c6c25a0757ffba3 SHA512 82e759791154362704f4d7a1a1c72d53710e405c21bf791d0ec609ddfee4b8c04e3490a3f33f8d0e6e295f3b8433520f328dd71bc91cde2926a89a76803fd63d
diff --git a/dev-python/pyscard/pyscard-2.0.10.ebuild b/dev-python/pyscard/pyscard-2.0.10.ebuild
new file mode 100644
index 000000000000..b141ab35e303
--- /dev/null
+++ b/dev-python/pyscard/pyscard-2.0.10.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Smart card support in python"
+HOMEPAGE="
+	https://pyscard.sourceforge.io/
+	https://github.com/LudovicRousseau/pyscard/
+	https://pypi.org/project/pyscard/
+"
+SRC_URI="
+	https://downloads.sourceforge.net/project/pyscard/pyscard/pyscard%20${PV}/${P}.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	sys-apps/pcsc-lite
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-lang/swig
+"
+
+distutils_enable_tests unittest
+
+pkg_postinst() {
+	optfeature "Gui support" dev-python/wxpython
+	optfeature "Support of remote readers with Pyro" dev-python/Pyro4
+}
+
+python_test() {
+	cd test || die
+	eunittest
+}
diff --git a/dev-python/pyside6-tools/Manifest b/dev-python/pyside6-tools/Manifest
index 46bea3c6a394..c490fc18b9b6 100644
--- a/dev-python/pyside6-tools/Manifest
+++ b/dev-python/pyside6-tools/Manifest
@@ -1,5 +1,5 @@
 DIST pyside-setup-everywhere-src-6.7.0.tar.xz 14382456 BLAKE2B 607e496cdeb7e55166b4f0dc15662a8792c7d8925856e8edbb927dfdc33342d158f430e3433d3d4a78ea33740e333fb2422ea1f4332408c3c6214f92d31bdd0d SHA512 7801d564d8d359edec431dc0e6f170538b9fc6f834cb7ab8eff41c1989bffb619c446d4d62d65db2a5b7592c0bff5d450d42de2797726658fe1a8f53df8a4c14
 DIST pyside-setup-everywhere-src-6.7.1.tar.xz 14400976 BLAKE2B 1f6e2705aedc4151147e259da2a8fbab19a1815f19f1a36ea46dbf0bf2282a453e85a33ea8c6862072bb22699be39ab8375b48cd6d5b879de8bed5fad8cf60cb SHA512 6ca73f0b16ef43bc018aeb9e0f51d8ae91b13b79ebdfd71f5524bc0e8ef78322ba0aca81203cc5532e5096a55441fb4dabf3b628de3234b876b7a70327b714d4
 EBUILD pyside6-tools-6.7.0.ebuild 1768 BLAKE2B ccd9ba0f0cf047abab5993838975913fb268c75dc8975c04b5300ac715d98342fdaa579323462ae43cb29bc994f54b1c6e63bc35b71e180c892b18a94ae937db SHA512 d2795ada922c9d6c38560a7254c0ef8957c06985ac89fb54e79626470dd5b7344a834d57bcaae7bc5e0513ec9e7d68788e2b8bec22b2fc7737f9febc773ffbf0
-EBUILD pyside6-tools-6.7.1.ebuild 1872 BLAKE2B f1e1353f33bb9f16c4c0d7e97b52a701d6b5fa3fcbaca455224222e69dee07fa78ec2357392f07d9862797f6057e14a2f4a76379403bd766e1b9cab71e7bee26 SHA512 effb9d45afb1d6d7e899e414170140cd67e43cec501c6095f9fcc69aca7c29dc41f61a6fc7fc57e89e0ecdc74703b3353c9b46b963f448cc5a065a4c34fba3f6
+EBUILD pyside6-tools-6.7.1.ebuild 1883 BLAKE2B 6b70960f280acb0d1e822ca83f8543d04dcd17844547e93facab031040725acdcbc385a7adccdb6e2e6a15b834ce31e5c24419208f0160f57d3a86365f341f8e SHA512 e329b5cb4d717fe27fed7ba548a9e26b44d29031c3c33d87360b287b7784f0190a06ab22b81a083ef5e22b0499ec34e73a92ae3292650178894f63992779fd0d
 MISC metadata.xml 402 BLAKE2B 28348df442d189eadb56e04dfda71c1d5a56868aae85611a7d77ecdc7651e34ce02563c8da1270aad55758e2dd4301de44434e0bbdb010ef484e240068602ede SHA512 a54866110e38c24d67d60286c64b63dc0b537c55eb201b84b9173b47710b6e8a840d9072ca46fbef969bf481e43e1d8824b20655d7fe6b300cfd5333c3f74a41
diff --git a/dev-python/pyside6-tools/pyside6-tools-6.7.1.ebuild b/dev-python/pyside6-tools/pyside6-tools-6.7.1.ebuild
index 5e4bf58ec13e..57d275d262a2 100644
--- a/dev-python/pyside6-tools/pyside6-tools-6.7.1.ebuild
+++ b/dev-python/pyside6-tools/pyside6-tools-6.7.1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_PN}-${PV}/sources/pyside-tools"
 
 LICENSE="GPL-2"
 SLOT="6/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~arm ~arm64"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # Minimal supported version of Qt.
diff --git a/dev-python/pyside6/Manifest b/dev-python/pyside6/Manifest
index e0a61d4f6dc8..c5979a74f6a1 100644
--- a/dev-python/pyside6/Manifest
+++ b/dev-python/pyside6/Manifest
@@ -3,5 +3,5 @@ AUX pyside6-6.6.0-no-qtexampleicons.patch 221 BLAKE2B d45b4ebcd780a0151b793b5b21
 DIST pyside-setup-everywhere-src-6.7.0.tar.xz 14382456 BLAKE2B 607e496cdeb7e55166b4f0dc15662a8792c7d8925856e8edbb927dfdc33342d158f430e3433d3d4a78ea33740e333fb2422ea1f4332408c3c6214f92d31bdd0d SHA512 7801d564d8d359edec431dc0e6f170538b9fc6f834cb7ab8eff41c1989bffb619c446d4d62d65db2a5b7592c0bff5d450d42de2797726658fe1a8f53df8a4c14
 DIST pyside-setup-everywhere-src-6.7.1.tar.xz 14400976 BLAKE2B 1f6e2705aedc4151147e259da2a8fbab19a1815f19f1a36ea46dbf0bf2282a453e85a33ea8c6862072bb22699be39ab8375b48cd6d5b879de8bed5fad8cf60cb SHA512 6ca73f0b16ef43bc018aeb9e0f51d8ae91b13b79ebdfd71f5524bc0e8ef78322ba0aca81203cc5532e5096a55441fb4dabf3b628de3234b876b7a70327b714d4
 EBUILD pyside6-6.7.0.ebuild 10169 BLAKE2B 0d36ff8095a3386536ff48f42966751ebac1824247c87b8a04e578d6d362c5d207fc83258be8e5f7725d3d21faa9b9652d7d761f086759a68b9356079ec079b5 SHA512 be8cba232e1e026789e96a51ee6edf615b378a9d449e03ee482eec79163f81650aa6fa3db137177b85667c9216bad0a705047ada00b687994afb0481fdd455dd
-EBUILD pyside6-6.7.1.ebuild 10202 BLAKE2B 59397cba2470c545ffe0d72eaaff8c2dada02ff6067c5e8e049896c6d65fa705cb56f25b2244cff798c6cfa9b121c8157fbf0ab18976ee3f1e75805d7b5d1541 SHA512 de2175fce9dfb28b05b592f4a3916726cfcdb53cc0d7c3726a3505fa3b43df99e6af01ba986d5b555bc27e66967ddb2911ab99ab7615284119bb5ee75933e7fa
+EBUILD pyside6-6.7.1.ebuild 10213 BLAKE2B fd4ffa1d583f1302d348e49e28bb23fda1f3a4b35f6b4ab2e8f39de3e15bbf6c44823c6793ce9183f31d22c86b4951cd86391a5c169462d334b3d9d0ee522550 SHA512 2383c3049f01d31679267408f265d2eda58c414427495cfaae50d11bef51e23cca6b472a1f88947be3deb9a24e774e12feb97ca5c57e39f3288b044628ccbe76
 MISC metadata.xml 2370 BLAKE2B 4135d3d10c96b39c55d9609a096a62a638c2c2e4f15c8b097631baaec111e4c197584f66db8d6151b25404cf51de7b3254c3c853ce6ba0e5c832d4dcb59936f0 SHA512 3ef85f4d14c69cf9fbccd62056e806ac3afbc49ee4ab31652b51bed3582d492d631d2c1370fa59af6ed6a8c32cb337108f9f2bd5dd7feb4a7402a046b9bb0ceb
diff --git a/dev-python/pyside6/pyside6-6.7.1.ebuild b/dev-python/pyside6/pyside6-6.7.1.ebuild
index dafd119436e8..a485b3fc73d8 100644
--- a/dev-python/pyside6/pyside6-6.7.1.ebuild
+++ b/dev-python/pyside6/pyside6-6.7.1.ebuild
@@ -39,7 +39,7 @@ S="${WORKDIR}/${MY_PN}-${PV}/sources/pyside6"
 # x11extras (for X)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
 SLOT="6/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~arm ~arm64"
 IUSE="
 	3d bluetooth charts +concurrent +dbus designer gles2-only +gui help location
 	multimedia +network network-auth nfc positioning +opengl pdfium positioning
diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index c56b1c5d0d1c..a6ad3f2fb5d5 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -1,3 +1,5 @@
 DIST sh-2.0.6.tar.gz 345496 BLAKE2B 2352aa1c560a95e59446473658d0a95609f594417c8840c84cf1d65590aa94c2225dcd8782e75d82e92cdbf86f21dbbe03a1818a5ef1800a39444ce2918bc90b SHA512 717dae58ebd08b3a86e0d30ba2a6f3055592844d064265280b97a1d29bd7d0422c9e5500b6eb999cc1a97c1c2af04cf8ed214670bc08cb2bc45e418f69560c1d
+DIST sh-2.0.7.tar.gz 345477 BLAKE2B a7eb24e5cdc4543b5a44a523b101b5b103ad1fc26664b659cf84921d50112bac1a49d7ea19889d2157b2df941b67840373a9a4bc63e2cb7f94bb4cdfac85819c SHA512 331a3bdc027eeac7100ae6318a579c85fb11ce0e1922d1078c2f09b0523733b146a9bd5b9f030a2da23e3d2bb2a6970bd451d53224259967efdcf99e949f7b9f
 EBUILD sh-2.0.6.ebuild 579 BLAKE2B 4843a4f26fe7fba474fb086bc4911258626b59351fc1986aa16cb63f2ad655344beb01bd5e0c8e4ed1d57cc5c05d79dd11eb625c45938371cf95f99d7ee48f44 SHA512 c579bc5e60edff5f05502dbc4c803790ca48ed75fb8111c1ce51a570a8efb6ee27dc98beacafc755d4a027074e92361c00f9f8dfd724b65ebdeda75ea8b72080
+EBUILD sh-2.0.7.ebuild 587 BLAKE2B 889713348d1c1e647867bf851b683919e5fab821e5366ef78ddcb72eb1323951498dbe7aa11b91a5487796f3787605b58845345096123bba927d267693a8e282 SHA512 95dfe0b9af66704385aa076954e062622709c93f53bdada8363690a5fc6e68e124f270fc0f6572936c96431b846bcb16a8b37988adf6e9d352c21d790e1ed14a
 MISC metadata.xml 803 BLAKE2B 086d1696b7c03a1a4ac9d89164b507fd7caeed3163c15b4263772399641a3f82ca364a277fef6ede78bb3d8776ec7181f316ee8070ac5bb9290e7233f69514b0 SHA512 bceee86f0df9e0042815b9d24dd75659c7548f345dee2e1e1f586cf28f605d59a7ffe759f2cdbc8da6f6fb620b7f66b1763992b35e943ed47c3e1b739eaa3a2c
diff --git a/dev-python/sh/sh-2.0.7.ebuild b/dev-python/sh/sh-2.0.7.ebuild
new file mode 100644
index 000000000000..6501a4cab092
--- /dev/null
+++ b/dev-python/sh/sh-2.0.7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python subprocess interface"
+HOMEPAGE="
+	https://github.com/amoffat/sh/
+	https://pypi.org/project/sh/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests unittest
+
+python_test() {
+	local -x SH_TESTS_RUNNING=1
+	eunittest -p "*_test.py"
+}
diff --git a/dev-python/shiboken6/Manifest b/dev-python/shiboken6/Manifest
index 4e7f163546e5..cead25448d99 100644
--- a/dev-python/shiboken6/Manifest
+++ b/dev-python/shiboken6/Manifest
@@ -3,5 +3,5 @@ AUX shiboken6-6.7.1-add-missing-include.patch 425 BLAKE2B e0a0f484a6fb2bb9f1e3ca
 DIST pyside-setup-everywhere-src-6.7.0.tar.xz 14382456 BLAKE2B 607e496cdeb7e55166b4f0dc15662a8792c7d8925856e8edbb927dfdc33342d158f430e3433d3d4a78ea33740e333fb2422ea1f4332408c3c6214f92d31bdd0d SHA512 7801d564d8d359edec431dc0e6f170538b9fc6f834cb7ab8eff41c1989bffb619c446d4d62d65db2a5b7592c0bff5d450d42de2797726658fe1a8f53df8a4c14
 DIST pyside-setup-everywhere-src-6.7.1.tar.xz 14400976 BLAKE2B 1f6e2705aedc4151147e259da2a8fbab19a1815f19f1a36ea46dbf0bf2282a453e85a33ea8c6862072bb22699be39ab8375b48cd6d5b879de8bed5fad8cf60cb SHA512 6ca73f0b16ef43bc018aeb9e0f51d8ae91b13b79ebdfd71f5524bc0e8ef78322ba0aca81203cc5532e5096a55441fb4dabf3b628de3234b876b7a70327b714d4
 EBUILD shiboken6-6.7.0.ebuild 6643 BLAKE2B a1ed24f156f46a98044a7adbae6862554a9dcc73f78930168af96b0450d2b57325545c2523b3499ee14d5f92c3880abd26e31946c783c185beb4b391c2057333 SHA512 eb75e5fec22603a3b3b26b559229fdb7588db47d4b8052110913a7a7cb88146a69b5726d27f3a880426f22d2f54a1be71cdff937ce091f39058e3ee0c807ddbd
-EBUILD shiboken6-6.7.1.ebuild 6728 BLAKE2B cc65d5e0a5f45d4b51d7e4208896b58a2dd25d036a648bac72f4aa33b4dd8d36358f4201582a1d0711e407124f10728ee2ecfee6fac4396a8c032dd5db4ccd02 SHA512 48b8aa7c6b50552889dccb3a121fcd5e7dc89c63d9a0ec42a1b989b21d641509ad0a3129293f780de28ea37d5753f4a5400bf8f32475564a5f03783c46590611
+EBUILD shiboken6-6.7.1.ebuild 6739 BLAKE2B ea08136e6dd97c1ee304c6062a059e1639296c2d4ee57c6a23e3d9008cd61e8ac1e3508bbfe37399158dc404d6259b66c67365044ec26a9a6096e2d15d6e6f2a SHA512 c6082880fe6e12acc35b706b9647735e5ae5bd4bb1b8786cd3c21d5e9c1fdecfa153c603b0579c03016ca2d0ff031432d7cc424a1fd5b5805578a5e904fbe89a
 MISC metadata.xml 730 BLAKE2B 33e7e589d02ec0517e134aa50407ecb97c6800be3ab7b69174d65776f62c1f25c2b2209d51299d9e0110b5f5e9322ee2c0b43dc89e6b12c40ea322ca9bc8eb3f SHA512 cc4ecdd9bc86ce59c2027c6f87307d32bd76d5d2cd8c07edb6c60cc5317ea52a96136c7597a179d75f1632db2999300d8b8f0567679ba3fc562804774fcdcc98
diff --git a/dev-python/shiboken6/shiboken6-6.7.1.ebuild b/dev-python/shiboken6/shiboken6-6.7.1.ebuild
index 1a7764eeebec..69c4efccd59c 100644
--- a/dev-python/shiboken6/shiboken6-6.7.1.ebuild
+++ b/dev-python/shiboken6/shiboken6-6.7.1.ebuild
@@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_PN}-${PV}/sources/shiboken6"
 # arbitrarily relicensed. (TODO)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
 SLOT="6/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~arm ~arm64"
 IUSE="+docstrings numpy test vulkan"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/tlsh/Manifest b/dev-python/tlsh/Manifest
index 3671de15f029..6fa60bc1b845 100644
--- a/dev-python/tlsh/Manifest
+++ b/dev-python/tlsh/Manifest
@@ -1,4 +1,7 @@
+AUX tlsh-4.8.2-r1-py312.patch 776 BLAKE2B c5189ed9d7b902a2c6a88fd1fac1b1da2b9c8997acb7dbfbff550e66b16f969fcc7b39e370d6ed5cdb6d15515ba290fadbe30f52b2723fae9d0aee79c163d1d0 SHA512 ba1f37449a2a8a007bc1a83c2b4d1d0061c7a109207cac4220ab44c732690bb0bce0faf55b452e5c210eb621a5b3d6423f233d6d0716cf81df03de38ffeea513
 AUX tlsh-4.8.2-setup-sources.patch 1029 BLAKE2B 6b1a252693940df0856361aa38553a6a684566c4ab80ac4e01b7151a611b5d27bd9065c5560e958931108399b9b860405ab4119615f8f6ab6f8d05e8ce2f4c89 SHA512 04fce865f3a7e73a9a6814596255f86eb1d24086372479ed993b7faa362973808d2d45f4d81506c1bf87bfc534caa410a0c8758250ccb3fa4337c0952610be5e
+DIST tlsh-4.8.2.gh.tar.gz 3345458 BLAKE2B 27d5eece16bb36225b9ae8b3d3a9d055a0f214fffae08a58c39211c3d918dd842497315a62237b291ee1055dfadad78826bbd24f7b9d88f510e9a31f74654039 SHA512 5355c7734f5356a3a7a31ccc078254835871fc0369f1889a34131a0f810735201c68f674eb18e975b6a03a32e5c284899ca9ffdc1f583e42192188c172d2aad0
 DIST tlsh-4.8.2.tar.gz 3345458 BLAKE2B 27d5eece16bb36225b9ae8b3d3a9d055a0f214fffae08a58c39211c3d918dd842497315a62237b291ee1055dfadad78826bbd24f7b9d88f510e9a31f74654039 SHA512 5355c7734f5356a3a7a31ccc078254835871fc0369f1889a34131a0f810735201c68f674eb18e975b6a03a32e5c284899ca9ffdc1f583e42192188c172d2aad0
+EBUILD tlsh-4.8.2-r1.ebuild 740 BLAKE2B ae7a53b61fffbf7a8b27df9adca68c728c81bbb84f95a311c14c58c8ce91ce7a64e1c563c863a65014323f264b46443abc2f2595509af8858fbc05fb55316925 SHA512 d6bf9dded0002408716b6370ec00e6ef233573ec4af5c9a8c4d1a7b6aa29bdc51aa1755961e781bd994eb68992cb05a641a094beb162d1856f675a0f9895c322
 EBUILD tlsh-4.8.2.ebuild 824 BLAKE2B 7ae8ebc9d5e93ff68a4cb6e2e3098528877f158155f194c67aa2b478dd55ed91efdbbcd4123cdfe6ce98408c51d077c26ef0f56dbf852f9b07a18d95a580476e SHA512 6579172dbc43d0e8e20a692582b99ed22a422474fc081c6cedfe03e6e1e7dab76159c9c63018bef0f7ca0cfd1fadc4b681c7c753663acb5b9dea9bb1f555ca2d
 MISC metadata.xml 520 BLAKE2B 97d64e94859345f4537e1a95dac94190cf54cf608cc851a8cdf24f5f4b71c0821c778d24f99fb076ed08247a085270d4c36aaa66583916c0a420733b7b8543be SHA512 95dc94ca2c08d71246453ccee139901e675ec84b2c4af224b90057270f4bf5494ffb761e2d3b4dff25cfcac47185d4f7d2f4b3080182f8c9526b746e99519211
diff --git a/dev-python/tlsh/files/tlsh-4.8.2-r1-py312.patch b/dev-python/tlsh/files/tlsh-4.8.2-r1-py312.patch
new file mode 100644
index 000000000000..56c4766bd711
--- /dev/null
+++ b/dev-python/tlsh/files/tlsh-4.8.2-r1-py312.patch
@@ -0,0 +1,25 @@
+Use PyVarObject_HEAD_INIT instead PyObject_HEAD_INIT
+
+--- a/tlshmodule.cpp
++++ b/tlshmodule.cpp
+@@ -59,7 +59,7 @@
+ #include <Python.h>
+ #include <new>
+ #include <bytesobject.h>
+-#include "tlsh.h"
++#include <tlsh/tlsh.h>
+
+ // to generate the "T1" hashes introduced in TLSH 4.0.0
+ // see 4.0.0 from 26/Mar/2020 at https://github.com/trendmicro/tlsh/blob/master/Change_History.md
+@@ -286,10 +286,7 @@ static PyGetSetDef Tlsh_getsetters[] = {
+ };
+
+ static PyTypeObject tlsh_TlshType = {
+-    PyObject_HEAD_INIT(NULL)
+-#if PY_MAJOR_VERSION < 3
+-    0,                         /* ob_size */
+-#endif
++    PyVarObject_HEAD_INIT(NULL, 0)
+     "tlsh.Tlsh",               /* tp_name */
+     sizeof(tlsh_TlshObject),   /* tp_basicsize */
+     0,                         /* tp_itemsize */
diff --git a/dev-python/tlsh/tlsh-4.8.2-r1.ebuild b/dev-python/tlsh/tlsh-4.8.2-r1.ebuild
new file mode 100644
index 000000000000..94ebb2d03eab
--- /dev/null
+++ b/dev-python/tlsh/tlsh-4.8.2-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_EXT=1
+inherit distutils-r1
+
+DESCRIPTION="Fuzzy matching library - C++ extension for Python"
+HOMEPAGE="https://pypi.org/project/python-tlsh/"
+SRC_URI="https://github.com/trendmicro/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+S=${WORKDIR}/${P}/py_ext
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+
+DEPEND="dev-libs/tlsh"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-setup-sources.patch
+	"${FILESDIR}"/${P}-r1-py312.patch
+)
+
+python_test() {
+	"${EPYTHON}" test.py test.py test.py &> /dev/null || die
+}
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index a219680bddff..4203307474df 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -2,8 +2,10 @@ DIST typing_extensions-12e901ed0cb8a826726357f8020cf3837d961e15.gh.tar.gz 95229
 DIST typing_extensions-4.11.0.tar.gz 78744 BLAKE2B 641d4a13fcd10151a0b7059d11393c78974883710a860805dc132a148677c80a0be06dc32f66cffc4ae2dd838c607bdaa8d3f44e4e3cf55848d2a315bd74ce5a SHA512 d795fadbe9c0a24c4d3190f375d72576f5b42a14dc3a999127c1356f2ae77d4bffdc04a23b7a05331cc8b703a81f504328aaf5d6c1247ea24cbeed25dccb0a37
 DIST typing_extensions-4.12.0.tar.gz 84291 BLAKE2B 96ebdf7ea479fb96e106e79782845380dcb1323265bf4931d26e1c09c09519c6712cbff9270a97ab45e26e61b48d5fb57f44c3ec6651eec29ef724b5896046e0 SHA512 da9d983f320ae4c7f386ab2bcaf57a881ff2b6bb6030618f270195ce9f905f2cbaf4f67c40311f21c096bedc014b7717c014f142f33fd25bf8e41803ac12bc4a
 DIST typing_extensions-4.12.0rc1.tar.gz 83702 BLAKE2B 5f8faaf15bb975f84fc4e217ab1ef9aaa3526dbfc3e17150a1b94cade70e19b27d9e0b637b175aae108719dd234a972c53696e96f7d6b5e96c626c31ded68123 SHA512 a0ce4d62695facb9ad11a4719ea31a0d5f95ca10eee939fb9b3fde8bae963e343a6779e7f5507af7f8751cf0b944d703110bcb18a345f020923ff5ebac54bc9e
+DIST typing_extensions-4.12.1.tar.gz 84923 BLAKE2B aff356290f0d138d29d0e52e8530e0b3ff11f8e53cceac97609f99d4a1ca062eb628b53b202626a538c16c511cbe5909f735740c5b15de049fec58e4bb5adfd9 SHA512 b9084010de271f0193181c77c4a74d72d207a6484d2ccec9f5162cfb288c38a6f7c9d844804e907816ca9a0d2f2aa7a8afcb9b377f7734a2fa927281744b0106
 EBUILD typing-extensions-4.11.0.ebuild 654 BLAKE2B 39a30d648c4ee16a0425451d5160b8575217a0c74f9a932cb559407bcbf11806a9749f411bbfd351f031615fcc9c5e198efbca3f6a5e8db88d583fc869b1bc6f SHA512 45635bf83161b3c66d42ba4e424c4c60070e45a666f357b052fe4999f0fc45c4e96c8488ffbf6ab7044bf2841a9f5ba6f5762fbc5a7f41194729bebae4fc4323
 EBUILD typing-extensions-4.11.0_p20240512.ebuild 879 BLAKE2B b261e4159377d6e32ef0225c595faf1e6917ced7e9b3fd133b8872ed4b64f37b470efd6a2792d9073355d33567d8c1904b6be4ac7be9faf638870a815abf7f2e SHA512 d0d62256704ad79703abbe9b217ca0ec44bef10c2b945ec30a46722e49451c5c839f2126841fb0fe0d6a2856d8af81270bdba8cf6b62220a80191bbfa5ccda0a
 EBUILD typing-extensions-4.12.0.ebuild 662 BLAKE2B a5b97317cfff4239b52132d0594e1b3228110541aa936bc10a7da50ebe7e5a074ffb882723cd2d72c433daa52819a754f523ab2b6b1c752ad5d68011b5d69d10 SHA512 c590f1e8df220966e4e2065c36edb5f5896e2a9f82ec2af7d2efc71b8f41bc30c88aadbb03ee82efd1c7f720d9ba07f03c322b78b10d8228902c6121dbfadb00
 EBUILD typing-extensions-4.12.0_rc1.ebuild 662 BLAKE2B a5b97317cfff4239b52132d0594e1b3228110541aa936bc10a7da50ebe7e5a074ffb882723cd2d72c433daa52819a754f523ab2b6b1c752ad5d68011b5d69d10 SHA512 c590f1e8df220966e4e2065c36edb5f5896e2a9f82ec2af7d2efc71b8f41bc30c88aadbb03ee82efd1c7f720d9ba07f03c322b78b10d8228902c6121dbfadb00
+EBUILD typing-extensions-4.12.1.ebuild 662 BLAKE2B a5b97317cfff4239b52132d0594e1b3228110541aa936bc10a7da50ebe7e5a074ffb882723cd2d72c433daa52819a754f523ab2b6b1c752ad5d68011b5d69d10 SHA512 c590f1e8df220966e4e2065c36edb5f5896e2a9f82ec2af7d2efc71b8f41bc30c88aadbb03ee82efd1c7f720d9ba07f03c322b78b10d8228902c6121dbfadb00
 MISC metadata.xml 409 BLAKE2B f2defedc04bc50fcdccb536be53f5148d2630bc235437d9c2ab32d579585e27c108f87d22cc9b458151e742d2f6c0788ae993fcbefe247295f2a572d8648ffaa SHA512 be8e74d9c73f2e4dfce9728cb06c3bc56ae35120e3388fc232da3f4cff17367775401805f63fecb74397ecc7ae8340d68dfa271cd06ed2fb03def8d155262d02
diff --git a/dev-python/typing-extensions/typing-extensions-4.12.1.ebuild b/dev-python/typing-extensions/typing-extensions-4.12.1.ebuild
new file mode 100644
index 000000000000..71adea3717b9
--- /dev/null
+++ b/dev-python/typing-extensions/typing-extensions-4.12.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Backported and Experimental Type Hints for Python 3.7+"
+HOMEPAGE="
+	https://pypi.org/project/typing-extensions/
+	https://github.com/python/typing_extensions/
+"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+distutils_enable_tests unittest
+
+python_test() {
+	cd src || die
+	eunittest
+}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 22334519d519..8f378b79ef61 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index bdee4decf7f1..4dd6527958b7 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -259,5 +259,5 @@ DIST 6.7.1-0-202404231200qtwidgets-documentation.tar.xz 18109700 BLAKE2B 3e0d0c2
 DIST 6.7.1-0-202404231200qtxml-documentation.tar.xz 340868 BLAKE2B 67cce4112ca776373abd0503d423bae951bd95da4580d641c7b9012b041220d367732fb84a9394f7bf1abd09a47486cad70732793179a961f35714b3b51437ba SHA512 0305ec23fe2097ca9e5e726ef6b78bad1a212697569f7fc193f601b118bd61d481e5573694f26180aba7892a7372db50870a7dec259dc3e5054a4e17dae9d9cb
 EBUILD qt-docs-5.15.2_p202011130614.ebuild 3233 BLAKE2B cec70539f86b4c8aa15efcf723679f735137206593183017a9e4b636cca7df8681ce6885dd2870459667492502067f9adf5cd45d93077862945456fcec6228d8 SHA512 4a7eab16f8e6008859b43d8742954209dac9e83cbc5c3fd1573e9cd73ae640ad9b11854aa5f54074b7f05ba08d0aa3f18b50ba0db5896662e38e85bdff34e642
 EBUILD qt-docs-6.7.0_p202403252230.ebuild 4819 BLAKE2B bc3a714e200f6d3dcd870a6b2f1c436ffcc983207fd0da478976602cdd0ce63c2582c065d425a910f09a01e9db1d7cca048df152ef9f602d4157a8e745e9ceb4 SHA512 c2621223d517dfed40d2c1057f9d8f4d975fa9e427d22da1a79a97647bfab23df69cdbbf3ab8c52c5fb500caffb0b31ab614fa1463e7012a3961cde5dd84e73c
-EBUILD qt-docs-6.7.1_p202404231200.ebuild 4818 BLAKE2B 109ae51d6c3fb6522fbf4b199d9edbd5eef04d77c7a7d958e57b41b0f3b9fc0dd845fcccef0d626444c993abd60e030168918ef095608243dff519b5c62c03aa SHA512 316f20a6d8ac39bec5ffd3a8ce47112e6202abaacd9e3a8ff1ab9bf93a00275c9d552717725fed076f69d179efec6102b7e38237e67a4f86df4027e68957f59e
+EBUILD qt-docs-6.7.1_p202404231200.ebuild 4817 BLAKE2B 74335f438cc12b7af95ed184394be4e30fdc87e97c51989ef30c473ef77498ca2429548eaecdc28494354998bab3e8b54365d967d24bba1f476fac4b4e8e0137 SHA512 efca1b3d0992b88c29c99820a1db0d895286b3495b47f97603dd4b2f11eba3f79aa45c003daae5e23d8b7932c3f89148dfbc5c70b49ec3a497f8175f966ce950
 MISC metadata.xml 5290 BLAKE2B 4bd7db247ead833a33ddca3f6d9c81773adfdcf776b02d49de7ca2e3b4a10ea8d9a0b07cd3f7068eecb954b93b0c77cf1d240df3ce33508231c2c3fb35afeb81 SHA512 7f6c6779880d1681e2dcac9273650f20690176bf47d7e3825d7d76b7f6db2cac92a2b1ecf3e2886fa724f5230e9bde703d3341a266ea05f19c2d2f3aee58c81e
diff --git a/dev-qt/qt-docs/qt-docs-6.7.1_p202404231200.ebuild b/dev-qt/qt-docs/qt-docs-6.7.1_p202404231200.ebuild
index 181b5da95f64..2751695c80fc 100644
--- a/dev-qt/qt-docs/qt-docs-6.7.1_p202404231200.ebuild
+++ b/dev-qt/qt-docs/qt-docs-6.7.1_p202404231200.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://doc.qt.io/"
 
 LICENSE="FDL-1.3"
 SLOT="6"
-KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="+examples +html +qch"
 REQUIRED_USE="|| ( examples html qch )"
 
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index 80b59588ef98..7a9379b3dd1a 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -5,7 +5,7 @@ DIST qt3d-everywhere-src-6.7.1.tar.xz 141586868 BLAKE2B da49dcc7345d422eef4dce1d
 EBUILD qt3d-5.15.13.ebuild 948 BLAKE2B 398c6ec0d38bca086daab3d2cae7a7afe107f977bd980cac0dee1c5919d28024ebce2fdf492c3d14c798e229a13d375d22188613da0d067ebbbe526799364e3a SHA512 e9503b5e06159e4a13e1ed08abb181d4cc7162f15398f1d4907c30a85d798c87793cca1e8fbb1a7c0a5759f6f246f60d7fffd3aecf23a2896a6db9090a4c189a
 EBUILD qt3d-5.15.14.ebuild 948 BLAKE2B 398c6ec0d38bca086daab3d2cae7a7afe107f977bd980cac0dee1c5919d28024ebce2fdf492c3d14c798e229a13d375d22188613da0d067ebbbe526799364e3a SHA512 e9503b5e06159e4a13e1ed08abb181d4cc7162f15398f1d4907c30a85d798c87793cca1e8fbb1a7c0a5759f6f246f60d7fffd3aecf23a2896a6db9090a4c189a
 EBUILD qt3d-6.7.0.ebuild 822 BLAKE2B 056e94e854ba0a531e798fe1c70d7025c27ec0b890dea0f59df547cc71d2fc138c38349c7ea877c4b2bc922b1163a4dfd4e2626df360dee21f0818ff478191c2 SHA512 7757988eb2229de55fbe96155620f5bf310ec7675c6e0c6fdd6cdf050afd3153e1dc9c13b9c78c45dcbd212f22a562fd9b0675f7c6688f87af2643e4c5489915
-EBUILD qt3d-6.7.1.ebuild 821 BLAKE2B 3d558b9472e3e210ff46ad621beb3424f9846fda0d7877609470826d053d2669145e4c80fa00e842353ca97b10b78afa682e1e464a17f23d35a5fb625f99a471 SHA512 d929885b55f698aaaa4319f2fe166ed482df7f96e89a8037f9329078e552c96a88141003df187334250905c4606903f06c38ba91bdd6635b26463d49791a0d08
+EBUILD qt3d-6.7.1.ebuild 820 BLAKE2B e11baa07b37e604780a42c7db9def3523f0b2afb68ac65702fa4aaa64faf7768b389ce9072422f4f24d8639fcf5d7738b6973d07ba0ed8eafddd2cc08cf6aa59 SHA512 6eb998879d4f9c698df13b605d63fd24634be25e485567ccf65f6b27495e9c17baacd701023970f8ec4258b6e8d51dc7d686059e13000e1f359079a87cd005e4
 EBUILD qt3d-6.7.9999.ebuild 823 BLAKE2B 58c9f78dd834a06248de278fc0d9659eb392632515a2882a415c85802be3311f326a5d2bf14d32ee11ca51d63a02d83bfc16a2b2a075ad35d8b2e668e17148db SHA512 9db8c05d09a05428014a03e4a6e97dc1ad79572aae74712a5cf41017f8c5c84f2b289888de9cbcf75a93d153453da85bbbac27846d531235ff50a4969b586417
 EBUILD qt3d-6.9999.ebuild 823 BLAKE2B 58c9f78dd834a06248de278fc0d9659eb392632515a2882a415c85802be3311f326a5d2bf14d32ee11ca51d63a02d83bfc16a2b2a075ad35d8b2e668e17148db SHA512 9db8c05d09a05428014a03e4a6e97dc1ad79572aae74712a5cf41017f8c5c84f2b289888de9cbcf75a93d153453da85bbbac27846d531235ff50a4969b586417
 MISC metadata.xml 692 BLAKE2B 807ac52bd34ad8ea6471eb7b03703f20951c941a2b5841fa173796b4d9b3bdee1afc79fb83057a5bd6329db5cf656c0c5afdc6ece087684c14e0a581c91eed69 SHA512 5894daabb0fbee32e8fbcdc35f720f2f3225bd78ac632491d4603650db49c79c41fbe84d1cfde15870ed7a17c39c98cb5572ca5ed1da7fe5311faa7b2b750aec
diff --git a/dev-qt/qt3d/qt3d-6.7.1.ebuild b/dev-qt/qt3d/qt3d-6.7.1.ebuild
index 376b512d5c8e..db2eacdd658c 100644
--- a/dev-qt/qt3d/qt3d-6.7.1.ebuild
+++ b/dev-qt/qt3d/qt3d-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="3D rendering module for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~riscv x86"
+	KEYWORDS="amd64 arm ~arm64 ~riscv x86"
 elif [[ ${QT6_BUILD_TYPE} == live ]]; then
 	EGIT_SUBMODULES=() # skip qtquick3d-assimp
 fi
diff --git a/dev-qt/qt5compat/Manifest b/dev-qt/qt5compat/Manifest
index d93b4c53b8d9..6f1e2e55ec45 100644
--- a/dev-qt/qt5compat/Manifest
+++ b/dev-qt/qt5compat/Manifest
@@ -1,7 +1,7 @@
 DIST qt5compat-everywhere-src-6.7.0.tar.xz 14629204 BLAKE2B e7227cee9a73f2f06cf060dfeedc03abefb213363fe866d908abc1d4f144f442d590792584cfe90145c6ddc70fab1da1b440a146cca6495c534bca2419d01c7d SHA512 92115ca88b839171cf69360e0c3add64bb84305fdc28b9459da5eb69df79bfc2884616991ada898242e3614ac4f188dd76aa17889b5fb7fa72316a11efd61c85
 DIST qt5compat-everywhere-src-6.7.1.tar.xz 14631152 BLAKE2B fe1927c1f38640be653048868274af4155c7b5c788071fc816b8e9bba97aae62ec7616f7d78d1c76f317fcd99c9eff2fde357eac309f229665f417b2cadb9f66 SHA512 f6a3552f6aefab374bf3e483774dff10c9aaebee7085b81b1487a0ed6fb7cff072d9f97bd199ff3e9fef6838d93aa015dec58c5b5e11f6eb4fb062a0ca015e52
 EBUILD qt5compat-6.7.0.ebuild 704 BLAKE2B 3ce34bc419a1dacd9429ad76ec7bcc2fa7fdb7edfd5a9081fbec6e6dae5fba209fff8a82c53801cf89c314f8742eccae3c0a9cb4c394b2eae513102753a76476 SHA512 524ec5bfd3b9a757eb58ab0f7d9f9484e97e566c81b42ff5852554ea0658320f6094b7e6246cb2183576c12ea7e3ae1c774c2f4389329271819708ffea097b7e
-EBUILD qt5compat-6.7.1.ebuild 703 BLAKE2B df9f2015b556e5cc4a1426c44c0fae7f2a0ca2ad905a900e605437351397d0f73bd2a74ad0be0173e64f76ac2ad0fe3fea68f193d6fb8b648dfce06e243db61f SHA512 e3972df930b4ca4febb4951c1d00a913aab8cc9bc262fdb67edce4525172611f568445fda6a1c28d44e3d885709cd6e47b16cb4b4b7aa817ae74f79443528ad0
+EBUILD qt5compat-6.7.1.ebuild 702 BLAKE2B 745976c9e23bf7c036b3d229ac0130453f824da077f0484bd131d7dd186e3188a9d87f381a6e65b383b23eb96c733f9278cf2e15ac4fe0b8e5c72898097c0286 SHA512 d6ca9a435d3ca6c781f7a23d9a9daa03d5d2a8f1fb364c6f46258d2eccb8b2a019d88b701a05f7df75692303137b830337286cf381afd874bed0a695ecbbc805
 EBUILD qt5compat-6.7.9999.ebuild 706 BLAKE2B cde702b26ce3213329e1e6ee6030feef199a81cd89725f65aaf5c350da27de100e5cb1592065c11ce40bb2396b80b9053b56503aa6bdc13baa38774a1788823c SHA512 20c6f09f176449d81646a8d576db355544f4093f24be2ef970bf83d55d2eda867c21e027985fcd309deacda4fad4e6741815ab7b20787f017e5f68d84fffacbf
 EBUILD qt5compat-6.9999.ebuild 706 BLAKE2B cde702b26ce3213329e1e6ee6030feef199a81cd89725f65aaf5c350da27de100e5cb1592065c11ce40bb2396b80b9053b56503aa6bdc13baa38774a1788823c SHA512 20c6f09f176449d81646a8d576db355544f4093f24be2ef970bf83d55d2eda867c21e027985fcd309deacda4fad4e6741815ab7b20787f017e5f68d84fffacbf
 MISC metadata.xml 614 BLAKE2B 0398cf879d68d52becdfe5098503b6c40b9e84f6a0d05f961d068235a0caff829fd930027c0bd736dbae76aa5b00ee3f99c6e303120fe14b6da3789ee7781e7f SHA512 ebf0f12d0a42356a915c06626046498273659cba209a0537b69cc27da2b5dc721c49cf4180d1a7137a34b89ac1ee39d95295cbebb83848c1f63b786b1eaaad7c
diff --git a/dev-qt/qt5compat/qt5compat-6.7.1.ebuild b/dev-qt/qt5compat/qt5compat-6.7.1.ebuild
index 3be223e0b3de..44f457932756 100644
--- a/dev-qt/qt5compat/qt5compat-6.7.1.ebuild
+++ b/dev-qt/qt5compat/qt5compat-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt module containing the unsupported Qt 5 APIs"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 IUSE="icu qml"
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index cada8023ff41..7572e5ae972d 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -8,8 +8,8 @@ AUX qtbase-6.7.0-qspan-ifdef.patch 1027 BLAKE2B 3ab8bb2b3ec7017ae8e6ef884e1acc67
 AUX qtbase-6.7.1-qeventlooplocker.patch 7083 BLAKE2B c2413fda052de5d5695050a5bfcd7dea3ff10f0ffb904e5368ef60a25f31b4599313ebfc36d546ca1d9ebff3df38a63ba0725dabf999d919b67509af26a2c815 SHA512 1fd2115fedb413459d961c6047a78713c6393e87325e8adf74d50730586438e5bb7c7ce8b26528a6721c98421275a0f842537a19399fd9818cc5b57123f44438
 DIST qtbase-everywhere-src-6.7.0.tar.xz 49314276 BLAKE2B f4ec35fd3c15d56a28e1608dec927eaf34d84c2250405d921adadc16d90ec148f4983024dcf9be1832de91381d18e33fd7578d60d8654469e23530a210618e11 SHA512 72896cc5a677361779f49d60dbdfc33a21d77bd479e0586b0beb03eee2016d613aee56e798143a489431a07a5e7a7db4c7c046105a11b63dd178768f3a7f195a
 DIST qtbase-everywhere-src-6.7.1.tar.xz 49324536 BLAKE2B 5e5a5801c29c1ac541812931cd56709a934a500ce4d5a38e7d3776620cb46db0d25408c22cbf33a7bcc657098c571e501fde14f523a77acba1827edd977d2bc5 SHA512 864bebfc3659907e52b8dc3f62a65d431573ef2bf406a9f71c688229083a2128c5474f75823275d11948be3d031de1d6427acf373f977df9ee9e73a27ef56efb
-EBUILD qtbase-6.7.0-r2.ebuild 10606 BLAKE2B b19d06f0dd3cc1ff22c52f5819817fe7dab5e0c0f5eda3b0db39525b68c7085daf2aa2e73190808e28021a50a372712f0b55f8116ab674c88cb9005d2f814de9 SHA512 1e646ba04eb9b31936c542a4e25c8100d4c5ce45d904114896819e40441869bd5e0d8093328396ced4f4b8c67c03ed1a4d3d67ff1e2afdff50e8adcab2b41bb7
-EBUILD qtbase-6.7.1.ebuild 10562 BLAKE2B b9ac54cbec47a697b25385dbf817efac4483594991d4ce16101b369d652a2cc13e2235a0f16cec93427b6285361cd9537b656e4141116e47aaab927841d1217c SHA512 a4868b88c5906aa413ddfaca7e4749236fcb175c2f70a1ec212a96fab8413618d39dd4052e99d37744f80be92c7d0d852839aa8da03c4582754e98583389c9f0
-EBUILD qtbase-6.7.9999.ebuild 10469 BLAKE2B 0bb3dd926ef658a36feb141ac462fb7b116c8d491db1887671b862cab1e9814ebe7bd2cac5688447c6e21b26a3701ce4f21eb576f1992bd8e174d46f58220b1a SHA512 0e3c0535a25cddfc93dbe2274164fe0559df45adbb4c32a49c12fb2e542fdddd643d88349835fcf90b1a20ec4790a53518c35ccaf51019ffb58ff86e0dd2b860
-EBUILD qtbase-6.9999.ebuild 10469 BLAKE2B 0bb3dd926ef658a36feb141ac462fb7b116c8d491db1887671b862cab1e9814ebe7bd2cac5688447c6e21b26a3701ce4f21eb576f1992bd8e174d46f58220b1a SHA512 0e3c0535a25cddfc93dbe2274164fe0559df45adbb4c32a49c12fb2e542fdddd643d88349835fcf90b1a20ec4790a53518c35ccaf51019ffb58ff86e0dd2b860
+EBUILD qtbase-6.7.0-r2.ebuild 9629 BLAKE2B 1589aad34a672aff2a8927b220c23281347180bfbdc07ff1979d1b1a19fa69c80fae913d08110a7923c9fc05c38de157e160cf44fe1ed71de5ce043be4bfeb32 SHA512 c08a929907e734992a8f9ba831f3227f27079a8fa1585b6723ec87ee88cda50a11ed7794a660231a3201bca58045a6f848170e35076665ad27a42f8a346f2065
+EBUILD qtbase-6.7.1.ebuild 9584 BLAKE2B 71de7b273d458ead2d3497efb1a5598119934e3ed6e7dac4cd905f3d4954f7c9766a53fdcf11d82cb5f17959500df9df8fd105421b7f6a710501745cfb71cd3e SHA512 87586e636ae7ba29e68b524fe3a670da661b7ca8f3bca6b41b1a6089934b28d2e6fd8ccf2ae4ffd101822ce84329ec49b6576a0107a786dccc32c3f1c304f256
+EBUILD qtbase-6.7.9999.ebuild 9492 BLAKE2B a5c489ccf944d52d6d69b4bea9493236669644d5c7349f99b7e13efb69f53a300db5c5a455e2e3b6d32669cf554faafd8118d0deba25394ad039dad020a39fe5 SHA512 5963f23bf57f0da8fac249e6fb3da120889e3a9072faca3e6443a8e2fd19d5397838c598be1bc436219a6ac73a763d1e106e209219a022cbc1c87801a5adb037
+EBUILD qtbase-6.9999.ebuild 9492 BLAKE2B a5c489ccf944d52d6d69b4bea9493236669644d5c7349f99b7e13efb69f53a300db5c5a455e2e3b6d32669cf554faafd8118d0deba25394ad039dad020a39fe5 SHA512 5963f23bf57f0da8fac249e6fb3da120889e3a9072faca3e6443a8e2fd19d5397838c598be1bc436219a6ac73a763d1e106e209219a022cbc1c87801a5adb037
 MISC metadata.xml 1655 BLAKE2B 1f3bdbe5f14716d1825ff0ce6d3a9439a87c0c18abd0bb6a2286c9709e815205f2f6911ef5d053b57598aa54471d4316f87c9a4d36004be15f499447785f14bd SHA512 d1479bae177f75991241eacaa1300f43d644730fa3d6d7e6e039b8a212f1289b920b6e1aad7c56576857049f133492f5cf648c7931228c6c4ee272d93437e351
diff --git a/dev-qt/qtbase/qtbase-6.7.0-r2.ebuild b/dev-qt/qtbase/qtbase-6.7.0-r2.ebuild
index 203bcb3c6d6f..b3b3f80bb86a 100644
--- a/dev-qt/qtbase/qtbase-6.7.0-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic qt6-build toolchain-funcs
+inherit qt6-build toolchain-funcs
 
 DESCRIPTION="Cross-platform application development framework"
 
@@ -248,37 +248,6 @@ src_configure() {
 		$(qt_feature sqlite system_sqlite)
 	)
 
-	if use amd64 || use x86; then
-		# see bug #913400 for explanations
-		local cpufeats=(
-			# list of checked cpu features in configure.cmake
-			avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
-			f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes
-		)
-		# handle odd ones out not matching -m* and macros (keep same order)
-		local cpuflags=( "${cpufeats[@]}" aes sha )
-		local cpufeats+=( aesni shani )
-
-		local -a intrins
-		IFS=' ' read -ra intrins < <(
-			: "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
-			$(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
-				$(printf '__%s__ ' "${cpuflags[@]^^}")
-			EOF
-			assert
-		)
-
-		# do nothing and leave to qtbase if no macros expanded (test failed?)
-		if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then
-			local -i i
-			for ((i=0; i<${#cpufeats[@]}; i++)); do
-				[[ ${intrins[i]} == __* ]] &&
-					mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF )
-			done
-			mycmakeargs+=( -DTEST_x86intrin=ON )
-		fi
-	fi
-
 	qt6-build_src_configure
 }
 
diff --git a/dev-qt/qtbase/qtbase-6.7.1.ebuild b/dev-qt/qtbase/qtbase-6.7.1.ebuild
index c3bbd67f3fa5..8fcaa6b8b960 100644
--- a/dev-qt/qtbase/qtbase-6.7.1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.1.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=8
 
-inherit flag-o-matic qt6-build toolchain-funcs
+inherit qt6-build toolchain-funcs
 
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 declare -A QT6_IUSE=(
@@ -247,37 +247,6 @@ src_configure() {
 		$(qt_feature sqlite system_sqlite)
 	)
 
-	if use amd64 || use x86; then
-		# see bug #913400 for explanations
-		local cpufeats=(
-			# list of checked cpu features in configure.cmake
-			avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
-			f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes
-		)
-		# handle odd ones out not matching -m* and macros (keep same order)
-		local cpuflags=( "${cpufeats[@]}" aes sha )
-		local cpufeats+=( aesni shani )
-
-		local -a intrins
-		IFS=' ' read -ra intrins < <(
-			: "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
-			$(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
-				$(printf '__%s__ ' "${cpuflags[@]^^}")
-			EOF
-			assert
-		)
-
-		# do nothing and leave to qtbase if no macros expanded (test failed?)
-		if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then
-			local -i i
-			for ((i=0; i<${#cpufeats[@]}; i++)); do
-				[[ ${intrins[i]} == __* ]] &&
-					mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF )
-			done
-			mycmakeargs+=( -DTEST_x86intrin=ON )
-		fi
-	fi
-
 	qt6-build_src_configure
 }
 
diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index 016279f8fec5..fbe1ce6c1da1 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic qt6-build toolchain-funcs
+inherit qt6-build toolchain-funcs
 
 DESCRIPTION="Cross-platform application development framework"
 
@@ -245,37 +245,6 @@ src_configure() {
 		$(qt_feature sqlite system_sqlite)
 	)
 
-	if use amd64 || use x86; then
-		# see bug #913400 for explanations
-		local cpufeats=(
-			# list of checked cpu features in configure.cmake
-			avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
-			f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes
-		)
-		# handle odd ones out not matching -m* and macros (keep same order)
-		local cpuflags=( "${cpufeats[@]}" aes sha )
-		local cpufeats+=( aesni shani )
-
-		local -a intrins
-		IFS=' ' read -ra intrins < <(
-			: "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
-			$(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
-				$(printf '__%s__ ' "${cpuflags[@]^^}")
-			EOF
-			assert
-		)
-
-		# do nothing and leave to qtbase if no macros expanded (test failed?)
-		if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then
-			local -i i
-			for ((i=0; i<${#cpufeats[@]}; i++)); do
-				[[ ${intrins[i]} == __* ]] &&
-					mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF )
-			done
-			mycmakeargs+=( -DTEST_x86intrin=ON )
-		fi
-	fi
-
 	qt6-build_src_configure
 }
 
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 016279f8fec5..fbe1ce6c1da1 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic qt6-build toolchain-funcs
+inherit qt6-build toolchain-funcs
 
 DESCRIPTION="Cross-platform application development framework"
 
@@ -245,37 +245,6 @@ src_configure() {
 		$(qt_feature sqlite system_sqlite)
 	)
 
-	if use amd64 || use x86; then
-		# see bug #913400 for explanations
-		local cpufeats=(
-			# list of checked cpu features in configure.cmake
-			avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
-			f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes
-		)
-		# handle odd ones out not matching -m* and macros (keep same order)
-		local cpuflags=( "${cpufeats[@]}" aes sha )
-		local cpufeats+=( aesni shani )
-
-		local -a intrins
-		IFS=' ' read -ra intrins < <(
-			: "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
-			$(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
-				$(printf '__%s__ ' "${cpuflags[@]^^}")
-			EOF
-			assert
-		)
-
-		# do nothing and leave to qtbase if no macros expanded (test failed?)
-		if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then
-			local -i i
-			for ((i=0; i<${#cpufeats[@]}; i++)); do
-				[[ ${intrins[i]} == __* ]] &&
-					mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF )
-			done
-			mycmakeargs+=( -DTEST_x86intrin=ON )
-		fi
-	fi
-
 	qt6-build_src_configure
 }
 
diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
index f3c43bc05878..161751402d6f 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -5,7 +5,7 @@ DIST qtcharts-everywhere-src-6.7.1.tar.xz 4661252 BLAKE2B 7e7a6f203929548f15bc77
 EBUILD qtcharts-5.15.13.ebuild 572 BLAKE2B 4a97d46f334a3dd2713d3a5727a5136de4f2c28e15dcdf67ef012c5d40bbd94cfbd5e514d4be76fac371dca2e6904005e2c5f91ded85e22b2d6aaa436338a7bc SHA512 c9538c9286a6748a271346215f6de61548d36f37d559dba29cad9e039d1a2822013d1abd9b6fdb8fb38e940c3e917c158078022e8eb40f6277603567286f1a98
 EBUILD qtcharts-5.15.14.ebuild 573 BLAKE2B d1a1a65b30e769b1616b30ac7962dcb567ad3b23d20e748ad227dea3be01ba02aec0ac0cee8fcae576528d5676a06e0222f3ad7410ee6d2b1744c1119bf9f3db SHA512 151d55acbfef175ac9449cdd487a46d666148ce6eeb2ba8609747a116bf3162354f4671614b7702ae18202644b5e168e46cf2b1421e2064aa2f2f8a444f6e75f
 EBUILD qtcharts-6.7.0.ebuild 570 BLAKE2B 98b620f6328ba26d55e1814c753b4284b519a4dbe11da9556ad857de5d2935887aa455c3be8910620bef275d737c812d9f091f1c960d6c063224d776d9948bcf SHA512 8b838d6905728e8737e4f60e0b996e102b08d0d273ed970c9b671db8c97934e4f041b9ea53d25803e15ac7db216044c2cf99ed6327a203fa63f32929d23c152a
-EBUILD qtcharts-6.7.1.ebuild 569 BLAKE2B aebc16773a68e8a6bb361cb9bf0f74122de4ea94269da08555a59790af1280ad08f7735e5320da1a3d0da15c1575d817a130174a0540f684aa11f8215e7ed5eb SHA512 06e65f832881f375bf71914914f05ca2d2d9789ae9e024ede414fef34552e40467f71ce6299e5a5a14793f52c1f7cba69ec61e888eeb4b6be38837035e0d6b0d
+EBUILD qtcharts-6.7.1.ebuild 568 BLAKE2B 3dd767495a1d3b52a90bbf9f0608de81099a1bcbb69d5e196355e157fe3bb722290ccff48493cafc76686a3e8f634371bdee860f7cfeaaea7e13694589e856cf SHA512 dcf9157b6bdcf85dbe0880b3ebdde80b6900f71d5c8a8e049f0c589f1b683194d7a4c045558ea863c8638a935b0bdc3911a1af64b95111c4c607e90eb4191e90
 EBUILD qtcharts-6.7.9999.ebuild 572 BLAKE2B 2a66f1efed7d379f9ccf64644560d8058b4ff0e93891f70aeb05f83d908f0ceb7f6dbca008c34fc097bc3460ce9a08a91c85abb43de57b8b537f4c05b18d415c SHA512 5f42c00286e8efb41b97e5ccc609f0390d7f75cd8c1c6744f89c248e6e22d2b5cb69a4064c21b010ca3ad684ac2cfa24ddb374065b8334276f2f03036bcdf215
 EBUILD qtcharts-6.9999.ebuild 572 BLAKE2B 2a66f1efed7d379f9ccf64644560d8058b4ff0e93891f70aeb05f83d908f0ceb7f6dbca008c34fc097bc3460ce9a08a91c85abb43de57b8b537f4c05b18d415c SHA512 5f42c00286e8efb41b97e5ccc609f0390d7f75cd8c1c6744f89c248e6e22d2b5cb69a4064c21b010ca3ad684ac2cfa24ddb374065b8334276f2f03036bcdf215
 MISC metadata.xml 613 BLAKE2B 693aba98343908132ab23149d09ca0e9a99c3af498ac177469d63fb87a5f782b31f92a70941c33bd9f5d82cd0dccb2a2fe7ddf9321f9644401b0603cd99fd21e SHA512 33ee8e1edf4e713a4081af40e7d1b17ae1dcfa390bb6b2dc908d4c1e0ad010b588f65ce1f592bbccaeda21fbab70aaa777d6809ad75e15238c27f40421a78e77
diff --git a/dev-qt/qtcharts/qtcharts-6.7.1.ebuild b/dev-qt/qtcharts/qtcharts-6.7.1.ebuild
index ea1c087e55e9..cd530c7da12c 100644
--- a/dev-qt/qtcharts/qtcharts-6.7.1.ebuild
+++ b/dev-qt/qtcharts/qtcharts-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Chart component library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 IUSE="gles2-only qml"
diff --git a/dev-qt/qtconnectivity/Manifest b/dev-qt/qtconnectivity/Manifest
index 7680c7db1128..1bbe590914a1 100644
--- a/dev-qt/qtconnectivity/Manifest
+++ b/dev-qt/qtconnectivity/Manifest
@@ -1,7 +1,7 @@
 DIST qtconnectivity-everywhere-src-6.7.0.tar.xz 1060904 BLAKE2B 83669930846e57495c193b467c8a004eb2a61017934b5f1c8ecb39de24f538b40671dc06ec558e0809e131f008abc16826a246abbe5acee59ebaf69849070652 SHA512 bbdb6798a9cca5ec523d0f06aa3e1ea0024e4c7bd5cba765ad87b7b2f40ec59bd2a557bb45224bb3490c818292ccf04283f7c5d47723d95d83f2edf85c214b78
 DIST qtconnectivity-everywhere-src-6.7.1.tar.xz 1061900 BLAKE2B 30cb15ba6a0e08fccfd0f3ce9a9ec36a0902e3fa15bdd0791e166371c6baa31438c141c7bf5c57de0287eeee04bae87aaaf4800eeaa3062ab23d541e577cce3a SHA512 28496a2a7338f71bb51fbd8fa1b23e4e2e14e6fefc6249ce0eeae8d19b7740a70eed1c312c5d5a79344330001592acd4048c134382cdc168cf4d30e9760dbdc2
 EBUILD qtconnectivity-6.7.0.ebuild 1681 BLAKE2B 8e929edba51a2533cf46bef8d06a61ccbc6be3d064b90e61838bcccfc4696f4b71278cfcd9edb2b826b8937dd59c7741b2c6d5d300bb6dd34f13b3701a7598ea SHA512 193158675dad56afaf708c19645a38abde0fb4aaf2e3d27980245c083848832db1477c41ec6c72f80cec3d717aacb0ec9c2d075eb77b52f9d76644c52237e01d
-EBUILD qtconnectivity-6.7.1.ebuild 1681 BLAKE2B 682bbde8786c41bde1519ae73a741671f8f0b11aeb9ee16e625eb8a11fc74ebe08336a9d19ff8bd5180490f183483cec7c293815439239b72dd53d93884ca364 SHA512 921246609933649305ed99a0eeba24529abffd1b2b49109b2da275b2aef06a9b6506493b4d559f4efcabb881b2412abfcce9dc7db2a5f7c066b71c11039871c4
+EBUILD qtconnectivity-6.7.1.ebuild 1680 BLAKE2B 60fc15ab6e1e245aa56eb308f3fa4cdf26c124803012193b8ba282862197d8717d63424db0d58c495cfb36038f10dd9533e3bc7b7c68f8ae2c6d70f221aebcdd SHA512 e63091ab3e244bb2f3ded940dab1e60e937af40eb586881f847970c9ea1d4b8ae1d42bf5a374eccbc04dfb02fe8d51cd8703353901d795caff69b0216808a3d1
 EBUILD qtconnectivity-6.7.9999.ebuild 1683 BLAKE2B c94145ac24b7545954637500dccde31df3584699c47893efd00866c3d255460a4021c881b68dd448f4156ff9f0ff54eef8461a9ab478bbed9ee875c848148a11 SHA512 bbcba9e6c26ec4afc5a839e436779d95fb7d19bdc300858047240dceb7c5b253295d3f2193b581c87c1c878a409e2c34276458928990cb45b167bbe89f6a26d3
 EBUILD qtconnectivity-6.9999.ebuild 1683 BLAKE2B c94145ac24b7545954637500dccde31df3584699c47893efd00866c3d255460a4021c881b68dd448f4156ff9f0ff54eef8461a9ab478bbed9ee875c848148a11 SHA512 bbcba9e6c26ec4afc5a839e436779d95fb7d19bdc300858047240dceb7c5b253295d3f2193b581c87c1c878a409e2c34276458928990cb45b167bbe89f6a26d3
 MISC metadata.xml 637 BLAKE2B 5e9bcc7a56c93b58d09022effcbef407532e6248bda88bd0eb6a2d1c0094b9715b867025e464870bf9c6ee644c020538d8210ae742fcb55be1b795f50bfadbce SHA512 f9a9ebe77ba29217437d2afa9b05a13d421683feef94f1c64d861d9a1e081ed2ab1716453ddd66a0b93c6fecccfd11642ab69f297efbfe23baf3ad8f232197d5
diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.7.1.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.7.1.ebuild
index ae7888404419..b41fdcce407a 100644
--- a/dev-qt/qtconnectivity/qtconnectivity-6.7.1.ebuild
+++ b/dev-qt/qtconnectivity/qtconnectivity-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~loong ~riscv x86"
+	KEYWORDS="amd64 arm ~arm64 ~loong ~riscv x86"
 fi
 
 IUSE="+bluetooth nfc smartcard"
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 575b6f42c548..ffc56b6bb014 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -8,7 +8,7 @@ DIST qtdeclarative-everywhere-src-6.7.1.tar.xz 35624448 BLAKE2B e3518c5882f8789d
 EBUILD qtdeclarative-5.15.13.ebuild 1537 BLAKE2B c2f7b010977ed65abbe16d8b2df6ed8c29407685e014778f4f3da5b2853b6dfa6d5ce2a0d5037852d8d11894c1a33323090bd18659f7c85d8cdf56f8bf41ae79 SHA512 fd6e5bb4709174b8746d520a6fd0109e2d6b2de19d6a679fdbdcf4cf074dc778854afc2b364f7d692e6c60e0d3e3580c19e98b36368258f6e76b3a5ef2cff0c4
 EBUILD qtdeclarative-5.15.14.ebuild 1539 BLAKE2B 61f9d15895320c8a8230a8c2cfc7d4afa46f383b9e7617cc267cdd8e62fd8b6e807e985af986c4921a7e42b282090e37d86d49b6c23c1528fcac2fca7018b353 SHA512 e73ce84c1fe39d90d1ac45938a661888ed7ab2db67ad15ba5ce5cef68fa6d5920d916d7798876d2262fb52c078d9e936e145a2252dce08bc95cf78751e1ad5d4
 EBUILD qtdeclarative-6.7.0.ebuild 1146 BLAKE2B 493ced320bfc5020a3b0ca3282066747508a1fa078133fe716afb5fdc5dadab7e93517142d7487038bfb1fea292cbe93746bcfbf23a63b4f84a6c68c74b473bb SHA512 9477cc905363e0b258a06d8deab22ba72bf6e3c5426d2d0152315b9550b011fe10ff7ef9be9dc72ff2f7843189ba5516368d59244ee4363a87c80a4163425327
-EBUILD qtdeclarative-6.7.1.ebuild 1178 BLAKE2B 62bc3f7d02e1b20f479e7af4df25aef4cab5ebec066c5f76e7327bdffc1daf74a0ec6bb742910e313208fe6bef1b5119e5e4618022427d7d22d1d9b314834a49 SHA512 6cab9084b958f13be9a14eab4a37aea71cc044eb7495edba7f24be59aae091904f1f48915f6a6a337e03b03b10f8e80a96df6c418ddc7a8988f51d03c70a9479
+EBUILD qtdeclarative-6.7.1.ebuild 1177 BLAKE2B 13f56a3df1257a0a6ccd934a07ece67450012f749d0bdbd3d9e99ddbe4255f5492a9c40c9a3b0efa7d4baaec15e5d5a9a3b3a55ca59874d6eff0f8ca9de16b68 SHA512 aa1b25c832b8f17f5c8cfe874c97671392cc58855abd29cbca76c243c4b53cb6a7b9c3879d7dcbdbbf6657ea8567890d35d4bb75704ab09e9cac210423fc6825
 EBUILD qtdeclarative-6.7.9999.ebuild 1181 BLAKE2B c4bc298049c05c12f5d32f2ed71a6f2de406c09a76bf1f57b39b5b2d7fc4534b3233c80c8662aa93ed3fcac9f5fb06b0af97edb5f68005b28af4a71676fdc2ba SHA512 7f4073b2ca77daebcc41e9e72cb3a1b2a54e67160df86543904b3d35c90eb8477e4b8c364233815d084d855565ebaada290930855f0bf2ce5ae632f9b5bd6f90
 EBUILD qtdeclarative-6.9999.ebuild 1181 BLAKE2B c4bc298049c05c12f5d32f2ed71a6f2de406c09a76bf1f57b39b5b2d7fc4534b3233c80c8662aa93ed3fcac9f5fb06b0af97edb5f68005b28af4a71676fdc2ba SHA512 7f4073b2ca77daebcc41e9e72cb3a1b2a54e67160df86543904b3d35c90eb8477e4b8c364233815d084d855565ebaada290930855f0bf2ce5ae632f9b5bd6f90
 MISC metadata.xml 945 BLAKE2B 8a5d26ab3274cb9ca8b7cf3dceddcd33d9690cd20194adc63b80cd5e13e11d222d48473232b4e2cb41cecf1f51b33df4458811b6fb622a41519f0f3f0223b578 SHA512 a4c587afdbb0320e0f23f47a3ae58e2f69e86a0f539bf613c275ab0be7b9490d33d9c9de35ace02d3cfef903f3e6c7caf492cfdfa53c989b2d56e6c7288f4552
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.7.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.7.1.ebuild
index 770ac9e008ff..9dcd80455eb5 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-6.7.1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.7.1.ebuild
@@ -14,7 +14,7 @@ inherit python-any-r1 qt6-build
 DESCRIPTION="Qt Declarative (Quick 2)"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="accessibility +jit +network opengl qmlls +sql +ssl svg vulkan +widgets"
diff --git a/dev-qt/qthttpserver/Manifest b/dev-qt/qthttpserver/Manifest
index 25a6b919155a..884b2839f685 100644
--- a/dev-qt/qthttpserver/Manifest
+++ b/dev-qt/qthttpserver/Manifest
@@ -1,7 +1,7 @@
 DIST qthttpserver-everywhere-src-6.7.0.tar.xz 163044 BLAKE2B 319e19f8b1682b98b3577459ea1cf6e8069137dbe5dd48d93acfcfbc2a51eac1e592856d6901fc1f143b47e37c698ba4c08838dd0125323334c182e37e9ca5d9 SHA512 e63c87b9a8b0a2aff5fbbb012582045cd9fbd6bbbc81089707ef5d71ad078c8a9a52d443213b3e9c137c2349bb107641a267ed71d562e64b55a18abca4bea8ce
 DIST qthttpserver-everywhere-src-6.7.1.tar.xz 163700 BLAKE2B 681f9423a884fe366a4060443d70f6eb958068d9cca93033591b7bf0913b79674afa69e37af961d7dadbabe55646eed039fd84a78af7f2e64de95d20f4327a72 SHA512 08db67d93575d18650b3c210ba42a866362f1aa390fde9423af18b786bd47f83d39adbe84820db8deece4bcc4515f9f576411eba6813128a6667df55031f15c0
 EBUILD qthttpserver-6.7.0.ebuild 574 BLAKE2B 6cf58709afc0e04b157dab96c0c48f00e613eb751e50a741752b97cf6a934f99556f3c580645eb40431915d9376eaba9f3d47be99c962b7f11051ac84ff331cb SHA512 e06111695c353ee1b2991d4f0c492b1e504a29802b7177d3046690825e3b7f0a6c8e632b7eba3e100c47a6a5178826cc202ea3c0cd382c59dadbb4d530d5c4be
-EBUILD qthttpserver-6.7.1.ebuild 575 BLAKE2B affabe9fa30b9ee370823bdd6b7a34480c50a5d0371b3570aa25611d2a0b963e5239068f8d484647ef1bc8fa6fa52c635b9aaba3a087e2c70e6a3946562eeab0 SHA512 0348549a66c33c6720cc09ebe491ce04a54058254ab70be63725a94c7efa41869f660a79eeca5da91e3a59ea149b697a128804ae81f321c2920557cd9727eacf
+EBUILD qthttpserver-6.7.1.ebuild 574 BLAKE2B 6cf58709afc0e04b157dab96c0c48f00e613eb751e50a741752b97cf6a934f99556f3c580645eb40431915d9376eaba9f3d47be99c962b7f11051ac84ff331cb SHA512 e06111695c353ee1b2991d4f0c492b1e504a29802b7177d3046690825e3b7f0a6c8e632b7eba3e100c47a6a5178826cc202ea3c0cd382c59dadbb4d530d5c4be
 EBUILD qthttpserver-6.7.9999.ebuild 570 BLAKE2B 0d650d9a207c6c601dad662e173f099ca29a4b1e67c909d23617c06546849d951651489034b908182fb95a21c3299361517433f25f5aadf4cfcae56eec99b9ff SHA512 65867d14d6a7c004ce0d162af91c940bffd07c5c0eee76719e93960860fb24e3691e76740a606e68a7261d41684a8269d0330d88d33a13871fc69ee81bd2f6da
 EBUILD qthttpserver-6.9999.ebuild 570 BLAKE2B 0d650d9a207c6c601dad662e173f099ca29a4b1e67c909d23617c06546849d951651489034b908182fb95a21c3299361517433f25f5aadf4cfcae56eec99b9ff SHA512 65867d14d6a7c004ce0d162af91c940bffd07c5c0eee76719e93960860fb24e3691e76740a606e68a7261d41684a8269d0330d88d33a13871fc69ee81bd2f6da
 MISC metadata.xml 648 BLAKE2B b39d7fe6bb7c7279cc181962b9827c456d6d04428cbd2648e7e23d7376e0a9a7218f316f4ec0699dbc1856587e4a24bfa8489b3586a2b4d7f8346b0a9a7ee3c8 SHA512 78a446053addfddedf86bf0408d4c82ea76203ef0f0c8c8e1d8b23111718a2b88b9a8c0b2f919feb344851af312d1051bbd94755e176927b7679f75c8f0c6e20
diff --git a/dev-qt/qthttpserver/qthttpserver-6.7.1.ebuild b/dev-qt/qthttpserver/qthttpserver-6.7.1.ebuild
index 7583ea864f5f..a4b020165245 100644
--- a/dev-qt/qthttpserver/qthttpserver-6.7.1.ebuild
+++ b/dev-qt/qthttpserver/qthttpserver-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="HTTP server functionality for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 IUSE="+ssl websockets"
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 51361143a2e4..204bd41172b3 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -7,7 +7,7 @@ DIST qtimageformats-everywhere-src-6.7.1.tar.xz 1971500 BLAKE2B 478bfcd220d6fa9c
 EBUILD qtimageformats-5.15.13.ebuild 705 BLAKE2B 41cff8b31c082fc0803398c99d1428290c91c1c4215f7f8c1283599b47b235128653d45ad194145010eeae9407ff05d34c7cbfeb1a3680e8af855b9b1cc7b4cd SHA512 d1136025cc71c0156f32ab508c37940be5216eb93343a5a7c84a22a5c3b0f126ac20866ccbb1197e051201cc2740fde6368f36a7d557a5b9b217411a27a64961
 EBUILD qtimageformats-5.15.14.ebuild 706 BLAKE2B 0dd94fbe2ab484dd8bee3b705a5d2f7ba05f39a56d2bf6484b79a5f9124bedeb372b538b7c7858e4f272dcb11d3510ea26e4d44691907826cf14910c2a86fe85 SHA512 686378a85f06ad027e79ebb4cd5ebf7cdbdbae93581ed9e11cbf5e4e442944efc424e7077077bb885d228e33f7c41c22d2dab90bd75e564a175a44e8765905ce
 EBUILD qtimageformats-6.7.0.ebuild 849 BLAKE2B f11b9b97b70df25c903ed887bd2381afaeb3a7ef1563b5ab0004a8b5e788636975ba57f53e7051aa5b86de21501d3e774225e6aad7b57d193c7deeca5baf6897 SHA512 5e41f0edf6bde06cc8c29c2959fcea0de75d1dd02154091d322b4abfbb327ce82442bdb918ac82cde24b623b486ae2ed399b9c7d75936f5add023c733d51ae1e
-EBUILD qtimageformats-6.7.1.ebuild 848 BLAKE2B 4f7a10d5eb12b6f544aa9166da0beaacb6c3565f8f30888809a9594cde0d59125f577e9260898ef3fa5784e566bd2075a2f7f4c2e5e80816f641a986e669f752 SHA512 2ba285393d3ed68c49841f6b112234f22f4f3ea1087d85c1b87568766f62afc570356f6402368b20d29a76188f6e6c410ecf4b67d4e4345aec00c12abf9ea753
+EBUILD qtimageformats-6.7.1.ebuild 847 BLAKE2B 47a2359ebe4fcc0a14087d85e351acfc02dcaa3d63f63ecd7d0a6656ffd0e82e9509add3013319bd0657b6f94d3f105f032909feb3a09c0abd7a718abd9fc6cd SHA512 76f5cbc720d87a6f6d126c480359a92edfea5a0c5b190144eff24b65c66b40da38be9df098a1ef002ea51f0930606448fe2f590045869eaf3079eab2a822433a
 EBUILD qtimageformats-6.7.9999.ebuild 851 BLAKE2B 105a8533f57e5182d3e2442b436a6709dcd438c6f9c76fed44b13b8414fbaa51341bebfb75b60911b59a4b65467186d11cef202edd1ee63305afcdf39efe9fe8 SHA512 41b629aaa477787039ee26b77501398557ff034a9c1c49f06c48eeb2ff4d07ab3ca32c4ecc04acf6b07c1bde25d8528c4dfc2fa96efc9bfefaecabe35ab9253e
 EBUILD qtimageformats-6.9999.ebuild 851 BLAKE2B 105a8533f57e5182d3e2442b436a6709dcd438c6f9c76fed44b13b8414fbaa51341bebfb75b60911b59a4b65467186d11cef202edd1ee63305afcdf39efe9fe8 SHA512 41b629aaa477787039ee26b77501398557ff034a9c1c49f06c48eeb2ff4d07ab3ca32c4ecc04acf6b07c1bde25d8528c4dfc2fa96efc9bfefaecabe35ab9253e
 MISC metadata.xml 539 BLAKE2B f82d2242ecd287674a2be5eae280a70ddca0e7c913ee5c86c7bf95c9a122c5d0d57006d5bd236afb5ef55b51d1bed6be5110c51e732fbe94ebe5b6e10fee89db SHA512 22e5e3417dc154092e816cdfe391fb7c6595532f506766da0d2ae44f8254453f57a00d0fb1b12f9d2fb10c8cec5561d85f3891991aeb2aedcd3696f2c3b31d4a
diff --git a/dev-qt/qtimageformats/qtimageformats-6.7.1.ebuild b/dev-qt/qtimageformats/qtimageformats-6.7.1.ebuild
index 339c5e418e16..d349e9d590b4 100644
--- a/dev-qt/qtimageformats/qtimageformats-6.7.1.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ppc64 ~riscv x86"
 fi
 
 IUSE="mng"
diff --git a/dev-qt/qtlanguageserver/Manifest b/dev-qt/qtlanguageserver/Manifest
index 7082d7e3183e..73db72547826 100644
--- a/dev-qt/qtlanguageserver/Manifest
+++ b/dev-qt/qtlanguageserver/Manifest
@@ -1,7 +1,7 @@
 DIST qtlanguageserver-everywhere-src-6.7.0.tar.xz 145140 BLAKE2B 216b0b8c777361416d179dc970e4adcf78310eab603dba1907ff59bb1efa958ddcfc2de131dc37597096bb7f5d54bc68fe1c4f8a92eff23ef108abdbb9251dee SHA512 b3ebfd6e3093e6105dfda173cb8e8f7686e139621a882373f9a27ff7c3b7f7e4b10ccdbc1f71cab474ae6eddca4e68733a053b0045111575ff1f49741ecfe02f
 DIST qtlanguageserver-everywhere-src-6.7.1.tar.xz 145728 BLAKE2B de0de15a57338364bde6304b6247d33e6f35efed294861b60e1d8d564da42b6b39607f438ce3b7a0544b356b2d4f035b5cb73041313ecdbdff9c771ba791da6f SHA512 492922623cdb5ba1545e9fce86cbd06bd1a1ef4532a76a54561652ee855f7367967056ba9d091812f8eb1b7cd598474bd587785f0cfb2eeec3a2cb3fd6968732
 EBUILD qtlanguageserver-6.7.0.ebuild 315 BLAKE2B 20841e633743aaeaf6f61a5ccf0ef80d88e4eaeef957b03fa4cdbb4acfba6349dd6208003ddde02092b00b818e17d25d3410b33f34e8e5fe40c544b2594a1bd7 SHA512 4eac32e1244a4a4d68061860ad0d7b6454d7485b825ce57deac8c715417a8ebffaec7ad23e3ddce840348ba96d73d3a5093f178038e4a3ae7f6f751792a26ff7
-EBUILD qtlanguageserver-6.7.1.ebuild 316 BLAKE2B d430cbe5402d5ddef39cc6f2434cff80c96bdb1b509f1867512e5088a79c10e19af907512a36710051538408ad6003e8a883e9cf2a0703d8c982e855514374ba SHA512 44bf60549f9ee619904517be2112cd4f730a16d89dde3187c4a775446ff6e84dc77a25c184414594663cf62accad605ef14b33d0d76d934556ccefa55f39cd17
+EBUILD qtlanguageserver-6.7.1.ebuild 315 BLAKE2B 20841e633743aaeaf6f61a5ccf0ef80d88e4eaeef957b03fa4cdbb4acfba6349dd6208003ddde02092b00b818e17d25d3410b33f34e8e5fe40c544b2594a1bd7 SHA512 4eac32e1244a4a4d68061860ad0d7b6454d7485b825ce57deac8c715417a8ebffaec7ad23e3ddce840348ba96d73d3a5093f178038e4a3ae7f6f751792a26ff7
 EBUILD qtlanguageserver-6.7.9999.ebuild 316 BLAKE2B d430cbe5402d5ddef39cc6f2434cff80c96bdb1b509f1867512e5088a79c10e19af907512a36710051538408ad6003e8a883e9cf2a0703d8c982e855514374ba SHA512 44bf60549f9ee619904517be2112cd4f730a16d89dde3187c4a775446ff6e84dc77a25c184414594663cf62accad605ef14b33d0d76d934556ccefa55f39cd17
 EBUILD qtlanguageserver-6.9999.ebuild 316 BLAKE2B d430cbe5402d5ddef39cc6f2434cff80c96bdb1b509f1867512e5088a79c10e19af907512a36710051538408ad6003e8a883e9cf2a0703d8c982e855514374ba SHA512 44bf60549f9ee619904517be2112cd4f730a16d89dde3187c4a775446ff6e84dc77a25c184414594663cf62accad605ef14b33d0d76d934556ccefa55f39cd17
 MISC metadata.xml 541 BLAKE2B 63c47a8da80c17d5203a53d31e6736ac288f00869b7e8291a4232966a0f2fd0cfc6b93161e996e8911d081ccca8e67675b1c8c11389ff9b8dd771b68156fdb4b SHA512 0dabf104c9e8bda0a72202e51d3e761974d12df24d8509f0a89ed559dccc3d92214ac06597d8e1c338db1c35849a35bcbfefc97c10736943f2da4168d5246a9f
diff --git a/dev-qt/qtlanguageserver/qtlanguageserver-6.7.1.ebuild b/dev-qt/qtlanguageserver/qtlanguageserver-6.7.1.ebuild
index b02596ef5aab..3dbf250ac2cc 100644
--- a/dev-qt/qtlanguageserver/qtlanguageserver-6.7.1.ebuild
+++ b/dev-qt/qtlanguageserver/qtlanguageserver-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Implementation of the Language Server Protocol for Qt"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 RDEPEND="~dev-qt/qtbase-${PV}:6"
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index c612451e20af..d0a81bb8c0c1 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -10,7 +10,7 @@ EBUILD qtlocation-5.15.13-r1.ebuild 1634 BLAKE2B 284692c84ed6349b7af4491e083af5c
 EBUILD qtlocation-5.15.13.ebuild 1629 BLAKE2B e5552627571a6b161e8fa025d5d8b21d96d8aba6b407efcaef5ccd6a17d656975904e2f927ef1218662a74dc28aa19811f2614298e3c1e653388e830d80db177 SHA512 dfe5123c519a24ae26cecb5d92b7a6a7c73722b78ed73cf66e6ebe45e09260ab119512fa6d2a48371a0830bf60e129321a2ea3b36fb13a67df04391bbe3ab7ea
 EBUILD qtlocation-5.15.14.ebuild 1631 BLAKE2B 63fff1041cbc0bf5d078ac2c224cc83cff7025cb69d4aac67c87024f60a2a1a2368542dc8fbf9941d7478d408327910e268bed5c48c0a2a6773575f853c145b9 SHA512 3a1f9fe4cdceaf010962c1365f9e0239dc04e0d6a49efec1dce7df9a587ba107e29b8135df41369b1102d5db55db4199ad2b105725a8d8adf271e6cfbf159f06
 EBUILD qtlocation-6.7.0.ebuild 1364 BLAKE2B 17a01a614a1b6bbd919d75b85694dcb62260bd9ee729070f5ccec605e9d1e559182445ae24f57fe83f6f0ea88a878b7e105462796321effb13bd53d1a7a46348 SHA512 f31f640f66f0dd9e1d0c00e54eb8fffbf35613eea1e323686bcfa5c63f1f1fa5c66f3034f7486bbe64138e84916ac3170c374ef641ecdbeb624371c820ba0ea1
-EBUILD qtlocation-6.7.1.ebuild 1363 BLAKE2B 803bae85e5096f56ea35c2f9ca6d1dcd0585d14e0ee8b75bc6b4024af860779cc2263126659c7f4b4f9b1d2440c31f98a5b76a1edf485474722f323a3f1bde28 SHA512 9ba07abe6cc1c2e443888019c785a0b334742c9b06f088916a2daf405196ae3af59ea58f933c11062b4d6b0f2ad372a5107a466e252d9676849ec1f77a56a20d
+EBUILD qtlocation-6.7.1.ebuild 1362 BLAKE2B c44ebad27f9a222f50f8d3214d4700a9e2e65a451aab3f18301a02bacc4b0e994c7ec82576759da0b518917e2fb25e5d017b29ceadb67f26aa8ab9ee094bef7b SHA512 947aaa67afb862e0f21ba3f2745eae15b64111c77b0685e7b4f7705f11b3311b3ac2edf8bd2d7a702f24e656aa824ef90059c04922d38b893268b65a3a253629
 EBUILD qtlocation-6.7.9999.ebuild 1365 BLAKE2B 54c4b5a317f925182d109b82e3940c8095dc4d67c62919e4decdeba62453c65162c2e6c1bcc993f1da87434ac86f55ed76ab59cf1287b03f0159016abf6d7150 SHA512 aa50934b8de80b6aa8dcf9a5286c12ea09a9e0291916c41b6667519c858e621020febdd77d34320a51ce6147f4dd29340871e128fca57b2490d42457f4503f76
 EBUILD qtlocation-6.9999.ebuild 1365 BLAKE2B 54c4b5a317f925182d109b82e3940c8095dc4d67c62919e4decdeba62453c65162c2e6c1bcc993f1da87434ac86f55ed76ab59cf1287b03f0159016abf6d7150 SHA512 aa50934b8de80b6aa8dcf9a5286c12ea09a9e0291916c41b6667519c858e621020febdd77d34320a51ce6147f4dd29340871e128fca57b2490d42457f4503f76
 MISC metadata.xml 535 BLAKE2B 061ed9abebe579a38a262451a5e72d112adbcf4693078042f3b55be8d16b7bd430198edb732cd127deccf8c67d444b9951dd7ac8e2d0fef7de02913a3a8ba644 SHA512 823b03655b8bbb923d38d4f8358898beb2e2fa34d36e2d8d843e164027d58eb044a3e661b8dfc12cda123f15fd07d0987874b81543c47e46c670c25fa35dde87
diff --git a/dev-qt/qtlocation/qtlocation-6.7.1.ebuild b/dev-qt/qtlocation/qtlocation-6.7.1.ebuild
index 7fd0ae2b349e..6c9fc174029c 100644
--- a/dev-qt/qtlocation/qtlocation-6.7.1.ebuild
+++ b/dev-qt/qtlocation/qtlocation-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~riscv x86"
+	KEYWORDS="amd64 arm ~arm64 ~riscv x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index bca84927b9c9..56b07ccabe4f 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -7,7 +7,7 @@ DIST qtmultimedia-everywhere-src-6.7.1.tar.xz 8362120 BLAKE2B 2dc442d9ee1290507e
 EBUILD qtmultimedia-5.15.13.ebuild 1511 BLAKE2B 81fd1f3d666a9c3da203ccc37ef635954c25d00e1928be7d2250fe7a8bbf564da4e61c2e1be07afc7bc51ac340c0605d241ef5bbcf5e1ec846e528886b8f6aea SHA512 5dd3b3f0b22029dadf98e404d4be3557eb335e666fc08ea7bd39134f9770433fe5e35524ca9df6e89deb342e2b8e03a679e0e7718d534693cb0191c618162b91
 EBUILD qtmultimedia-5.15.14.ebuild 1513 BLAKE2B e19a86a79b737b022870f6f8718ff0110282a7bca227937e1664b625d43aadb4934d7d1c77172512b5f8e63e2a185fec2c5b01b3ab58fad96282688d4f22832d SHA512 2933288a987b9cbeb863743fafa71a6974e3773dd63dd32da0e7fee5908ed004ffce80faabe4f4ee8ed43d7fcd275dd4b244d5cd882d86e420ed4157859f0f6e
 EBUILD qtmultimedia-6.7.0.ebuild 2702 BLAKE2B c6fc5c5e440c868c1d37c26f2e3554594ec0e120129c9026ee5c0a3d307cbccd4ddeacde0d44c6b2d257ee411220c984239d0c2dd88300a47b46ad48296d9e06 SHA512 fec076e72de5f395ea3dd46365a4cedbf13b505c7df024f79992a071803b11fc809c47b74b130d51d2591b64158e13e83a12c61f0a328acd8eca55402d0b3644
-EBUILD qtmultimedia-6.7.1.ebuild 2725 BLAKE2B ce5cff0d90565e68ee5e87575967e8ba4e5f37c3e7e0626bc24340b313baa1d844d61d4de10469d0d8704affc026d88b83669d0dc2a0201115d512327df9a05d SHA512 7fa001ccd648606950704d56a31dd2c8214dc87219045890e64dec4daffff670c6abd643d93c554c307118018454318203399d3bd6fa2ac937beb429a5c25dca
+EBUILD qtmultimedia-6.7.1.ebuild 2724 BLAKE2B 10e18c20e92695cb962064a67c0a953082ae0169596a8dc3d8f48985b52337c112bbf6e8224395a28eb16c106553cc8ce1e4d4caa757e4fd2f3d94fd41c5f8e4 SHA512 c7317dd0751dedc2adfa243236c0f6fcfeba26fe7f6bd9e828d0b33e90f2f8e6e06e46a03fd08c865808aa230546f802a6abf36980c2a221874408f4f2787981
 EBUILD qtmultimedia-6.7.9999.ebuild 2728 BLAKE2B 183da22be878b7fddf6af1b6a88927c9e38917308d19c28400933d82c7c332a741a2385579f2b2c63ab84a5353e71bc8eabcc38cec4b50da0f81059a7ce08108 SHA512 47f4e25c9a44eff18fa7300dddcd33d88b02da61433112fbc1bc74648e469454aef72ab9cca067bb4742bb5a2fc7029afd9e92713656e56607fbbd5459762d50
 EBUILD qtmultimedia-6.9999.ebuild 2728 BLAKE2B 183da22be878b7fddf6af1b6a88927c9e38917308d19c28400933d82c7c332a741a2385579f2b2c63ab84a5353e71bc8eabcc38cec4b50da0f81059a7ce08108 SHA512 47f4e25c9a44eff18fa7300dddcd33d88b02da61433112fbc1bc74648e469454aef72ab9cca067bb4742bb5a2fc7029afd9e92713656e56607fbbd5459762d50
 MISC metadata.xml 888 BLAKE2B bf3f5b1376585d4aa9021aa838b486b8143e5fbf7c5bf7c7324500de96ab86fd0176993567f97f5e5d115284f8c3ccc16475f787407d747689aefa82cf9a9534 SHA512 98e962234f1ed462444e5f7f3e77a08794b2d0480df7773e822a5671cdfbf708b51edfafacffade2ad5f8b177d89cc0d53b975ef181be66b885c17db2a4a542b
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.1.ebuild
index cb69de926f86..cd60950c95ba 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build
 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 IUSE="+X alsa eglfs +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan"
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index 7b581a1f8278..1ef050a6f133 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -6,7 +6,7 @@ DIST qtnetworkauth-everywhere-src-6.7.1.tar.xz 144184 BLAKE2B 8a08b5046a55b5444f
 EBUILD qtnetworkauth-5.15.13.ebuild 402 BLAKE2B 800ebd6400530326ecd665b3a776d1109ce956564786554b33bf378db0dea570993a347aa7f5a195ddc1889eae58353ea9954b5cea6aa9438b2da6aefcf93901 SHA512 003748464fbd3eab1d60586909c98fa38a3f7f1819d2967dcbaa94f235290587cdb09ff92e86a59612f0a9174f41902559f4fab9e9e8edd5ce7323e1bdb5a461
 EBUILD qtnetworkauth-5.15.14.ebuild 601 BLAKE2B c431059ebe441ffcc6b1b7f63d1835a8312532befbd64510de5fea00b5d2b8d3db9431d022ce60feacc16434a06400002a89951254b6e6ee6ff1c76a509df915 SHA512 8d12c5f7c18cafe553bf338f454c19b496f1eb2ceba8665668653aed7fffb75f276014728ffb9c0ad391ea445bbda279f7958c1aa6e43529c0de26bb7dc393ff
 EBUILD qtnetworkauth-6.7.0.ebuild 346 BLAKE2B 53980dd0abe2bd33cb58b5245ceb729cd53d10b0b552649d8aa5321a218de92d508d90a5373375c6cec4a0da04efeaab1c5f2e1deb10eff3c3c92889f87e29f7 SHA512 2c2502aec5939613d663ae5576ef373a8d2f8e028b0356a5dd6410989fba230e39af7c4bc03ff4063b305e9c794732e8f09a8906332e8c67460d8d6e5b579197
-EBUILD qtnetworkauth-6.7.1.ebuild 346 BLAKE2B 2ba081abd938111ce031f25d2eab71a206dcea972e9d26f5079f58be32e78e2f9793d6c2f107617d17a21756dc9ad7c05df333999b41088bd7c78e9281b5c488 SHA512 e7a97ed7e686992a8aebb624d1929c6d22a856dbbe1033ee4dd880e0d41c95af3d19570633b79bac6fa6aae2d2794d43aa6e75f21667d3a56f9f5e25eb45952b
+EBUILD qtnetworkauth-6.7.1.ebuild 345 BLAKE2B c93d5e345dcbc071b76c17c326c38275b5ab35ef7853590bfa9723fc513d8d66f548eb2256aee4b5314d8eb340d5bfdbe6dd37cf47ace15b77dd2d95b4bf2bc5 SHA512 de0ba0c65da2102e8fded8bd1d1a4251a9db88e236f033a0a9e032249784c55de1bd372f0adbb5ca4ee205d3616cc0da76b043540268b100019d6d8e97f2940f
 EBUILD qtnetworkauth-6.7.9999.ebuild 347 BLAKE2B e2d40e13fc8366a1c6bb194b5e2229a21eaf958e9536718a6619c194e3d2343094334c1590ced43f7357bebf88cafefae268c1a45b61dd59fd26dc7c835f7e9a SHA512 2010b904714f3c82dfcea6e265ea3fd3eaa04342f31cc46b316ee8a47b96c92e4db655c65a60a3fbacecf38e1600db21f3a466aa70f7c69c1dc790cc1e040d5c
 EBUILD qtnetworkauth-6.9999.ebuild 347 BLAKE2B e2d40e13fc8366a1c6bb194b5e2229a21eaf958e9536718a6619c194e3d2343094334c1590ced43f7357bebf88cafefae268c1a45b61dd59fd26dc7c835f7e9a SHA512 2010b904714f3c82dfcea6e265ea3fd3eaa04342f31cc46b316ee8a47b96c92e4db655c65a60a3fbacecf38e1600db21f3a466aa70f7c69c1dc790cc1e040d5c
 MISC metadata.xml 538 BLAKE2B 0bf6259826c916b9b8f57a05397c87e9d013d69739c93f1ca3eb030c7bb6e7630021b8dfcc7497cff90aa5e5cc570a5e73285001edeb40a50839d10955e230aa SHA512 5c25a747fb6f9054d5c30b4ec08b4e02435676085f5dccc1d05bc68222230f3bbf426667f7cadf1a97d7a423aa8d1d8cb55e00d9212e333646300439c81ee2f8
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.7.1.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.7.1.ebuild
index b11bb9212836..796b91765470 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-6.7.1.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Network authorization library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~riscv x86"
+	KEYWORDS="amd64 ~arm64 ~riscv x86"
 fi
 
 RDEPEND="~dev-qt/qtbase-${PV}:6[network]"
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index a3654952b63f..331df8710c02 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -5,7 +5,7 @@ DIST qtpositioning-everywhere-src-6.7.1.tar.xz 658028 BLAKE2B 9e42900658975726b8
 EBUILD qtpositioning-5.15.13.ebuild 877 BLAKE2B faaba7ce4da8906b08b10a326f4f9a211f9eae86a12135dc0f58396342b82c91a1bb2aa1e8bac4b5fb2cf6e55733d12d77cbab56b6b26ba955036f5f072ce32d SHA512 f342bfdbb38c7f13c37087b544e07cccb6c7655774e9547caff9bbf3517e02d9b1e82fd3ba47b319a17fcac1e2476134f0d71368f5af792e8579c90a5a25dc67
 EBUILD qtpositioning-5.15.14.ebuild 879 BLAKE2B 83ac9949ce877ba32da0e8754b3464cdf8199613c4d197cb762144259bb2212daf9e1336f71d31139147564f0128a17a533eab2a8483285706444ff14769b14c SHA512 798335407a97ef77e3ccf0931b06cae6442d32f6c3ace4312a08b3a5829173a6e736bf263601d3bb76d5721f57245fb4f3ee6da4f2a95c9b221c5cc7d0c72485
 EBUILD qtpositioning-6.7.0.ebuild 1574 BLAKE2B 251541d705da198e0c95d321a66ceef2bd547dce229db0a1fb322b96b02a28039695eed097d816a33a3a39cf84272363a437e6809eea6c897a0cff5b984ea35b SHA512 2f978c890b67273429c49e0eca411542b649c821444505957f4e6307030eb27afda482904d3bfd2e4183ce3b420d07275780a82c001b89cc8c2804e30f7c9979
-EBUILD qtpositioning-6.7.1.ebuild 1573 BLAKE2B fa40e7ebf5baad85a6b7cf59266c81c13db17e643d0638319eedbcbc355f2aa9643ba6f6a29d3742258dc34d13f87bd609ae35c27c4577ed84f1e675f6e93acb SHA512 494e2ce2cf669fff5a89fe98fb910825842ab6a7101716d69b65d4ee9dd308d6dbc5da8b347c5e185fe8115f0514590741f84643b5d8cea9dc41c475dc913d05
+EBUILD qtpositioning-6.7.1.ebuild 1572 BLAKE2B a7a4d1d6c5871abb64ed4a6e791b220db3d738c759191efd638c0e62d61ab1778a63a1563845c63288cbf3fd162cf6420c12227d246cbc91393b697dd9f3fad6 SHA512 9ee63d18f1630882cccf95055bc22ca57be5799f2c53f0190d999f0b217fe585e8c8d0f1d007566b0436a06827e02a7261231a329b76505eca3a4e8647cf0776
 EBUILD qtpositioning-6.7.9999.ebuild 1576 BLAKE2B 0a902084d44ef71dff03de73ca9d692b1fbe5bef21b1ce962b7ea892a707d9db46f63012d7c7378bd9314ed702a2c5d108d5c41a0a86e395033bcccb2dc029a8 SHA512 bfe20d4028ab0c0c1365db3d5f2ded0c1fe5e9e3e703cede4ca1ff57450cec65bf3b022ed364373b65c87e0bc776a9eca28a4607ef95ebdf661a17d89c3b6c56
 EBUILD qtpositioning-6.9999.ebuild 1576 BLAKE2B 0a902084d44ef71dff03de73ca9d692b1fbe5bef21b1ce962b7ea892a707d9db46f63012d7c7378bd9314ed702a2c5d108d5c41a0a86e395033bcccb2dc029a8 SHA512 bfe20d4028ab0c0c1365db3d5f2ded0c1fe5e9e3e703cede4ca1ff57450cec65bf3b022ed364373b65c87e0bc776a9eca28a4607ef95ebdf661a17d89c3b6c56
 MISC metadata.xml 804 BLAKE2B 94a5445b2839e69d26bb57e8467dd1eab0820c8511304283a4db38710e7026f5956614285526451f77188a7e25f12a638fefbe6a544424fbdc422daecefa0836 SHA512 f3037d4ef45f0490dbf9df8d57497d38931076b5e9c774161633d061ee644a0282ba390d6d95d6195b8f18d91229f055bf4a9e786717cdfc98e2fb87c0e32245
diff --git a/dev-qt/qtpositioning/qtpositioning-6.7.1.ebuild b/dev-qt/qtpositioning/qtpositioning-6.7.1.ebuild
index 68bcb642381c..3efd0b983134 100644
--- a/dev-qt/qtpositioning/qtpositioning-6.7.1.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Physical position determination library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 IUSE="geoclue nmea +qml"
diff --git a/dev-qt/qtquick3d/Manifest b/dev-qt/qtquick3d/Manifest
index c7fa50475e0d..fac15e149e2e 100644
--- a/dev-qt/qtquick3d/Manifest
+++ b/dev-qt/qtquick3d/Manifest
@@ -3,7 +3,7 @@ AUX qtquick3d-6.6.2-x32abi.patch 439 BLAKE2B 293bbae94e4ffcf6cbeda420a2f2af0e7fd
 DIST qtquick3d-everywhere-src-6.7.0.tar.xz 66175916 BLAKE2B 6e351845fd1056a1ee3cbb1f66a715c6a23b3eb2e09812e9cf262930404b3d0a6aaf52e619ac9bff502f3f07df2c54716baf262d6ffbe4cb77658d6090cd1765 SHA512 1262fccbbf7bd31aa122837998f3a903c191e70a270a2a678842e6f8209336b39f5523582e7b4ab88f0db98e357993c34f857ae2a34c7e7ac29597377459576b
 DIST qtquick3d-everywhere-src-6.7.1.tar.xz 66184636 BLAKE2B c0ae24f0a1b635c0b71e1223e5cfd2d74184b68239d4a89ebf60c9563e1577d856cc3003bf365ee6d2e4a0550eb71a851c6f96c9d0dbd555bf114d0ba524a644 SHA512 a26da739a949011c33c989456658c6f91dbc991a2570d7ac2abc78189c3daa78d5e7ea25e0f3f5828e6f9dececbd5c18b2cc67cf9d16badd36c98781fd882a44
 EBUILD qtquick3d-6.7.0.ebuild 1050 BLAKE2B 3c6e182d13510ccb0ed65808d34f58dc7e73bde5c2acf5438a48ca71a79832f9e63c2a319a1ec81c3f0ca1958a929e5820428a538e0bd04eb59ef0f8cf864c5c SHA512 3f6a955b20549a66ad25ffbd170b47ee3b667b77b23431b36d9c16c7869da48e5ae52a6cbb6c24df2d816685929eb21e00d97c1d36de766911789b5eac195831
-EBUILD qtquick3d-6.7.1.ebuild 1049 BLAKE2B dd3b28765ee25ffcf9bd9208cc021c66abb7366c85e3c4aa32ad96aff44cc799527081b967009c0be83962d65aede3c12fbc0faf6f402872e7fa4584bb9898be SHA512 5b344b12034310d34a49bb2e6f36ef6faf9be5fed9deb96cc292b26b338c8cfecb83c8cc6a93af512b5076365b05a5d543049fd1c3708fd54355dd3c12bce783
+EBUILD qtquick3d-6.7.1.ebuild 1048 BLAKE2B 65a7bcd52250ec3268b009eb0478e3bb7c7d3d06ed975949cb58de9cc12a0f115ca49b14535b6fadb181926b23e6d4a19fdfd70dc41853ed6bc0a97ffee58c5c SHA512 b122df5b3ad00b90d4e4a388548251d57c4c063dfa159018969a59e0864917cc64bc5e14c55afa90493d9f302ee14dd3bd366a623d092ded6a5f6c11167fe8ba
 EBUILD qtquick3d-6.7.9999.ebuild 1052 BLAKE2B ba4c71955c32e74452a4feeba78742133794c3fccbb4d20171da7e4b07e18f961308da857511a461a3a2dbdf0de329efad5eb07155edfde7524b270d84e962af SHA512 b9bd254fd9a64cbd82be8cdf8e61c21709ebc0428fc9b98a462b4bbd9b5224b19d0c72a41f0377821a99c7177cff86c44ca2fd00556acb3aa4ba40adf8d652bf
 EBUILD qtquick3d-6.9999.ebuild 1052 BLAKE2B ba4c71955c32e74452a4feeba78742133794c3fccbb4d20171da7e4b07e18f961308da857511a461a3a2dbdf0de329efad5eb07155edfde7524b270d84e962af SHA512 b9bd254fd9a64cbd82be8cdf8e61c21709ebc0428fc9b98a462b4bbd9b5224b19d0c72a41f0377821a99c7177cff86c44ca2fd00556acb3aa4ba40adf8d652bf
 MISC metadata.xml 534 BLAKE2B 09cf606ee911d677c4a1fb8879a70bcbb527d23f81d39fb3263aef5ad6222b7b0027069cd50b76232f45322b1da0499f2eed6264ef636f3ff0d04c0a5793ec2b SHA512 66438122b8b1d1ce0b2a98b36925944806d3616ce7f653004d2b1a76ad4dee62759bcb8f342e0aefb730765648ca9ad193f833c3596252df3dbca596a8daff08
diff --git a/dev-qt/qtquick3d/qtquick3d-6.7.1.ebuild b/dev-qt/qtquick3d/qtquick3d-6.7.1.ebuild
index 9ff6f8d67201..76a066f3aa26 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.7.1.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv x86"
 elif [[ ${QT6_BUILD_TYPE} == live ]]; then
 	EGIT_SUBMODULES=() # skip qtquick3d-assimp
 fi
diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest
index bd6199c8800f..5729d6b13355 100644
--- a/dev-qt/qtquicktimeline/Manifest
+++ b/dev-qt/qtquicktimeline/Manifest
@@ -5,7 +5,7 @@ DIST qtquicktimeline-everywhere-src-6.7.1.tar.xz 110116 BLAKE2B b9af1e99c98257fa
 EBUILD qtquicktimeline-5.15.13.ebuild 367 BLAKE2B 177d100c4cd775817bc42b853190722920cf6453a773c12de253907fcf730af3e1b146b40e519619850162c1fd6a841b32ea99926276bf05f05d0f546b4edd13 SHA512 80c731f2b961d1191f8a3573748fafd23ed73bc93b5645e107d9c4138f07d8139b47484b15d1289b0c9546de46a5e4876e33cdd4e3a899d31d1de2ce65d7bb93
 EBUILD qtquicktimeline-5.15.14.ebuild 367 BLAKE2B 177d100c4cd775817bc42b853190722920cf6453a773c12de253907fcf730af3e1b146b40e519619850162c1fd6a841b32ea99926276bf05f05d0f546b4edd13 SHA512 80c731f2b961d1191f8a3573748fafd23ed73bc93b5645e107d9c4138f07d8139b47484b15d1289b0c9546de46a5e4876e33cdd4e3a899d31d1de2ce65d7bb93
 EBUILD qtquicktimeline-6.7.0.ebuild 393 BLAKE2B 94bf68327deaad5a08b78873093ea4dc25ce04c8be6fe406cecb1114bd913ec4b197b238d3523a43a0f92ac1d7eafdcdcb2c199bbbda02f05cb063f25557214b SHA512 4eef4fe96d51c6d19295ea41f00c39a9a520d12aadd26b7a1ea6ff8b0c827f8677ebdf65048edc61990b4a271aec5733996126efceab55ac0abc86293ac726d3
-EBUILD qtquicktimeline-6.7.1.ebuild 392 BLAKE2B 1c6d825922e681d6501d913a7acf1b84af9fd4595030a4590801f33e13bf53b4c6bc2e1bee7be60c309751f8cc10af4cd53581456297d8d3d478865ce74b4e3e SHA512 a408546db0917c29d55ae6870884a5232f623352088825a65db5125251e8895c55a49f24eeed1c1d15e05a69bd7f728e7f9943363c4003d4b0b8b17356495043
+EBUILD qtquicktimeline-6.7.1.ebuild 391 BLAKE2B 1c5d8045b2bb0d01bf821e029c9b873d087b4858f40bf8cb8f78fab47d1b44115928265cad319e39647a328cdab97f79328d9560efceeae07f2c59e718260f1a SHA512 522cb3b03c281539abfbbe5616778b9e106814b21d8603ab2cb592945cd3c5299c01b0e5dd90b3ec4c0de434a3478cdf61a875186cbbb4f0c2c4670ad068c169
 EBUILD qtquicktimeline-6.7.9999.ebuild 395 BLAKE2B a6abf0944d3eb0c738d8455fde448b8418badfd9151dd30acc1ed80dbc7b65057bd88091e6372097c0470387c5d62850798fa1f08020435a5534b05b1278ae5d SHA512 29e70391521b8db27df1ac6db72797a4785ede1270136644433ac39c88ddac079aa17faf703b002eb6785510ba7c7d8df6312964fc1e798d295fa9c0f4f2c040
 EBUILD qtquicktimeline-6.9999.ebuild 395 BLAKE2B a6abf0944d3eb0c738d8455fde448b8418badfd9151dd30acc1ed80dbc7b65057bd88091e6372097c0470387c5d62850798fa1f08020435a5534b05b1278ae5d SHA512 29e70391521b8db27df1ac6db72797a4785ede1270136644433ac39c88ddac079aa17faf703b002eb6785510ba7c7d8df6312964fc1e798d295fa9c0f4f2c040
 MISC metadata.xml 441 BLAKE2B 74ac671e09bcf33c214467cee99e50cf1b0563655b52cd65916ac4e382c941f68f68ca13a5881ca4d2e85e3ef60e19ee9dd0f52d6d769dd67f89960adaac1263 SHA512 62ddfd6f5d6868707383f44f26f051308416f836373862e74f3b8af24fd6da166e31a1f0ab67fdc9c9c20e00887162f5b57a5224429e7b37c9deac44c8dca2b1
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.7.1.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.7.1.ebuild
index 7a2a32439427..22c0334a9ce2 100644
--- a/dev-qt/qtquicktimeline/qtquicktimeline-6.7.1.ebuild
+++ b/dev-qt/qtquicktimeline/qtquicktimeline-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt module for keyframe-based timeline construction"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
index 550bc156bb59..c3d75bd62bda 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -5,7 +5,7 @@ DIST qtscxml-everywhere-src-6.7.1.tar.xz 1168276 BLAKE2B e97d521ce1c239c4c6dc40c
 EBUILD qtscxml-5.15.13.ebuild 398 BLAKE2B 64f5af29a9076f0bb09b8843208e1c00358f485dfc642692a3e2be6f00c534735b0f5e192dabd00625a48f9014499963ee4fabe2d9bd3e8b5931459f5c290b2e SHA512 7e13b46488390e1aaf9ef05364c86082706f07296f1cb1955d1654e513b5dd08c91fa21267baeda80785b5fd41d3e42d5d73bed2622c5806a2487c1d46d8f81a
 EBUILD qtscxml-5.15.14.ebuild 398 BLAKE2B 64f5af29a9076f0bb09b8843208e1c00358f485dfc642692a3e2be6f00c534735b0f5e192dabd00625a48f9014499963ee4fabe2d9bd3e8b5931459f5c290b2e SHA512 7e13b46488390e1aaf9ef05364c86082706f07296f1cb1955d1654e513b5dd08c91fa21267baeda80785b5fd41d3e42d5d73bed2622c5806a2487c1d46d8f81a
 EBUILD qtscxml-6.7.0.ebuild 700 BLAKE2B e14817f8ea5aef5723969930a000996aef7a69d5362129e856f88c7dc4bae98b741d8d1df928e65893cabd27a65d4dff8821aac6394ce4df088aabb789a3bff5 SHA512 ce75de14f95cd46043e7f470d7e3d15a1d6473d2af38a12dfb48732fa2fe2c85adb7edd79db0300dc22b4ecd92ccc2d4d0146bb6ffc9b588c2574d06ecdebf5e
-EBUILD qtscxml-6.7.1.ebuild 699 BLAKE2B 7726eb49c7dffd19bfbc268b0b8b56896dc8a4cc7b746b5b3a1645deaa87808c4744a7a70f29fc5e2d11f4891d7356580ad5b6d11551d8660e9f1dfc1330d6e2 SHA512 826e3291ce8bb51089bfdf922ae30f25b50a9959469146923b87d208401ef0ba139f115ca935715a2f5ac107646990adb8e15aafb9285721e8b07b986859fe24
+EBUILD qtscxml-6.7.1.ebuild 698 BLAKE2B c03fdcb61f85d7ecfaf2343bee264f3a91f0e0186182869510932de5d5f92f47941611d928bcba8c45c2925fd9b5561b0a1cb22b83fbbbbcd1d6aafcb15613b3 SHA512 a6d5bef517c5a2c0a3db4b93697e1e20068ec117341b76b114f095fc57c7195b7ded9c7b1333ac09a1edc557ccd06a5f7aa0799e8bd497945e50c3617c3c06c9
 EBUILD qtscxml-6.7.9999.ebuild 701 BLAKE2B 3f3dc63d520a01a012cb68170e09eafa3f4b5c76c89f9e5aaee38e881065609fb699cb6e83f364a54b27fed845f86d8eb08ef1c133be7254bf639450b8766d01 SHA512 5fa304b9927a5986908eeb9b6b0d364e1d6d6a9454aed38f8774092fcfeee1d97ddb55aeebe3b0d592b5b8f934d1981ab25ac4e5f0bb050614968d0a5defd96b
 EBUILD qtscxml-6.9999.ebuild 701 BLAKE2B 3f3dc63d520a01a012cb68170e09eafa3f4b5c76c89f9e5aaee38e881065609fb699cb6e83f364a54b27fed845f86d8eb08ef1c133be7254bf639450b8766d01 SHA512 5fa304b9927a5986908eeb9b6b0d364e1d6d6a9454aed38f8774092fcfeee1d97ddb55aeebe3b0d592b5b8f934d1981ab25ac4e5f0bb050614968d0a5defd96b
 MISC metadata.xml 612 BLAKE2B 74120f98e194bd3776134a96e12add6f8b485464004a9b0bad910cd81ca00bb29d740dfbe8484067eaec788ea6d228a4148f2d9d0757ced2cba1ba0cc4cce0bd SHA512 42b0ed27db93385ca6734f2bf81a9d01b97b6658326c61f821d517a26451b27919e4c429641f7e4a27bcf26407b5c1e134e90651948064308075abd77f4fb942
diff --git a/dev-qt/qtscxml/qtscxml-6.7.1.ebuild b/dev-qt/qtscxml/qtscxml-6.7.1.ebuild
index 42871c9166d1..9dc0a14f8cf2 100644
--- a/dev-qt/qtscxml/qtscxml-6.7.1.ebuild
+++ b/dev-qt/qtscxml/qtscxml-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="State Chart XML (SCXML) support library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~riscv x86"
+	KEYWORDS="amd64 arm ~arm64 ~riscv x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index 9e6f8311135f..a70b930833a7 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -5,7 +5,7 @@ DIST qtsensors-everywhere-src-6.7.1.tar.xz 1494588 BLAKE2B 1876030016b0c98a03218
 EBUILD qtsensors-5.15.13.ebuild 566 BLAKE2B 1448b9978f85ba18bcccb00f356458bcd30d0610d48c172002c0fea61252a9966f8e6c7a9323499a6110e8d5bbe41e74744f37bd56d8601ec2c2f57b72362e14 SHA512 14e7dfe121cde2f5603c7d19d8c4d30abec0d9aa303938a57d0e3919c45e4500ca16f7e369cac8cb0b33f239c3325674815d1ac50a04d38145b16c1a7335f9b1
 EBUILD qtsensors-5.15.14.ebuild 568 BLAKE2B e2dc0aa69744dc4c5766f2c393404139b4f55ad0c7fe2ceb6323b781d4b8302a4f4d9e1d018b838963f4e512860db8544599166d42657fa9fddbe9f452402758 SHA512 a53bdfc90a8bae61736051b61ba7c517e00f95de90ef5109ec74c49632d7464b25c5709df3765d9195acc36c1614d3284f748cd6217b4b876b36e94dfa41d43b
 EBUILD qtsensors-6.7.0.ebuild 531 BLAKE2B 551931489b5cd913fbcdbbfb0a6ae5aa583c7a2f9436bfb882ad0f62a72f0ac85083a5a44b3058cfbd523668f3e8ee47a66e985c149f435f34cd6a55b2b1626f SHA512 29e7a38faa199c63b256d094ccb01709e1eb35fad7369eb91adf60f31bbd824c515a41ff630d4c7d8cd4d135f4b4b6af95ef8cd58f64ad02f939c34905074a00
-EBUILD qtsensors-6.7.1.ebuild 531 BLAKE2B 788e0b88fba66d4d5fa00a7147b870ed7ab6bf7685809bc8ee42634c45b7cff937d9bcb8af01fbf60c0f3ad4900cfb749bd08155033195631c1ac6b392624078 SHA512 94048496b6a510f0eba834f286752151ffe68352721070a507442a0426c8427a5b426c5178616a459b3775e8cf6b34dfb1c2827dec29fed51bef2432866a7250
+EBUILD qtsensors-6.7.1.ebuild 530 BLAKE2B e56301259a0ca1dadd808aefcf6ac6504c9c449fb241565ddd9e7a44814dd9f5d1598f0b356e28b8ae3d239618258dc751a22482e227f7dcd696a368291bb237 SHA512 331b04d6dff757c939163c49e10e422fd66beece438f10dbe2021fb632a3b9ffbd54ca6c9760a947ce4758ecdc3f4e41f7729d1402040de3a171197670839a5d
 EBUILD qtsensors-6.7.9999.ebuild 533 BLAKE2B 95a962dba2945c04f100d963b0146326e829a82a45c801c41e0c52008802e71a60c25543bd8df69ea1db0027a8682dc08a3f2335a75d8f645b6d2b83ab55f363 SHA512 80c142cac6b71340d7777f16e53987d52f24c643f9ef6c853d71728d88cb6751509682f570e79b408e95738ce4b6042d99f1b35a0477cfb2c7193d77307f98d3
 EBUILD qtsensors-6.9999.ebuild 533 BLAKE2B 95a962dba2945c04f100d963b0146326e829a82a45c801c41e0c52008802e71a60c25543bd8df69ea1db0027a8682dc08a3f2335a75d8f645b6d2b83ab55f363 SHA512 80c142cac6b71340d7777f16e53987d52f24c643f9ef6c853d71728d88cb6751509682f570e79b408e95738ce4b6042d99f1b35a0477cfb2c7193d77307f98d3
 MISC metadata.xml 594 BLAKE2B 93f6b9de5266ef5bba3342d149afd04d4fdb27cac760d91b7dfb866d81ff4d4e86a3de1a512815444aa825350dad45923437f5caa7fea7cf6066667f2328d00e SHA512 68d91bcb4c8904a65021a81b01474081565e55c6776d29b54a70318282ce604f8e29e75f3d7574aedf9397ec72b2c6bd1e81ed4e630a4ecf553e070baebd9d64
diff --git a/dev-qt/qtsensors/qtsensors-6.7.1.ebuild b/dev-qt/qtsensors/qtsensors-6.7.1.ebuild
index ab43216f6f1f..e775fcc2f89b 100644
--- a/dev-qt/qtsensors/qtsensors-6.7.1.ebuild
+++ b/dev-qt/qtsensors/qtsensors-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Hardware sensor access library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ~riscv x86"
+	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~riscv x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtserialbus/Manifest b/dev-qt/qtserialbus/Manifest
index b657d6d1b55c..b446fb05270b 100644
--- a/dev-qt/qtserialbus/Manifest
+++ b/dev-qt/qtserialbus/Manifest
@@ -5,7 +5,7 @@ DIST qtserialbus-everywhere-src-6.7.1.tar.xz 547732 BLAKE2B 7728063e3cca62ffde71
 EBUILD qtserialbus-5.15.13.ebuild 430 BLAKE2B 11ca9b29a206685addc9929eb1bdd1f0f2be4235ca4f8d1a374f96b8984cc9009836c158909d6fabf3d710a06f00d2becffb6bfee6ecc52fa8b793db8f61e40d SHA512 526c137d6e04dbbf06ca280b9a35403b2d05499ff1eb9cfc79cf805bc025a7e20a495f3d16858a25ebbe075c1e6d48d4020edd20457cb4ea9e4b3331a2cef9b3
 EBUILD qtserialbus-5.15.14.ebuild 430 BLAKE2B 11ca9b29a206685addc9929eb1bdd1f0f2be4235ca4f8d1a374f96b8984cc9009836c158909d6fabf3d710a06f00d2becffb6bfee6ecc52fa8b793db8f61e40d SHA512 526c137d6e04dbbf06ca280b9a35403b2d05499ff1eb9cfc79cf805bc025a7e20a495f3d16858a25ebbe075c1e6d48d4020edd20457cb4ea9e4b3331a2cef9b3
 EBUILD qtserialbus-6.7.0.ebuild 901 BLAKE2B 8d18959f882701944535851429b185b880ee98e84c2c4e5cf87248d2e74fc1e85692f1adf54aa6c4c1a9d890590eec6cf43777432938ee5278a33e40b2845a84 SHA512 2ebbee4fc1db3665588bdd1c1e8268999e07e95e4b6628a3714519257032a4ad75d985642d9b3e7d5926d195888641692681a344e25f2640f571a3f5b632555a
-EBUILD qtserialbus-6.7.1.ebuild 901 BLAKE2B 667d0711a207088d0c9686e8e6624d3ad64eb776eec87cdac4fc5c602df08ffb2e605c2befb9572ece9d67e0cb7931a996e8c9e4ff72d0e5f26efacb14a52107 SHA512 c1a3f0f0fc28ebbe7941464ab014b7853d06c2158055ac2ad6a45dc7f09b520f5d09e1b44851252c5fa69cec9df078b98650244331f47faf63fde2ac772e196e
+EBUILD qtserialbus-6.7.1.ebuild 900 BLAKE2B a8212f5f347a83f277a94b61f552b34ada5574fde237693e1415c7cf8be8d1895386ffec3c88e8b8add5ce05f02ec799966ed0b7978d4caa4c6d5d34a4fd6183 SHA512 2283d8ad2911a159b34f8af5b0b3dac1788072a21502b5afeecef815345384170feb42d46bea5b685c9093fbbb96073533e9ed9dd02cbfb722cf69ad9ef18aff
 EBUILD qtserialbus-6.7.9999.ebuild 902 BLAKE2B c393a7bb277582de80fbdbac3f74031d50f2f9e2a65b697211c9f1c3bc43134fa5d0f770ed843c06458b3680ef1951b522c51827d28034e0753ea32124a9c135 SHA512 9ecd004c28e1cade57ccd33be257b6937bda9f475f581aa09fa0cc7dbb73e3e6c690569a565ffdb4f7b62082e4f4356d63a75beff528e9b3ee3cca38bee11050
 EBUILD qtserialbus-6.9999.ebuild 902 BLAKE2B c393a7bb277582de80fbdbac3f74031d50f2f9e2a65b697211c9f1c3bc43134fa5d0f770ed843c06458b3680ef1951b522c51827d28034e0753ea32124a9c135 SHA512 9ecd004c28e1cade57ccd33be257b6937bda9f475f581aa09fa0cc7dbb73e3e6c690569a565ffdb4f7b62082e4f4356d63a75beff528e9b3ee3cca38bee11050
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtserialbus/qtserialbus-6.7.1.ebuild b/dev-qt/qtserialbus/qtserialbus-6.7.1.ebuild
index 90a0d7bb16bc..f545d9e396f3 100644
--- a/dev-qt/qtserialbus/qtserialbus-6.7.1.ebuild
+++ b/dev-qt/qtserialbus/qtserialbus-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt module to access CAN, ModBus, and other industrial serial buses and protocols"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index 81359c397320..20e733ca6535 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -5,7 +5,7 @@ DIST qtserialport-everywhere-src-6.7.1.tar.xz 271220 BLAKE2B f6d882a2ef2378877e4
 EBUILD qtserialport-5.15.13.ebuild 565 BLAKE2B 683036990929b3ceed4ead89d9a5d77b84494675bc8f7acdfd24f899781009785c91fd0c515f621d8d1cc489c363aaeed228d946d58758de28a54e012c042543 SHA512 484bfec55cb2329151f7e62e4530239b461177d760275b5af5424084664abc37974e6286f2f0621570d60ded7149e2e62a306649441b1552030110def0df602f
 EBUILD qtserialport-5.15.14.ebuild 567 BLAKE2B 769bd6e231e0f976e3a9cf6d9043977631c1fa9861e1687d6b0b0a4eb8002dc5b4e669b4885d67e836553b992861a7deb058ea0f1309ee1734f3feeb5746b73f SHA512 93155347820e88d7caee3ca5a19bb0692c263d5340e99fb3c6b45451b7b79e76fb88b0e26e5a9f5451e52cc2739b050f1ef21610c1abd89b73a1d5f02ec12e57
 EBUILD qtserialport-6.7.0.ebuild 390 BLAKE2B 1c60f756335a193beb10930e126900032020d10c203736506f492a35da0b156588effb9690547ddbad7fd7967f0a82bff50795c7beba035c5e2aa1662c7f3d11 SHA512 bbee937b7fe3ff972e72eb56b6b01e97f25ba089009f79aca803f534394b9547c0a3907f1116c46a7da3d7c79cfab2c3e088b5cdd71511433e812d3500d67913
-EBUILD qtserialport-6.7.1.ebuild 389 BLAKE2B 986846d72f24e2767b70f4ef188cfc4a8ad868bdb1577357cd60614d9c5fce84a9b4461d12c2660adb9b9680a176ff6678fc445728f175e823d88e2bb4cb609c SHA512 9d278312a68dfce7fd44d2b929586d1162eb584ae7e1db0e69a42e38a30ea2b5cbd9c0cd2c1e79977c9a7ca48db51af4330b25250173b8fb4f9e17df62006ec5
+EBUILD qtserialport-6.7.1.ebuild 388 BLAKE2B e72e08b77eec3fd5255753ff713cf20243861e67a5349e59d9e3529ed3ab518c6e2aa356ea82fc9c94fb8281c5bebc78c6406ebc9216b738d02f49dc32a71a4e SHA512 a52878bf8cb2188ead1926406ad9f6b6f1222317bc4845ab8b564940dc627bb64d365693535f6ae6afb8aff580b5c35bd810cf6a199345d21b0bd1a1d3a7edd7
 EBUILD qtserialport-6.7.9999.ebuild 392 BLAKE2B 65750c8281a3febc2289e59f64f7eeb0eca466b773521e7ef801f0d3918b8d813cf59882bb1ab46ff3e962e1ba8b4c52033138dafa3ec10756daf689acd6dbe9 SHA512 b5ef4491f2babf2e5e775d537123aa1139d32a469c834832d264b61cf5f0c72a4fc59c0b32b41bccea2080cea52565cbb5aa8677c4a4079d6bb1b237f02a1c58
 EBUILD qtserialport-6.9999.ebuild 392 BLAKE2B 65750c8281a3febc2289e59f64f7eeb0eca466b773521e7ef801f0d3918b8d813cf59882bb1ab46ff3e962e1ba8b4c52033138dafa3ec10756daf689acd6dbe9 SHA512 b5ef4491f2babf2e5e775d537123aa1139d32a469c834832d264b61cf5f0c72a4fc59c0b32b41bccea2080cea52565cbb5aa8677c4a4079d6bb1b237f02a1c58
 MISC metadata.xml 537 BLAKE2B 48590dfe4d5912693284b963abe9e2fccfff319c2fcc3106fa8d20ec693f7430453eec3fc9ba16c7a9a2cf59f635c1b627f49c6f4e3a8f83be634a68a00b055c SHA512 60ab0488e4a3585fb036e22212f55b5ba5b512acefc9bc68b08a1b255fa6dd0e34e7652a77e55cd7107e1c1f6b742ed12ce20ae92df29a3a38cd2d9f22618f97
diff --git a/dev-qt/qtserialport/qtserialport-6.7.1.ebuild b/dev-qt/qtserialport/qtserialport-6.7.1.ebuild
index 33ab0dccf97a..da926f70a33e 100644
--- a/dev-qt/qtserialport/qtserialport-6.7.1.ebuild
+++ b/dev-qt/qtserialport/qtserialport-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Serial port abstraction library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtshadertools/Manifest b/dev-qt/qtshadertools/Manifest
index ccbdde431866..d9cd04dccc68 100644
--- a/dev-qt/qtshadertools/Manifest
+++ b/dev-qt/qtshadertools/Manifest
@@ -1,7 +1,7 @@
 DIST qtshadertools-everywhere-src-6.7.0.tar.xz 1110704 BLAKE2B 031406ceca95f2e41087a502ba10fcf58c2b0f154b1e10485e4cb4c76ed3d847683d8d25129ebdb048375c93133097b93c717fa7e240a703edd6815f90fe0609 SHA512 30f737093fcdba6b247425c21f15d5682454255fdcf04cbe9f822e5b549dcdbb6fa519bfbcd0f2ba8acfa775cec7c30a630b61d50e00afa8c017ae9a16a73497
 DIST qtshadertools-everywhere-src-6.7.1.tar.xz 1111284 BLAKE2B 337bb5ffe15ce5355081bbeab5004118e369cd7983d37fd770c303b8b326998c466a718002de18d854f4a5e24f6f74d9db8aa59432641b5165715764109d0d05 SHA512 8de9659e11c8b0048fd0af7616aec9a3395a3844f5e24740a88ffd7c3acffba041150338e2a3b7986006edd77a557bb944992b082191d2d959aae511fbc35dc6
 EBUILD qtshadertools-6.7.0.ebuild 370 BLAKE2B b7ae3cdbce349e0d2107a491b4d5bceac0eb06b364f8e1086a03dcb8807ed880fc304ffac0c50d8b78c2780c4f1c169a0250c762f1de0f360738e207b043a267 SHA512 874e04757efb2adda82fb807626d513d7209572bded2a8cd6a8edd905ab5faecc9f43e13a54f5bacad8bb882092a0c584650547d4003f9601e830b8a570c1bb0
-EBUILD qtshadertools-6.7.1.ebuild 369 BLAKE2B 1f69d3fed02fa35fc7897630e49f73f26aa0b3c2d3e9dbfb370aec90cb3efe09dc034e6109ae69baf5efbdfd1b042d37a5043d48efd3c5f7d6c2804357d1a57d SHA512 719ee12d8802c26db485b98427f03149287b8ddd386cb4e7f38d7eaf69cf07a6b59b555523765189fa425be432f4286a1ab5638e3b175dd152df8015b695ee57
+EBUILD qtshadertools-6.7.1.ebuild 368 BLAKE2B 3a69bc6e6bef2a53a7a04d733d43c929b87e7b212ce8c5995dc940e05806e8bb4ae7f92b0039eeefa685ef91ede43cf33b8bf239d1316114a08ca1b4c6c15926 SHA512 a1df6436fe8895fe2ac65a29e08c2ec572e51d875051be40263007175cc30053ba1c20e46974c59ca10f8f03077650bf836c1126f37a7fe34895dfde56780dc3
 EBUILD qtshadertools-6.7.9999.ebuild 372 BLAKE2B 5df971b0ae0b09780b3044442b9d87f64edc54714fa84f8a503d502cc8f6fb5724a4d67286357ecb9a625409b623ebc751bcbba99dea18e636a44c9d7f264d7f SHA512 9eceea3120720b1e8b86b069592156db111ad647b853a93e5eb555a3e7a71b0ae29e57f0f5e225c553a01b50f73e8e77a74fbaf6a7e155e5c5b9f7dc2412e084
 EBUILD qtshadertools-6.9999.ebuild 372 BLAKE2B 5df971b0ae0b09780b3044442b9d87f64edc54714fa84f8a503d502cc8f6fb5724a4d67286357ecb9a625409b623ebc751bcbba99dea18e636a44c9d7f264d7f SHA512 9eceea3120720b1e8b86b069592156db111ad647b853a93e5eb555a3e7a71b0ae29e57f0f5e225c553a01b50f73e8e77a74fbaf6a7e155e5c5b9f7dc2412e084
 MISC metadata.xml 538 BLAKE2B 59f8b1a838f1fadf78bc2d9f1c65fde2c7fdc306730671b16297ff19308186907744bcbd0924074001e1cdb43c1dde29486368bb0d2533b3cb12f7befa53d2dc SHA512 dfe1c793f5525ce4d4353d9131749247163021ec3d995d2cc95df53d214d2e0b24468a026df0dd6403cad41990ab5e8c5e801efa346a06a2d962f29990b16ddf
diff --git a/dev-qt/qtshadertools/qtshadertools-6.7.1.ebuild b/dev-qt/qtshadertools/qtshadertools-6.7.1.ebuild
index 0f8bac6db646..918e99450a94 100644
--- a/dev-qt/qtshadertools/qtshadertools-6.7.1.ebuild
+++ b/dev-qt/qtshadertools/qtshadertools-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt APIs and Tools for Graphics Pipelines"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index ae62fa13c9a3..e50a74cf3f24 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -7,7 +7,7 @@ DIST qtspeech-everywhere-src-6.7.1.tar.xz 261772 BLAKE2B a776930705b7ad7a127997d
 EBUILD qtspeech-5.15.13.ebuild 730 BLAKE2B c3941cd7399ec7d5cdffd2ad65611bc094c64d0aafdf08f40dc36e2da2feacd037bb01e32bcc8cc1d470a70b19dc3c71a7356c8b4a3921de65f1db6d800000e4 SHA512 e019cb16105b96d9e5d28ea5aa6e0cdb30572e6fcb5313a9efcf5da5b0c35cb696a2173ecf3f969e738db4b84311659c7b8666fe187e2f538db7366923d79374
 EBUILD qtspeech-5.15.14.ebuild 732 BLAKE2B 3de5c101cdbe4dd10276e1fcc4b8832a8de54a37b2dce13ad462cb3fafd1372e57c5194554c6980e28f849666dd245674409a035a9b6fc7fa741b8684364a01b SHA512 eb11f4d168e2ac2450e337e4771f69976b915c3e0e6b34b23cde3e35d85575c58606bd5c38d80513fcbe7279a749190dda8e621d43454c0556d376061e52c253
 EBUILD qtspeech-6.7.0.ebuild 1181 BLAKE2B 324ef82b9b059ac3946b5a94a5202e22763382df5740fadb092f89b5b5acc51bcae0158e9caccc6a6f2b6fd4afadf57d8a0b41d58785b4a7eb43113667112507 SHA512 766cf5e20327cd0933c4c8456a7ca9f2426a3c8cc9fd3ca1d56857e86a8bd81989c8c1b823d302b9a47e17b1e833ddd21e6130e1e7267810534baf6baf819374
-EBUILD qtspeech-6.7.1.ebuild 1181 BLAKE2B 40d7875acf48d0ffc98abeb408273d94dcf56355191a62a3dd89e4565c582ae866b3286c6fb8542c86c3507ecc3111f80fb994b2f9fc3a985981d7f71c96a834 SHA512 b5ea5bcd71ce8992c274c0f1bfaa16e6ffe2f1c460756641627289287415f4192b82512e05e86316f20caa7a269443cc105e02bb2869a9d183e37ffc2d2531c1
+EBUILD qtspeech-6.7.1.ebuild 1180 BLAKE2B 1d53f3f5f1e2549911db863a1199aa6a1cfa0d8805a7a5ac9ac3991360a06b4a61dae063c32be8068fbf5eaf5342164993e488e639520ef24dd856d8c97e331e SHA512 5f5c221b1bab00f68a2ef03af68adf78a9588efc4c95d7435dbac4739db97738efcfa96037a084280355f11c08fd850965e9b2cc5e0b5fae8bc67a2d2661e8b8
 EBUILD qtspeech-6.7.9999.ebuild 1183 BLAKE2B a8b221c955947f06cec9524a911140fc9049fdf9bdc886c758887f3c36dfc761bcb562bebce5271a60d3109198c44a154bf61d0e9918f2986c1dbefa880bd502 SHA512 9a70f53712e4ccc2292df5a8f1bedde1e990430c88d0a15307e2fea672bc5c513d066f3d266988da85e8d5b0e5b4a8cbc71cde1fbd1027ba63c5499529a5ddd4
 EBUILD qtspeech-6.9999.ebuild 1183 BLAKE2B a8b221c955947f06cec9524a911140fc9049fdf9bdc886c758887f3c36dfc761bcb562bebce5271a60d3109198c44a154bf61d0e9918f2986c1dbefa880bd502 SHA512 9a70f53712e4ccc2292df5a8f1bedde1e990430c88d0a15307e2fea672bc5c513d066f3d266988da85e8d5b0e5b4a8cbc71cde1fbd1027ba63c5499529a5ddd4
 MISC metadata.xml 861 BLAKE2B fe3a9f427c9a3868ece77a85d0e2f62d12ad109c893a6adba13a9d2cb0098acff98f4ede9185c77a24ea0ddb5d028b77b71f2efa6cfae275ff12138dcd4cac78 SHA512 1e6940d835b139860878cb5b16e4f0f6eadd1e48130273a0c5a511376341d03bed1fa59a83f12e2f7c87a269a5410f92cabeaf3e4f3574eb906f69bc61d8b401
diff --git a/dev-qt/qtspeech/qtspeech-6.7.1.ebuild b/dev-qt/qtspeech/qtspeech-6.7.1.ebuild
index dde5c24d85ba..39e1c27792c5 100644
--- a/dev-qt/qtspeech/qtspeech-6.7.1.ebuild
+++ b/dev-qt/qtspeech/qtspeech-6.7.1.ebuild
@@ -13,7 +13,7 @@ inherit qt6-build
 DESCRIPTION="Text-to-speech library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~loong ~riscv x86"
+	KEYWORDS="amd64 arm ~arm64 ~loong ~riscv x86"
 fi
 
 IUSE="flite qml +speechd"
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 0e9a18f14c9a..0241ace790e0 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -7,7 +7,7 @@ DIST qtsvg-everywhere-src-6.7.1.tar.xz 1790712 BLAKE2B 4df926dbac0372d41fbaf0ac3
 EBUILD qtsvg-5.15.13.ebuild 496 BLAKE2B 973507084399af01f2f442cbfd3a6c9dfe91c8185ddb483c9b7b8cc1f7cf135e80e4c7c1286f22bc59a5209a87144310780d0c380681b963d42204c46a228e07 SHA512 d8500010ff86d3d03f18210b771fe0961b99d16efebbba0c428ffcc49dda115814538f6d8b20801671ee5a0de7b1e643eed6101c7f37dbf42795d1a5c6dfd978
 EBUILD qtsvg-5.15.14.ebuild 498 BLAKE2B 68f821717d2207b6bf076a455fedde9ecab6e7267793e47794a25dcf1f1f7962bf3eb46fd021107b20a12323a8ac9cb888759f5df144283f22826f6586ce2d5b SHA512 565a9f275f5bcd3cc8bd82b31252e67ad648f7bdcfb1e1ecd623d391903b9ca292e610a52088904b4a128a2ebca58a873c7f244dfd8ebeefd9fc1bbc63dd6ed9
 EBUILD qtsvg-6.7.0.ebuild 391 BLAKE2B 8a6bc4b73cf1fdba0ea8b7986099ca22e5ec5e193e44762465ecb2042a3e9ce43c5f61175b4338b6cca29f4844dd4a067ef35f95e0b6d5153efd2ca0a80982c9 SHA512 02c4d36c3586ac2cb2750bdc97bf7b5d6d81523ecafaa98decf792412d56d8db666301e58b337ac9fafed8bc02072b2e5123d8117e4c21ebb57a4273d7560700
-EBUILD qtsvg-6.7.1.ebuild 390 BLAKE2B 8bb5f412190d8b2c966cc717a92dad609629526969ef30fd740bdc6fab88b90f2f049a940d3f3cfc9eca228a88dbcaae2dd0e5744684264b813506119262dede SHA512 ee4a3543c28d6058309e0bb6f5eeb09ea2b8412033cc6765c8ddc646c24bd32e6271c0bdbbe119f6be09bf10f5ac8e4b4f087c061252ed4919861a28920a1655
+EBUILD qtsvg-6.7.1.ebuild 389 BLAKE2B db4165900522a140f07fd08ea1c322fe52daeeec35d88718da6dc20b5d5cb7ced4d563547df9dfc5d9351782eea1042efee8ed0c66d544b06c7fa3186bd65f32 SHA512 c36f8c0f704deccd2ddb616bfcc03320c9ea1866c32abba38459b4d5d2dd0ac82f61fef80511578c6f0a32098d38e131f7b2f6317069b3c1e74574763b9b184c
 EBUILD qtsvg-6.7.9999.ebuild 393 BLAKE2B 590aebdab4891eb74fe461de8bb0170b15423d201eab166f794e87d04d7bdcb0e60f5317b7550e3c397046770b55949d69d48d1ea4fe117a3c17238348199fa9 SHA512 5bda049f2ae5e3f013a01034dabba7459d844cbc006a9d0463213db8e119c24d5056d40c838833fb4b82ea2ac8acedfb4a0f92fe011f2c768b45c6ce0bd1528b
 EBUILD qtsvg-6.9999.ebuild 393 BLAKE2B 590aebdab4891eb74fe461de8bb0170b15423d201eab166f794e87d04d7bdcb0e60f5317b7550e3c397046770b55949d69d48d1ea4fe117a3c17238348199fa9 SHA512 5bda049f2ae5e3f013a01034dabba7459d844cbc006a9d0463213db8e119c24d5056d40c838833fb4b82ea2ac8acedfb4a0f92fe011f2c768b45c6ce0bd1528b
 MISC metadata.xml 530 BLAKE2B 4cff37d5824321054b8131fc65a4a86433a2e33882c66411b7af25c0550ad4933a680ceb517d1ba2cd11dab4b3110da69f330f334d25577310d59d7ab4aca439 SHA512 f538df6a65076e6744ab7e498778ff1addd3f45af50708d5af3c0eefb5862fc0b82bf99c18b268bb6ed257b3feed51f64ed18cd4006ba717c03be37ea5258ab3
diff --git a/dev-qt/qtsvg/qtsvg-6.7.1.ebuild b/dev-qt/qtsvg/qtsvg-6.7.1.ebuild
index a2cda97c88de..17d4afa2d11e 100644
--- a/dev-qt/qtsvg/qtsvg-6.7.1.ebuild
+++ b/dev-qt/qtsvg/qtsvg-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="SVG rendering library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index 4abdec88cd04..c62ed40862a0 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,7 +1,7 @@
 DIST qttools-everywhere-src-6.7.0.tar.xz 9012572 BLAKE2B 12bfc43d390c40faafdf825d333348fb1672eb52c3f1e47ea0362542712dfac56fa3b07f01a2bc196872a04e9cf1a101ea2feb4ed6b744a70c75b67111ec806e SHA512 8d478568d8e7ffc40af8099e95f2b37913c05490cc127d559c13ed3cba75bf8cca06ad3afce65649186a3e52442f8e0f820a2ac6b655ec0e2b808e6df834d560
 DIST qttools-everywhere-src-6.7.1.tar.xz 9016376 BLAKE2B 081a8a6fc838ee1dcee1b82cb46996ed246639a230f23d324fdcf2153c46ddbdd619505df0380ea20c7e9c668159dc49a061ecf57f27026b0a6fc7e6017d9b1c SHA512 5b21fc8a5f208615a3493a2ae24356705477c50f675cd7f29fc2eb7f7af5c2af7859068d26404ff8075d163adf0b0c4f267d14fa3f618de76ace8cd353a58a15
 EBUILD qttools-6.7.0.ebuild 4650 BLAKE2B e76702c487efe87692d281bc213088f0cf7c7f5e5a62b9d8d9f084848f434309fed487cf8b66abfb31ce3d41347e0298944484270d8eba3f943f15e1b0d1eb8d SHA512 c34acc2c50302f0d799b67440cacfdea1cf15de5df2958437ef06629c132eb96cb06b05930113eae7105868796058f47f4b604cbfe62bbe711884ef49ce67e0d
-EBUILD qttools-6.7.1.ebuild 4649 BLAKE2B f7778912440778fd004cbfab3440fd2b3e2ae3f8313ba46a50bf6e5abf702bead9525bd15013880b2aa9ef77b985341853101c7e8e0c2ddaa55ef8c0adbfa83c SHA512 a7658262f1a3e6b0d8ecab1966cc235f6228f748e638d9cb7c9f972c64dedc384fd83ea38127cb5551454efa500d89f2b857f5141da379a6a0a3f31e6cdaaef8
+EBUILD qttools-6.7.1.ebuild 4648 BLAKE2B 3a5aa59fb7d30516c8e805dad84929ddd8a6b351ba22ef6ebd02194785717e97e2433c0c62d0c1306a972809f192d29e63c9aa53aa7f18f7e046c4cf6734c6e0 SHA512 64ae35ea4dd037564af9e5562dede37cb171050de054fcf23c9451c0c79ff8c7527d1547ce01bdfc0d820bc3290da4d7605cdc27a8199505cc23ab3df82be171
 EBUILD qttools-6.7.9999.ebuild 4652 BLAKE2B eebd7864fe6b6c135e0a8a3ca82facb8596cd468c6cb7b9064ea2eb88d0340c9756c5c53cb29c8aff02553dc60665391d337bf470d0483e7d7e7dc6b789512d0 SHA512 0f106b67908d04dc45ef0954251dc699c2e4de63a223b03680fe295d2687830dfd2814bf7c0a5996fa847c4e48fa7e3d41fbe076f278e17cdab571fb91dc2f8a
 EBUILD qttools-6.9999.ebuild 4652 BLAKE2B eebd7864fe6b6c135e0a8a3ca82facb8596cd468c6cb7b9064ea2eb88d0340c9756c5c53cb29c8aff02553dc60665391d337bf470d0483e7d7e7dc6b789512d0 SHA512 0f106b67908d04dc45ef0954251dc699c2e4de63a223b03680fe295d2687830dfd2814bf7c0a5996fa847c4e48fa7e3d41fbe076f278e17cdab571fb91dc2f8a
 MISC metadata.xml 1415 BLAKE2B 082d3fb170635bf0434df13b560689eeafd163b618f26e000ec23b8007329e83fe3537be983b44a4e055271fa20a37fed570585c9af950b3488f2cd6806f581a SHA512 c0469f0638488b75ee9a68fb213df728eafa7d13facae1929ca4d847f3b2fbc682522c315c0ae42688cbd7a00a134168009c6fb5bfa66ad318e829704aad6761
diff --git a/dev-qt/qttools/qttools-6.7.1.ebuild b/dev-qt/qttools/qttools-6.7.1.ebuild
index 4b194251b08a..cb5d463ddc63 100644
--- a/dev-qt/qttools/qttools-6.7.1.ebuild
+++ b/dev-qt/qttools/qttools-6.7.1.ebuild
@@ -16,7 +16,7 @@ inherit desktop llvm-r1 optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index 0d98b7062e80..b61b516114ff 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -5,7 +5,7 @@ DIST qttranslations-everywhere-src-6.7.1.tar.xz 1547716 BLAKE2B 5b5ff4c81cdf56e9
 EBUILD qttranslations-5.15.13.ebuild 379 BLAKE2B 4e8592ec1a5ee9571ebf1eb9fc40b2b593a8448d6a600f7ec61813a8416fbf6492759ee1b93e36137d994166f30d0ddc1a95b2971c0f4fa61779b37c37b2514b SHA512 483a60952a599acea2c0a6b4916fb7566120e552812469f7a0291ba8b7a063be4afd1a7ce2f8e56271a24f34fb8750eff99c03814b0c92f38cdec1a005c0d6e3
 EBUILD qttranslations-5.15.14.ebuild 381 BLAKE2B 99c04e15c7c82be9990387e20f513e72ab1f8ace9599110383c5074effcd46652c06c3d3ffd534a2978f69336ff4af9354ed5ae114b5b58b9c577f8f20a3faae SHA512 ea5f65534565634cbd1a7c109fb999c0163a8dfd2836245b536a7df78d91bf41cd18bbee3efc0c3bc2204c2e6970b7aba2a06124c0a2cf74fdf9932d8440144c
 EBUILD qttranslations-6.7.0.ebuild 416 BLAKE2B cdcef30e69d47d0a2d45d3988c5cfdc16a6e8f2896c110d21de77d533288532e086768fcd795ceb7d1d19985c04961dd65d1e237fae17a7d07f2443c05b4583b SHA512 9e1db8866c4504ed96ca17617d17035ccc0257655073ba4f24e1727f043b97460619df087d22745af03612f1e7d8606d4677c8909ba75069bd9e6e22051bc25a
-EBUILD qttranslations-6.7.1.ebuild 415 BLAKE2B 59392d1c225dba28209942c026b7d8f9740a269f9e0cd647cb73a1e4adc3eecdf73556ca0053dccbaeca7d61f6df59094b02820332b09cc498f321c289f954a8 SHA512 b63aba63752be0607a874328e742699d68972bbe6e27a9d307bfb50e8d1d116e7a29b31fadf93b840138fa071f0958fb76b21b65c6f7604b98399ac69279300c
+EBUILD qttranslations-6.7.1.ebuild 414 BLAKE2B b700084a503deca1187cd933d5d5ba89b1769ca0db011342b3b9908ad51683c0d4996857cb7eba836234b5d1ee0fc5a81696995dab839cb3f7eb9864bf8b512f SHA512 b78e55cfa9cd14f4441ba5efd3a7c520c5dcb47fe0c7b4cedd0890464fdff8302cb2f2183552c00d9fcbff7a986e20ac9971e513e966353dddabb4986d32f43a
 EBUILD qttranslations-6.7.9999.ebuild 418 BLAKE2B 295cea378d3a94f73b4bbd0430ad900f1e3f8478a863da1f5af987b55946909c6efcfe5840570a0f348bddbeb7f6ce25adcb04b1caff19140b6053cfc477b791 SHA512 d4fd0d708a0c7ea4b2e4c55c7aa19891ed771d86a45a108f7f3a4e1558751c5824dd4e0b18807902605c9df5b7d1ebfeeeab8730a5c45e3e2b7abbb3a2ad2baf
 EBUILD qttranslations-6.9999.ebuild 418 BLAKE2B 295cea378d3a94f73b4bbd0430ad900f1e3f8478a863da1f5af987b55946909c6efcfe5840570a0f348bddbeb7f6ce25adcb04b1caff19140b6053cfc477b791 SHA512 d4fd0d708a0c7ea4b2e4c55c7aa19891ed771d86a45a108f7f3a4e1558751c5824dd4e0b18807902605c9df5b7d1ebfeeeab8730a5c45e3e2b7abbb3a2ad2baf
 MISC metadata.xml 563 BLAKE2B 11869c4f597d5fabbf64d850fe11460e1e91c09170dadfb660a5035cc5fbc1589d5c616459f2426ce0c2480762dc40d5822beedb963da9855e580a4aa2e4df0e SHA512 e228dd2161cdf78f156ce10da18aadc938f58c3455c1226fbebda35acd371201ae09779e531847d4707054c837f063f2d213341f17111a2cf2665707db024116
diff --git a/dev-qt/qttranslations/qttranslations-6.7.1.ebuild b/dev-qt/qttranslations/qttranslations-6.7.1.ebuild
index 1e56db71aaec..388783a3f00e 100644
--- a/dev-qt/qttranslations/qttranslations-6.7.1.ebuild
+++ b/dev-qt/qttranslations/qttranslations-6.7.1.ebuild
@@ -9,7 +9,7 @@ inherit qt6-build
 DESCRIPTION="Translation files for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DEPEND="~dev-qt/qtbase-${PV}:6"
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index eb8ee9b64c8b..11a53cf90e91 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -5,7 +5,7 @@ DIST qtvirtualkeyboard-everywhere-src-6.7.1.tar.xz 3729484 BLAKE2B d5079f63f8c8d
 EBUILD qtvirtualkeyboard-5.15.13.ebuild 1215 BLAKE2B 69170c58bb99c493fc045c0901aabc24b804a81289b66df9828ac0f997530105583dc174ffd9dc6fc52936705a3a637a92bab205e0d1d22da2b212b10e436e81 SHA512 885a3ce2f545fd6d880642d938ffe16edab97305577870aaa702f13e9009297f49ef17388f77869a7bac548558fb2afdd67a02a50403be58586cffc750434c2e
 EBUILD qtvirtualkeyboard-5.15.14.ebuild 1215 BLAKE2B 69170c58bb99c493fc045c0901aabc24b804a81289b66df9828ac0f997530105583dc174ffd9dc6fc52936705a3a637a92bab205e0d1d22da2b212b10e436e81 SHA512 885a3ce2f545fd6d880642d938ffe16edab97305577870aaa702f13e9009297f49ef17388f77869a7bac548558fb2afdd67a02a50403be58586cffc750434c2e
 EBUILD qtvirtualkeyboard-6.7.0.ebuild 1125 BLAKE2B 84d0beb8f1a3428c7999fc8218c4729a6c3fdcca2ff86c1376fd33e89501ab3d0b73f58a4cde700989a9dcb6b343c61afa5012a9cac16428cd6d8b482e2c3425 SHA512 a2b2d2eb4c40f71d45bef2b6e8e013f5f73023a0cd73479b0b235d8cd13d796d34cd6fdfb732fdef6a77880980b8c3ff7a06a40036b08babef18a0d71ddb2c5e
-EBUILD qtvirtualkeyboard-6.7.1.ebuild 1124 BLAKE2B 18db8bf12c9bcefff49cd0dec6a870bcf207fbdcebd7b73c82e21dad3b49caebab007d35ee2737d714ac741645b78e3ddc27213e5927e532a25c37e43ab7c3f8 SHA512 a4c9a922e08e913983851994c8becf816ab26bec24465a71e62dc58445c360bba2e9302f074bdeaede9df4cc40ffc1bce2c65824e6a0413e599958fcc5c2dae3
+EBUILD qtvirtualkeyboard-6.7.1.ebuild 1123 BLAKE2B 0969ab3bdf3305636eee3fe8cf83e831cf2b29b580fdd4102cf0115137f36a6f1291688bd00ae5617a4c80c6265bcff64bad9f3686f71358b5ab8aeb5c2bd92a SHA512 afec30a60f8c861bc433264c0a4948a7fbe8bff0fb0efb4b1d6d17356b015f2a4889119d5dbfec74fc03663bf4286aafad35fced101bbf572d21c22f340d0b24
 EBUILD qtvirtualkeyboard-6.7.9999.ebuild 1126 BLAKE2B ff46eacb24faf934623f687299ac580d3353a5c896c5cf1d09e60d21157758534b3e3ebd62ff95d9da0c8f2acb919249a4facea5941e5246ef5269919ad4937b SHA512 1ecd19da2755ff9708514ca4e11932c671800d1a62fea1d783526abf02d808d67e856b567b2bf65f0243ec4b40cf5053055607e7bbf829f1e8ec10eaa616ba14
 EBUILD qtvirtualkeyboard-6.9999.ebuild 1126 BLAKE2B ff46eacb24faf934623f687299ac580d3353a5c896c5cf1d09e60d21157758534b3e3ebd62ff95d9da0c8f2acb919249a4facea5941e5246ef5269919ad4937b SHA512 1ecd19da2755ff9708514ca4e11932c671800d1a62fea1d783526abf02d808d67e856b567b2bf65f0243ec4b40cf5053055607e7bbf829f1e8ec10eaa616ba14
 MISC metadata.xml 640 BLAKE2B bdfed031e4d0191f510982695bca87366916ce6b7ba3ff7fad718ac55083cbd82d7b00b32048f65b3973944f2058cf8f652e19a7efb3606a2eb7e4b3cc3fd63f SHA512 a5b3338f67993f944258eb2fba56b6d6b927e0e298832c95e2c3b6b7eb148201e2912e1844de03a360c0b123c6322c7d956825913eeec7c866fed861ced34dfc
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.1.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.1.ebuild
index 0a3cedf071c1..67b682b52842 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.1.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~loong ~riscv x86"
+	KEYWORDS="amd64 arm ~arm64 ~loong ~riscv x86"
 fi
 
 IUSE="+spell"
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 4f969edacf40..5d9275a61a8d 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -7,7 +7,7 @@ DIST qtwayland-everywhere-src-6.7.1.tar.xz 1122036 BLAKE2B 93acec00864f7f112b442
 EBUILD qtwayland-5.15.13.ebuild 1214 BLAKE2B 4d974a96e807dfbad6bf480bb6faf022828c9cab0fd5bc82b6c6455344fafd7a349f1f232fa62a00e32cc073cda39aead004657e7b4072f49890442baeda3252 SHA512 75966f4a890e77a29937d63ed50a8095d579fab4871f2d091bb410443a0101fabc592a6cfbe033b12d6f0663c196930a32c85a062a10de4f8dc13eee4103b86b
 EBUILD qtwayland-5.15.14.ebuild 1216 BLAKE2B 78471060c4f0d09d60ce02920edc99ef0f9b55b6987a30051cbb85aaf95d70f1f8c61797398781c693843456574cbe940a09be013f11b34de518f388cc442371 SHA512 1521846d9639ed456169b4f47956e8ce67ecc79055e0cb21285ff53575818d632ef86c30a0f1400b86247a29c80ac75ba2d1190559d3251ea7191fa1c076664b
 EBUILD qtwayland-6.7.0.ebuild 1227 BLAKE2B 489fa85da398d927396d5251e4c0af8ae9011ce010a54a74bc2af8542defb8eba4e4871640f78451ebc93ff6b83d24925fa1f69d6bf5e84f400ec59bb35ab098 SHA512 357fd84cf197e687cdfbb56919cf6b88576797cbb01011593c2b3d0403ac4f9ace5cd49c3bc07c8c1444e8e9bebeb428a1f9ebcc304735605f023be8a30a63f1
-EBUILD qtwayland-6.7.1.ebuild 1226 BLAKE2B 93e77fd818a03f2ed57c8e7b682a8087dfaca4a5e22ab7c226b0f85702eb8c065fba2fbce56e49d0d912adf48eec8bff25c9c66bdbd4b2752481e65e251ca28c SHA512 bd21d36446edf18c0c6dcadc6599d66e22f42e8ab3593c881056c655c7c24a912d8055282be536dbd10598cf627f700d56ea969892e8439084650eb7e082590d
+EBUILD qtwayland-6.7.1.ebuild 1225 BLAKE2B 24416fe23ce70e9d9ddfebab577d73528fabf6fbfad662b9be2d3e7e8ab2d8eff5a2286ddcd760e05514d56c123eae8468d1d41301b91a60cd80de6fd7557803 SHA512 87c3fe20ef7150c87a4662663156693976ace77dd3bff0a3deb83c8b0aad9ad538c0be4923a6e691847794bae6d6b8a74257f803e6f49ab5a203af7e4fface0c
 EBUILD qtwayland-6.7.9999.ebuild 1229 BLAKE2B a2ef0eece20a69fae358c8c0e22dd05c7d5a04cdd508e1ecb90883c87a6bc365db6443413e7a2150282d26ba8666361b281bd261f5f7a34b0bff24abf96bb723 SHA512 9465226c56e239182b87812bf532ba63e2632830d24e5b7aff53160ba587834bdb7faf9dde05da61084e0a44551cbbbd5599f0988ed92c0e0bc77a016a0ce289
 EBUILD qtwayland-6.9999.ebuild 1229 BLAKE2B a2ef0eece20a69fae358c8c0e22dd05c7d5a04cdd508e1ecb90883c87a6bc365db6443413e7a2150282d26ba8666361b281bd261f5f7a34b0bff24abf96bb723 SHA512 9465226c56e239182b87812bf532ba63e2632830d24e5b7aff53160ba587834bdb7faf9dde05da61084e0a44551cbbbd5599f0988ed92c0e0bc77a016a0ce289
 MISC metadata.xml 790 BLAKE2B 61ed17b888bc084b787b06d504b86aaf7a55c87f332115d007340cc5e158d6b02f08b247140d4311f37cfe92c474a07faeef5470bbd109dbbe7f600faccb9724 SHA512 61e0b8812f02c9d51a31c0e1e05cfdf512c5dd0336c95f00db237f5e3419555cea90be0aaa02894c5a9e50ded43ccbcd1fd3a38d2fd93651a27dc0d85fccccc9
diff --git a/dev-qt/qtwayland/qtwayland-6.7.1.ebuild b/dev-qt/qtwayland/qtwayland-6.7.1.ebuild
index 3945f0f1c2cd..db818b46ad53 100644
--- a/dev-qt/qtwayland/qtwayland-6.7.1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Wayland platform plugin for Qt"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="accessibility compositor qml vulkan"
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index 5aaf0bdd3e2e..9087fc151b11 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -7,7 +7,7 @@ DIST qtwebchannel-everywhere-src-6.7.1.tar.xz 206564 BLAKE2B 0d9187d5e37f92e1b29
 EBUILD qtwebchannel-5.15.13.ebuild 599 BLAKE2B 73cf6f6f51eadeaada9e9a50fd4ca14f1b7cb0b9822f793c016e4059fc1fa8a32332e2e5318370c8806d03affc9de63b38dc0511e8c01cc631b01df21dc75cfe SHA512 f0a6f32a6791c4c66bdf6cee33b1349b80f60560575cd72684d600a831f98c44e0d406eb074aaf0a50b7df7de44f06db9489659ca041013bac3d1714d540a6e8
 EBUILD qtwebchannel-5.15.14.ebuild 601 BLAKE2B 805765de470550b27c2e46aa6988a69ba59fa9036bb2886cbaefb190ed1b8f751ec14909b113e6546d5d66eac177aafff6c5ce5935b29f2d6d85738a3b9838f9 SHA512 664c7d1a43ff38e007c62e1490112a0e0d629f96de61ec7743388a33e1f9e7ba378e2401bcbb6dd236970eb0120aa070d1d872dc20ca1d11f79dfac19f1c78fe
 EBUILD qtwebchannel-6.7.0-r1.ebuild 556 BLAKE2B cade6bc898316e32ca903b57c0bb994f8f10d119bc47c5836b2de37b2f1f9d75a404eecf77a16fb7d36ca1023e0ee1d2e3f1d7a0ce4563adff736f740e03f146 SHA512 50455f447fe4773184de903ff48d18b219313d16953cd8e389723b44f690b9e87f79c881e329ca0e5eeaa25db170d1b43181b75080e9d80d904aa4c909603128
-EBUILD qtwebchannel-6.7.1.ebuild 556 BLAKE2B 8b5d9e28df005ac68f8d147b5178318f1603a9399b6f24a5cbc084152c3596635d31eabdb960efd88caa01b652bf20dd1493b647bd0640f606d3243ac6196a69 SHA512 d025ab1dd87bb0ce50e9661f9496173821289498546eb24362f5f1eeda3f0ff5571e0af68892dab1bdccfa94123b18525e1c8f21d3cd452c100c9bc43dc38258
+EBUILD qtwebchannel-6.7.1.ebuild 555 BLAKE2B a520d6696030fbdd00769e76bc6ac427998520db67e67b90cbf66a9563ab097cba364e3a703974c0ef1db9f25465e3d1253bc8b783a015dadb01b8407150e842 SHA512 5aa9373f10c129f934f7906c0683f04d839d4d1fcfc4e4f1fdf71c94ac3d02bec543d2bdf72443f6b4053a8e5caacd9d6493582a8f9bc3e649004d08d98b3dc2
 EBUILD qtwebchannel-6.7.9999.ebuild 558 BLAKE2B fdf2dea280d3cb328df9e67321286440eaeeb99145ab6847999f7d0754ee35a1cf6c0e2b0448223541c8864e4f44ce9457d100f7f42bffc4f9fb1a850bfe0b12 SHA512 3498401647b3028779a2499070815b8505f6fec49bf4b502d9f6012ae47a84b3cb0e2e24458a279cecc04f248116ff4d2b502a7ad9e00bbcbc03295a97978c49
 EBUILD qtwebchannel-6.9999.ebuild 558 BLAKE2B fdf2dea280d3cb328df9e67321286440eaeeb99145ab6847999f7d0754ee35a1cf6c0e2b0448223541c8864e4f44ce9457d100f7f42bffc4f9fb1a850bfe0b12 SHA512 3498401647b3028779a2499070815b8505f6fec49bf4b502d9f6012ae47a84b3cb0e2e24458a279cecc04f248116ff4d2b502a7ad9e00bbcbc03295a97978c49
 MISC metadata.xml 617 BLAKE2B c9bdd6bc7b0e0aae943acc9060d1ef91d46e5e836f7a034c863032dff51b540edc0643cfd3ea0c4c4e18472a099537aee2b13994ea6fa97249dff25ad5291575 SHA512 ecc344957ebad7d9adc689c343c8315d38fc4d219f0a3bfb6ca848d2d083b0d29d01365a5287d3d5943a95dc75c1147c2e60a2078083a88832296ed0fbee2d4c
diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.7.1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.7.1.ebuild
index fc7eb0350a30..092447b546c8 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-6.7.1.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt WebChannel"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~riscv x86"
+	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~riscv x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 84d814587251..8694d37246bf 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -13,7 +13,7 @@ DIST qtwebengine-everywhere-src-6.7.1.tar.xz 550975920 BLAKE2B b0bbe1d62132bc75f
 EBUILD qtwebengine-5.15.13_p20240510.ebuild 7392 BLAKE2B efa820317c90e3203da3cccec781ec22ccd2704ea72a825b64bc4dbc76fcf35bde70f9ef7f1174e8c71db023372d95047cd485435d9abcd72de82a7f2ac3bdf2 SHA512 487f3f7a9c2cdd8b0c1df6aaeecf4bc16cc7c8f918c9cb37411dcd32ad4cd6b1cda38e05279f55782349799ef6e4cca948f3bca38e9607b97c03652892739375
 EBUILD qtwebengine-5.15.14_p20240510.ebuild 7659 BLAKE2B d930e49649e91657fbe65668a0dfe41ebd4732d4901c36f59f562094d9cb9d339157bf0f5c4e8b530270a13c8a40449ac4800ce9a17a29069be1c7177c288452 SHA512 6c621d916a502e778fb9662dba61161eb55b6ab37bd1045d5a96924bc943428b3ef28512d7838b31b4bfaa0ac43e23b10a66d67fdce2505139325cc837dd756f
 EBUILD qtwebengine-6.7.0.ebuild 10306 BLAKE2B cb7b3d848635ae03b3709659697a62b4bb4ba0579bc5b25ba9c25e5bf80872c7f75a5b727db63158ae1769dddb02c72885a316825d06d829f52a32b392513b37 SHA512 2579a2708318bd066933e05e1016fe323c6697314c7f00bf79f5c9463ad8a88795f3970508e4be5275e40893c836a296b6b15681a084ef0dd996dc1762c36da9
-EBUILD qtwebengine-6.7.1.ebuild 10173 BLAKE2B b09ce8b13df0f3144b36f006113985073a1c5449a106261ebb5c176cc7e0c9149ffc99f006f8df43a34cdb5cdc4ab8f00ed604b95910a607bc029303961cee24 SHA512 ea5409b1a3bc3bbd6478d03ce94a80f1c315fb207ed002febb464ad8fb8c706746d4cfb0f3ce74061755633900751e4cc8c54053d78decf47fcf6c23ec0b01d8
+EBUILD qtwebengine-6.7.1.ebuild 10172 BLAKE2B 8fa9d34ea212da0336b7ac4cbdee3600539aca7c2f0cdcdaec5400b215347c556bc39ef19084ca14568de9490450a0fb60389941b02f06a15fbaac56b0110753 SHA512 010dbc4506afbb828189b7103191c7d4dd7b88c610af0b0c94fd571e18a85a5bdbe0b6f80c527c46f738a5ba396161731693203ba6981112e0e048bfb2d08c97
 EBUILD qtwebengine-6.7.9999.ebuild 10173 BLAKE2B b09ce8b13df0f3144b36f006113985073a1c5449a106261ebb5c176cc7e0c9149ffc99f006f8df43a34cdb5cdc4ab8f00ed604b95910a607bc029303961cee24 SHA512 ea5409b1a3bc3bbd6478d03ce94a80f1c315fb207ed002febb464ad8fb8c706746d4cfb0f3ce74061755633900751e4cc8c54053d78decf47fcf6c23ec0b01d8
 EBUILD qtwebengine-6.9999.ebuild 10173 BLAKE2B b09ce8b13df0f3144b36f006113985073a1c5449a106261ebb5c176cc7e0c9149ffc99f006f8df43a34cdb5cdc4ab8f00ed604b95910a607bc029303961cee24 SHA512 ea5409b1a3bc3bbd6478d03ce94a80f1c315fb207ed002febb464ad8fb8c706746d4cfb0f3ce74061755633900751e4cc8c54053d78decf47fcf6c23ec0b01d8
 MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
index a5407eb45c18..17f6fb1f6c4b 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI+="
 "
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 ~arm64"
 fi
 
 IUSE="
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index 9fdc9c9a29d2..02501ac58662 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -7,7 +7,7 @@ DIST qtwebsockets-everywhere-src-6.7.1.tar.xz 459720 BLAKE2B e9564a82b4548d1b6df
 EBUILD qtwebsockets-5.15.13.ebuild 578 BLAKE2B a2f9c91925d8c60877cb1913fe32b4789b3ba2245c8c2e7dbe21bcbf79929ff3b8b2ebc35ce6041d9a6484eada12a56a3a66749626f8f78257f562e96155b7b6 SHA512 f5ed35b96c058ca3a60515a29a4d46821cc706db7901959ab1e46e461cb471eb554656b94d8d54cb16c985354a04f45db46b266b40e9ba1e466a018df2570b47
 EBUILD qtwebsockets-5.15.14.ebuild 580 BLAKE2B 04d225c9ab7a21d9114e9720e4c47859d108f2446ec04ea5b47fd344d70ec5b94f2fb7c8ab752785c116f5e233f8a4e0fbe85b0411af67e899def927bdfc94c0 SHA512 3bcb1c3fb9c5c32ffdd01e88a5c4849f695d960b08df014de4e338062d6ebdafe4dcfe29f167236f9133e3fbd66026e17e97c36dc006a871706b222bfff2007e
 EBUILD qtwebsockets-6.7.0.ebuild 556 BLAKE2B 853e2b4df3a4abfc463030afbbd56bde8c247b4527575921ad0934ebbc05041a6ac6aa5db5d4a8426617efaa0b7b690b942262c15a741da8b3c5fddb8358e679 SHA512 1ed399bd2239f38efd4f8667b8d8b1d600bf4f20aa774add3e631ce0b18e65d1b3486e572fd52f75955316008eef411ba3f8bc3b43e4f85f2f16c161db65f031
-EBUILD qtwebsockets-6.7.1.ebuild 556 BLAKE2B 75f82566c6749debe8c31d2e806f1806affbd96f8426c2d4d3f7f1ceca9ac513d5de201cb2fe47a045f8bc8a7dfaa6cdef4bcd6db86a83e7f230af6210a29383 SHA512 7c9370ef9a9a1516fa47bc969c65fc1a4dcc5fe12fe6d4ec1005cbae91a914742e79ada49e70fdeb75be0c28998acaaaf81f27eee9d142d8b61c650c1303b700
+EBUILD qtwebsockets-6.7.1.ebuild 555 BLAKE2B 5793259327c5a52a5a888b16837996c7d575d74b01441fbf6cb8bcc8e88f6e7553a97344062373c03661790f3132f18ab6c4edd68b593157e538390524652639 SHA512 fbbf68508eb34ae1bc9be9bac4f16d52b4fc62895286136a62c970db5ac951c518e29e64a038a34c1a9d5f2e049aabfd7f9d89520c57eac7e029d3d94c9bef91
 EBUILD qtwebsockets-6.7.9999.ebuild 558 BLAKE2B 9aad80e19aead5569e83a20c74ac09e267b65f840e1bc1d6c9b38b4c0fd703d95e712a7172522d5d2b2f752844e69be0aa7d3d98dfdbb541cf9878e1b970316f SHA512 6e9953fc3f329e35e63f7b7ede32ae2a7fa15f1e46ad830aa1ea737b33447f5809e6ce71097091c5db48355679a1ed87f6a3487caf9661c1f4ebcff73a923b95
 EBUILD qtwebsockets-6.9999.ebuild 558 BLAKE2B 9aad80e19aead5569e83a20c74ac09e267b65f840e1bc1d6c9b38b4c0fd703d95e712a7172522d5d2b2f752844e69be0aa7d3d98dfdbb541cf9878e1b970316f SHA512 6e9953fc3f329e35e63f7b7ede32ae2a7fa15f1e46ad830aa1ea737b33447f5809e6ce71097091c5db48355679a1ed87f6a3487caf9661c1f4ebcff73a923b95
 MISC metadata.xml 597 BLAKE2B 9cd42a9c56fb752ea155093f8f9222b8abecc3219bc770c4746ac45bb5b741b829688d8363b2c3580125ac43a31420522ba83949534a0c16aef7386bb46648b3 SHA512 55df60c57864187551629b4f6d83803d29154d4c685b50151e89ce9aae733a6cb3a0930c482cdad40b1880904f9c2c0ec21483ac7b801932086ba0186dfeb1de
diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.7.1.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.7.1.ebuild
index 8ee4a89894a2..bb56820e9762 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-6.7.1.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Implementation of the WebSocket protocol for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ~riscv x86"
+	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~riscv x86"
 fi
 
 IUSE="qml +ssl"
diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest
index f1aac0519bc4..873562779d8f 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -5,7 +5,7 @@ DIST qtwebview-everywhere-src-6.7.1.tar.xz 138776 BLAKE2B 0823353cb22211b46a90dd
 EBUILD qtwebview-5.15.13.ebuild 464 BLAKE2B 6ab5da91708d6d3d65e303eb3c700bd2c528b5b802bd5cc6b18df39730bd76a82b61ecc0193b664865010f261275e3bb7c68331dabfb6e5246b4adf77efd1039 SHA512 0cbb7b9974dda9431cda7d5a634633a1e9e485e2f6ed3993a4965b0fb5f36ae2e290a31d142d4da828c9e6007d4f88e41dcef59229d092602076bb3766d2d3bc
 EBUILD qtwebview-5.15.14.ebuild 464 BLAKE2B 6ab5da91708d6d3d65e303eb3c700bd2c528b5b802bd5cc6b18df39730bd76a82b61ecc0193b664865010f261275e3bb7c68331dabfb6e5246b4adf77efd1039 SHA512 0cbb7b9974dda9431cda7d5a634633a1e9e485e2f6ed3993a4965b0fb5f36ae2e290a31d142d4da828c9e6007d4f88e41dcef59229d092602076bb3766d2d3bc
 EBUILD qtwebview-6.7.0.ebuild 425 BLAKE2B 1981b2967573ff46eb5bfb76e36cb5323a257f29e9da79cdabac49fd7d97a60a599cb42eb1e513b92486ddc54b3c6338c6e18fa01be87c25742516d0972b2368 SHA512 f253c1ac1141728be6ef6100385400dff4075c6ce41d11687af432979abed8d778bc0904406dd1e2509239309000ed9b83b12dd6d5c9fe22d4f269334e0fcfab
-EBUILD qtwebview-6.7.1.ebuild 426 BLAKE2B 1b0f16550615267fb19493899bfd98a16be579edc184bb007eb2109d40b940d15cb0d1bcde3c8675dcabcfa1c4e74435648b1ebd9913a81baad3b0faf0615050 SHA512 1b13e77465674b5885adb9416dce839bb9e3f6342c0c2eac633f7a8beb0f96f82ac5a43d7fdf59be4ef37449841a0a89d00e5ee0a2e0b5b8d093388ac23544f2
+EBUILD qtwebview-6.7.1.ebuild 425 BLAKE2B 1981b2967573ff46eb5bfb76e36cb5323a257f29e9da79cdabac49fd7d97a60a599cb42eb1e513b92486ddc54b3c6338c6e18fa01be87c25742516d0972b2368 SHA512 f253c1ac1141728be6ef6100385400dff4075c6ce41d11687af432979abed8d778bc0904406dd1e2509239309000ed9b83b12dd6d5c9fe22d4f269334e0fcfab
 EBUILD qtwebview-6.7.9999.ebuild 426 BLAKE2B 1b0f16550615267fb19493899bfd98a16be579edc184bb007eb2109d40b940d15cb0d1bcde3c8675dcabcfa1c4e74435648b1ebd9913a81baad3b0faf0615050 SHA512 1b13e77465674b5885adb9416dce839bb9e3f6342c0c2eac633f7a8beb0f96f82ac5a43d7fdf59be4ef37449841a0a89d00e5ee0a2e0b5b8d093388ac23544f2
 EBUILD qtwebview-6.9999.ebuild 426 BLAKE2B 1b0f16550615267fb19493899bfd98a16be579edc184bb007eb2109d40b940d15cb0d1bcde3c8675dcabcfa1c4e74435648b1ebd9913a81baad3b0faf0615050 SHA512 1b13e77465674b5885adb9416dce839bb9e3f6342c0c2eac633f7a8beb0f96f82ac5a43d7fdf59be4ef37449841a0a89d00e5ee0a2e0b5b8d093388ac23544f2
 MISC metadata.xml 534 BLAKE2B e41cc4c8e50d8d207559d68b8a9dc1d7a8c3afd218a28279163c917b24ac6b814361838a54c2b2256b13c0a1d1fbce4809c4f0c526d2fe576763cbed4ba33b6f SHA512 9ba885a1ccff4733d0ba510e4042d5f03a24ee9ac3f8b4cb89ad4b37fe3596fc5ec7f4786798397c58cf34ca82c40ce45d772ffde8be5cc9423428cb4aa19f8e
diff --git a/dev-qt/qtwebview/qtwebview-6.7.1.ebuild b/dev-qt/qtwebview/qtwebview-6.7.1.ebuild
index 76539b793b79..9e7e9d36e4ab 100644
--- a/dev-qt/qtwebview/qtwebview-6.7.1.ebuild
+++ b/dev-qt/qtwebview/qtwebview-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Module for displaying web content in a QML application using the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 ~arm64"
 fi
 
 RDEPEND="
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index f5db3ef9a0c8..ec5baa01f72e 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/childprocess/Manifest b/dev-ruby/childprocess/Manifest
index 36ca82fa2ba8..748d3a994341 100644
--- a/dev-ruby/childprocess/Manifest
+++ b/dev-ruby/childprocess/Manifest
@@ -1,5 +1,5 @@
 DIST childprocess-4.1.0.gem 34304 BLAKE2B 81ca075bde9705eed57c80b0d37e1d8fcf3938bd0319a40f2178dab9be08cba570d90cc5292d585b3911eca5a90b4ff861d1fc79ba487d1a4f08b0fbd9a78c48 SHA512 e635c3acfa5ad85891c3879f240c7e96d47d7d5ec3f472f4ce6661552b0fb7bd72c5e3b9fb73f4f9312b749fbe554b4be388e56a31a3c63c39743d055d774def
 DIST childprocess-5.0.0.gem 21504 BLAKE2B dae2022506c533f3c16337600bf5f489ccb694156079a2c9f2d3b1971c7fb44524e44b49e6e51c5ab6d1350222c8a84a5053b58e299cdc5e13633de2101f3952 SHA512 9ec340c86f4fd978b7a9925bcf90811ff3443f014469e4ff121e2c4758a4068823029ab413d1a57eb9de4a864435505b1edfa60a611709f2a5f99aaf08da422d
 EBUILD childprocess-4.1.0.ebuild 1040 BLAKE2B e78e89fb1437cfd041197a476fc2f29555f99f51ce8dde2cc8b9a6e77a0519971d9c8be28ad509acbbb352f03dec9f41059a38182da84987d6dd23616afd9a19 SHA512 0b7374e06f0b99fd9952077318660d58fdb0aca8b78931c7908def3ef966e1e21254a9a99abfbe961f279367e38b1dc7e60402e4c9cb2007bfb27b38d6d13c00
-EBUILD childprocess-5.0.0.ebuild 1055 BLAKE2B 5ae3605a34132c5ee4173f2e21f18a6d9abcf78db6032dbc1ab762c5dab92464944a13b8bfd34cb4f24c3f8615628712f1d8829a53953e052b3052482b82e40d SHA512 00689f6a4af28e60a827e7d8ea01e41c61266a8da0ec0c4544e4382b22e0cfeaf864bac99d60a7ebe3fa37eb206e5673580219334086cbc293c06271619a2e4f
+EBUILD childprocess-5.0.0.ebuild 1049 BLAKE2B 84907d26e33b6c1391f1cce4c0f2a3dcdaf9e3c2e603d141c18b54627a48a20e5b958ab838561daa7d11a0f7c8403cdfedd606f4f064107ba3c13d1047f36db8 SHA512 a283671f5226cdca384e6b796e9f38a3b3ca9cb6f71f4d4d6eafc01127a0e0723b26390d57968727e289960a39fa471110c1290344b46bede112b3d23b1ef6f0
 MISC metadata.xml 405 BLAKE2B 4e0d8170d75e362ebb3726e2e999ce0c6961a0f9a61dc4afbffc4144000c29854081c972ec1bda28b58e8c01e8e1babb7442cf95799fcfdc96790750a15b60fc SHA512 5fb21546afb33a606905a9f112666fde382e46cfa6c0637dd0f10e6d43b791701e2dd6bafd2e685740e576982473f37255fc2f99c46f1eb08862bc3bf6f0b26c
diff --git a/dev-ruby/childprocess/childprocess-5.0.0.ebuild b/dev-ruby/childprocess/childprocess-5.0.0.ebuild
index 1d3f000e03be..b037b6ac9eec 100644
--- a/dev-ruby/childprocess/childprocess-5.0.0.ebuild
+++ b/dev-ruby/childprocess/childprocess-5.0.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/enkessler/childprocess"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/ffi-1.0.11"
diff --git a/dev-ruby/commander/Manifest b/dev-ruby/commander/Manifest
index 4681bf6d4e36..8d86c6862117 100644
--- a/dev-ruby/commander/Manifest
+++ b/dev-ruby/commander/Manifest
@@ -1,3 +1,6 @@
 DIST commander-4.6.0.gem 38400 BLAKE2B c4adf5b58fe679378012a893526cb00ee71c4cda5686d397ee93aeb11dcf1b32a4aa8c4e6b77c2ed07af75bf2492da65591cf49b2e05a658e753e78a9a12736a SHA512 01e7d4076b6ff632f6852e15bf995033034a71d6320c5b3b41751e86894f5eca35b408311e757c555334d220a9a811a0d60c0fc993414961f1050d948cb9f5c7
+DIST commander-5.0.0.gem 38400 BLAKE2B 702721d8a2565949d84fe8610139d507b966054c322f7badfdd433a49ffcc03a9de51a7c014bd49def313035c7dd4563c8f6673b5225eb42facb776e1502167d SHA512 32f621c2fb9c8b167b6595b1ca7f1a056c089ad6ffdcdcce77db7a19c60bc44910501c41f33a29bdce45c90aa9feeebc596d822ed57efe47301499d5d30b32a1
+EBUILD commander-4.6.0-r1.ebuild 582 BLAKE2B c96d990cfd4792a1292a05ad439a8e864d191cac2c9b13aa4596a46c4ca8b84b9abf56abdbc5e51eb6398208e7ef97de599b641b83833fc8e61838c27e087106 SHA512 41d903d4adfe40c3bccfc58df0c5052d3c33fcb8e4071b2e89d1b082d3cc747a41a627f14a4ecffe92363f11d63a4d8f9f55572ff733c196337833965e064d01
 EBUILD commander-4.6.0.ebuild 558 BLAKE2B 7bfcda7e26fee70c51b401f04669f9470bbde2131693b8eb623ff7dab44d4dc05cdaf7022be039a8875e04456982ebe3b14e59fa361731dbf8810a2726d75cb5 SHA512 84646d03c4be5caa484f9140bcfa5e388d2fe64ccfd890dd39e737a0077b740e2e0e4a875f590465a820ceec2c8b7407d489a800c23ef32684ef9433fff18345
+EBUILD commander-5.0.0.ebuild 587 BLAKE2B 862ab9b43f520bf073a75e03c68e9a79bb2680629d7e76d0179866d0f6adac1aca8b4ceaee811102ba8c4d93f8df23453624f77428aad22478ba0dc8db0182fa SHA512 7afa3e283fa3f043ad50edcfacb82f0212190083fbfc4fdeca91d2a69774acef481a62f6881e9587b8aa650e4570b1b48514235afc8b119c328ff2c9be263637
 MISC metadata.xml 332 BLAKE2B 33d94ec108895d3ece155fa04ec33410f0e5c3fd165f195e2febf2e5821de50bd188e8bf6985db978dc6c52597f2f416afda1757fc334ad750c44c72e491eee4 SHA512 7dc460d149051207704ca238c210058e6fbb42effcf0efbf92f42c2bc2ccc98bc15ed2267d2b3009870664a5e6d2e99d10c8baee39d19c79a8ed214c65893ba4
diff --git a/dev-ruby/commander/commander-4.6.0-r1.ebuild b/dev-ruby/commander/commander-4.6.0-r1.ebuild
new file mode 100644
index 000000000000..a264001ce01e
--- /dev/null
+++ b/dev-ruby/commander/commander-4.6.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The complete solution for Ruby command-line executables"
+HOMEPAGE="https://github.com/commander-rb/commander"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/highline:2"
+
+all_ruby_prepare() {
+	sed -i -e "/simplecov/,/end/ s:^:#:" spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/commander/commander-5.0.0.ebuild b/dev-ruby/commander/commander-5.0.0.ebuild
new file mode 100644
index 000000000000..331471d9b141
--- /dev/null
+++ b/dev-ruby/commander/commander-5.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The complete solution for Ruby command-line executables"
+HOMEPAGE="https://github.com/commander-rb/commander"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	!<dev-ruby/commander-4.6.0-r1:0
+	dev-ruby/highline:3
+"
+
+all_ruby_prepare() {
+	sed -i -e "/simplecov/,/end/ s:^:#:" spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/curb/Manifest b/dev-ruby/curb/Manifest
index f8c28486b672..1d1e8fe3eacc 100644
--- a/dev-ruby/curb/Manifest
+++ b/dev-ruby/curb/Manifest
@@ -1,3 +1,3 @@
 DIST curb-1.0.5.gem 92160 BLAKE2B 395cdbb3255d5a38dfd472787785738dfff8ec7eed69e7b93ae2d993c90635d427a6275cd3510b406fccc7b999bdedf544cb4177132cc890f0473452ad1984c9 SHA512 0b90da7757ee37bd542e2ab31407235788f103e67c987fd820073eb70ecae7cea55cc5ecdc354145ead58cb9762db0f8f27416301fbca93bc0f7a7966a5d8a63
-EBUILD curb-1.0.5.ebuild 1522 BLAKE2B c4f32b24ca0b907745f96890e41ab1d04fca8f9df14043b39cad1e1bd35913aee4b58beeed359979bff191c3fb0d3fba5d308e53074ec3684e84c3c74c294b5f SHA512 69527f300d69e9270357f48267cf0dfe7c99c0c79f57ef951def659ba31422e68ba9ca85f0f88522bf6ee80ac940eb0d47e4435bd648a38e759a52fa17408572
+EBUILD curb-1.0.5.ebuild 1573 BLAKE2B 81e51eedd92b84a1cc2d4d91d106067966635faf9d09726bd1d6b9475fb78f60f84947f9ca5e47543b0a8ce394e7c49994764cdd3dcb2d595cd542de7230eb73 SHA512 e40add5bbf85f423d3f7d312dac96404e68739aca199d8ce58d4cc27260fc082e51aecebadb048ba8e2e3ab3d6a869e6bf5d9c0981864a2339bea8e2f119d28b
 MISC metadata.xml 336 BLAKE2B fd9820c5561af2381bf081eb2f3370727020edc79f306bd94b90699e8a817d218edb11ccc60ae9aa43f1713218a91c9b53cff0a6c23fc3d189e06bc5a1265b71 SHA512 f948d0e7f36c4b9912c58d6a7bf1b2ac5934075780fc7de3d6f759276e4ee297850f725259c06245affca40745bdc2bab0ab78bbd60b308a5d11fc97edeb4ac1
diff --git a/dev-ruby/curb/curb-1.0.5.ebuild b/dev-ruby/curb/curb-1.0.5.ebuild
index 35bac119ac1e..87a4cb375d1a 100644
--- a/dev-ruby/curb/curb-1.0.5.ebuild
+++ b/dev-ruby/curb/curb-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,11 +17,13 @@ HOMEPAGE="https://github.com/taf2/curb"
 LICENSE="Ruby"
 SLOT="0"
 KEYWORDS="amd64"
-IUSE=""
+IUSE="test"
 
 DEPEND+=" net-misc/curl[ssl] test? ( net-misc/curl )"
 RDEPEND+=" net-misc/curl[ssl]"
 
+ruby_add_bdepend "test? ( dev-ruby/webrick )"
+
 all_ruby_prepare() {
 	# fix tests when localhost is also ::1
 	sed -i -e 's|localhost:|127.0.0.1:|g' tests/*.rb || die
diff --git a/dev-ruby/delayer/Manifest b/dev-ruby/delayer/Manifest
index 104a15dc9180..a9362325faaf 100644
--- a/dev-ruby/delayer/Manifest
+++ b/dev-ruby/delayer/Manifest
@@ -1,4 +1,3 @@
 DIST delayer-1.2.1.gem 12288 BLAKE2B f60d1c41b10d948637d945d67a99b34e68e18fda8b381d8ec5d15abea09dbcf4e5dfe5eb23c44b01162612620e1230cbb2b2b9da1949f30cc6e53a371859077a SHA512 e48bb785f208e924ecc9245dfc423953dda1793a3bf1f3a0071fdb922ee383d59cac366830a5c82b0223a9038cc8703f446201e7232134511092c23c29e91785
 EBUILD delayer-1.2.1-r1.ebuild 451 BLAKE2B cd798b32d4d3ef2887c52c093dcdeca9aaf325c249c5e4be34c5223434275e2e7a5904b5ef3ec9fec51080d7fd2bc4b61a1af1f20e495f595aea92de844b1526 SHA512 43ee88d1fd7edc8150b7627c5212a598e883de5b4ec36a3c27f27bbabc9e956c52e732f3e129d9531ef40c025cfb2796eba95686292a1804eb478891599189aa
-EBUILD delayer-1.2.1.ebuild 458 BLAKE2B 442d391d0137e113fa4bb21f9fc8ead0a8e553e51baf83deeec76a16459893427d21cd1d7aae335edb73bbaa36436ed9e7505f85df13f2c62b56b3fc38ee6f0e SHA512 085059aa596912d11ea37809480ac76131be1a2b57fa20f9652f472d7c537ab02601d30564d9abbe4c3548296256cbc6889d2006788ac46aa3f543b37fa2de9c
 MISC metadata.xml 431 BLAKE2B 7961663afc078154157b0d3d7292b0218acb58d0b9a3b4caa6b4723ae832003f6cf70b9272412919c60dbb63ae8db01308e7bd1e189cf0f65d48fb5d3e8010a0 SHA512 040e828c261ce0c8c41a9055b2e000c085fb7e82911e016895011af490a82d5fb26aee9557c16fa342ae479445f71dd8f6f65a0119394253d2c0587198f7962e
diff --git a/dev-ruby/delayer/delayer-1.2.1.ebuild b/dev-ruby/delayer/delayer-1.2.1.ebuild
deleted file mode 100644
index 2794a86fe6fc..000000000000
--- a/dev-ruby/delayer/delayer-1.2.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Delay the processing"
-HOMEPAGE="https://rubygems.org/gems/delayer"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' Rakefile ${PN}.gemspec test/test_*.rb || die "sed failed"
-}
diff --git a/dev-ruby/diva/Manifest b/dev-ruby/diva/Manifest
index a90b6d66244b..61f1c7cb6cfd 100644
--- a/dev-ruby/diva/Manifest
+++ b/dev-ruby/diva/Manifest
@@ -1,5 +1,3 @@
-DIST diva-1.1.1.tar.gz 15974 BLAKE2B 2a3b497181a931eb6cf6c43b9d43ff9e0e7a34a753864bec422b69c6d01aa39b5f9dcc6abd54b85ca27b34d38a647c3e80450c2d7dd9cea1c62859eb3366d28d SHA512 36c7048cba2774567191b40ff88fa7804b61cb9334992dadd43a62f18be6635aa48753593ccba93a7c0438adfb7d75266b26b7a62e102aaf99afff7401c4e99a
 DIST diva-2.0.1.tar.gz 16964 BLAKE2B 768f9fa670db229db424a069adcfa4706c2b9969d143cffbbaeeafc9b1a2eeaa6b4a1c53de90206a4625f65f89a2c478957c3b53a21eb00f89a470e6071a6d57 SHA512 248f2b9770bd8d097fdfd7edfd574358d3e47c907d8c7e15b6e4b9cc5b72e9b7b428bac211e4d5a4e516c206afb82ecb069103c85835a1c65ed646e68e4a0a6e
-EBUILD diva-1.1.1-r1.ebuild 897 BLAKE2B d4f0ef7055eaf3c91a0ee4d1781af258872a18fba217ea545e04052fab972ac14f1b7569e930472fc01c18168db7ec41cac642b5bde063aef7038fbdd00372e6 SHA512 717cf3de21c1d182da24b18882494c081f212b789072890ad26c727192278684a9fea8534f02fb51377fc3b2ea7ebd1660eaad6a76c5744e0e1ec24a717ff02f
 EBUILD diva-2.0.1.ebuild 890 BLAKE2B 01476c0520ebdade2c676ef01137352a8a330cc7f2b80538ebf43b834a5a1a00549d6c19fccefc34e26e7b4ac5e53988938c90cb2fededd9861ae40c06e1081f SHA512 c40c6eeed977f406d01b4743334e20085dd2bc084ee381e036029b39968f7658ca1b127cf37c3d552d7d49ef755a12c1ac4908ebd22b19d222e505a1d56b56be
 MISC metadata.xml 479 BLAKE2B 2537793f2fb1c7cc2af71a8aac9152180dcca5d41f2f57d261a7b3e00bee04156fe78e3df444f6e00cb940bace4db0533bb22eddc7faa26fcfd7960b97d24f9b SHA512 85607cbe0553043886689e05f3f955fca1b0c7381044d3d95d5eb47f1cd23c48524d7a8810fe305c913e8bddc0dcbbbe1084bf13e87176854f70bedabcdaa6d0
diff --git a/dev-ruby/diva/diva-1.1.1-r1.ebuild b/dev-ruby/diva/diva-1.1.1-r1.ebuild
deleted file mode 100644
index 2ac67e714eb7..000000000000
--- a/dev-ruby/diva/diva-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="diva.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implementation of expression for handling things"
-HOMEPAGE="https://github.com/toshia/diva https://rubygems.org/gems/diva"
-SRC_URI="https://github.com/toshia/diva/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE=""
-
-ruby_add_rdepend "<dev-ruby/addressable-2.9"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e '/addressable/ s/2.8/2.9/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid unneeded dependency on simplecov
-	sed -i -e '/simplecov/I s:^:#:' -e '1irequire "json"' test/test_helper.rb || die
-}
diff --git a/dev-ruby/drb/Manifest b/dev-ruby/drb/Manifest
index fc5df0c1eda5..e8c7777b37c8 100644
--- a/dev-ruby/drb/Manifest
+++ b/dev-ruby/drb/Manifest
@@ -1,5 +1,5 @@
 DIST drb-2.2.0.tar.gz 36203 BLAKE2B 5c60cd5dd8ab26434046435d98e203c7a50c6160edeb5373527140df8a26c7494a05a00b7faff11f1a8cecbeb963736e87adc1a9967e78b6c81b47d5c234eab3 SHA512 763f1ab8645d0bf168fc56bbde85fd4992405530d1764f49e18f2529713b3b2d62cc314b65e59472c11bbbb964e5133fe463b1f266ffde35f79b836a527c864a
 DIST drb-2.2.1.tar.gz 36179 BLAKE2B a09b88835cb211b9599d4b714c3921c6bd4c35171e58cfcf5b7e68e8811b6a253ecdf9ebc697d1c5007fdd4e246effb73183c2440b4187fda060fcf314764ec0 SHA512 f896c068306908977a3554ba9adc88ec8e145a6ef60c2b32ab15402a1d20ff206ddbcce955b7e7f19bdbbd8613521819a56733bf0d2ee28e72242a7f5257cf38
 EBUILD drb-2.2.0.ebuild 746 BLAKE2B 0e747a9cc74849361b62e52f9ad89c08cf4b644d8ba8d5f34d0ccf557eddf0247d6755d2119805f6a4cde233f7a1e14b4d61cd17523bd27773535e6e1156e550 SHA512 718a5cd7d7ad44ca9dd3ab519aa417f42a4a4ad1730e16d3ca6712bc38891ebd93e6286002ca380ae7ab847059b0365b1dec53afe859b113149a187a4a9e7d64
-EBUILD drb-2.2.1.ebuild 738 BLAKE2B d22161651203b8e184e11f7724e0fd152ea8f4465f9d19db1b76c2c7fb9d9112b89bb8d9cf37083df0c963d40a812737efe97db2d18ae1db43239af300ed59d3 SHA512 4b9db1cbaa82a9af4dcc3b77e353a66a89e14e22b9de1a2262ec6a10ccd75422c231b743a152ecd78295ba3cb36e7972f6a24b4ee016ae3f43776326d2717b2e
+EBUILD drb-2.2.1.ebuild 828 BLAKE2B 7a9b629c2f8c4fdb2bac87b8228769fb06a54b243abc9e5d8549dc5af82b1b068ed9d550f99c3ef362c6fe6314ca5b992abde663009778cd4a798e5a469bea5c SHA512 c4670829db42c1b17cac0e82e6205117b297f876e7a3efc724a1926612790e082858219113781631201bbca95dc0f6824d4655ca485632d9f9cf791e636e9b57
 MISC metadata.xml 335 BLAKE2B 200a0f834c2bef037f3c06f8b28f48699ac38d381683371d899d8814c27ef9d77fd673a61b3f59cfe4592583f372be6146917578b9f6ec24c7cd30d9200019b7 SHA512 33a0178f6f901b7c06ec2c511911f423fcf8ebb34af6a4e9379371c2d119be4744cd6807eb41bbeba9e56e87317bebfdbf62b8962406710b7285f8eb884ef9da
diff --git a/dev-ruby/drb/drb-2.2.1.ebuild b/dev-ruby/drb/drb-2.2.1.ebuild
index f47a54d0c2b1..27f2d5424e9f 100644
--- a/dev-ruby/drb/drb-2.2.1.ebuild
+++ b/dev-ruby/drb/drb-2.2.1.ebuild
@@ -17,9 +17,12 @@ SRC_URI="https://github.com/ruby/drb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
 
 ruby_add_rdepend "dev-ruby/ruby2_keywords"
 
+ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
+
 all_ruby_prepare() {
 	sed -e 's:_relative ": "./:' \
 		-i ${RUBY_FAKEGEM_GEMSPEC} || die
diff --git a/dev-ruby/ethon/Manifest b/dev-ruby/ethon/Manifest
index f7fd945e0316..f78d3f79c83e 100644
--- a/dev-ruby/ethon/Manifest
+++ b/dev-ruby/ethon/Manifest
@@ -1,5 +1,5 @@
 DIST ethon-0.15.0.gem 59904 BLAKE2B 9a6bcec605d6133054c3ee9b4546aab4d9282266876cd9c6e9c923d3405a5541871ebe83385185dcc42f0cea37735cddd9977e2da72badbcaaac55b8c634b94c SHA512 6e04c70e105fb95f1e0ff62e1d6ae009bb7b39a60d85ec9e43b10c016f33f679620ded253089a738e0cef5010e9023d1093dd92b1caacdde8f6a745cbae2b5b5
 DIST ethon-0.16.0.gem 60416 BLAKE2B 6970554d8cbde18c0e08c95826f6444614d8378a3889e9347cc66170f80b947951312e3e65712106864351285f331ea0cb67c2e24e22ecc335fc0fbd571eb521 SHA512 3b31affcee0d5a5be05b5497d4a8d13515f8393f54579a3a9c8de49f78d3f065bb92659434b023f0a8bf8e0cccfbc94b617695b93c4d3f744cccd1eff2e68905
 EBUILD ethon-0.15.0.ebuild 706 BLAKE2B a51d29a62f6d6df5b7f37b58315508f83d337957484a20c19ec46e3aa33a6a5445a7cc32adf3af95736695f3c73683e94915c9051f774ab3018af342cbbcb6ba SHA512 a49414b3a4da40fc45f3cd66ace98473964d9738cd01c3acb266397254ca81f2a5659c76c555ba72c85db70d5fdbe03e9108fb5b3afada17871f64796b3c66b4
-EBUILD ethon-0.16.0.ebuild 699 BLAKE2B 487d65d51ede7290c03cd46ff255237847a101ba2d905b71cf16c1157fec5014e6e41de443811f0fc5ac26f4c3f45ce2d6e013c0cc655e856befa97f1cf405dc SHA512 421a59913655763cbf797b3eadb7ba2dd70d57f83bde4460eec326cbfa1961e42e3aa4756299c29eedc31dd45e94cfe672a6b889160bdf457ef33cb22e9bdf06
+EBUILD ethon-0.16.0.ebuild 761 BLAKE2B 905450e169770cae823d2745702fa41c0e7ebbb13f02a41f0f2e2b32ad0da02171a5a46907aac0247b93fc2c25d65c4bfc3f99f6ce538ad0abfdf6b3b663f592 SHA512 f37d76ff932dfca0e8d38f24b43f6774d9dfd782fa1a0effa643890963c81abd0c9fb0c942fc571cfdcce567b558cfd87ecc300cc06431566e680f132cf63d31
 MISC metadata.xml 341 BLAKE2B 34c556cae0be837fca96c8414dc02507ce4a590994a02ac326bb07a577817e748139394f6e7a06edf6f6bdd85f01bd8fe8b36f82245417fa6113602185df7045 SHA512 f62b2ef5e0f393ad1d4a34459d68119d26dcf8afca20dc743c52e52de2ad675ae88791537634631465c203220e0bd94b4037c3b4155d0108cbbb57907eeaac06
diff --git a/dev-ruby/ethon/ethon-0.16.0.ebuild b/dev-ruby/ethon/ethon-0.16.0.ebuild
index 06a88849bf21..c63be9e8f569 100644
--- a/dev-ruby/ethon/ethon-0.16.0.ebuild
+++ b/dev-ruby/ethon/ethon-0.16.0.ebuild
@@ -24,7 +24,12 @@ RDEPEND+=" net-misc/curl"
 
 ruby_add_rdepend ">=dev-ruby/ffi-1.15.0"
 
-ruby_add_bdepend "test? ( dev-ruby/sinatra dev-ruby/mime-types )"
+ruby_add_bdepend "test? (
+	|| ( dev-ruby/rackup dev-ruby/rack:2.2 )
+	dev-ruby/sinatra
+	dev-ruby/mime-types
+	dev-ruby/webrick
+)"
 
 all_ruby_prepare() {
 	rm Gemfile || die
diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest
index 3c5061ee76f9..52fca14d2643 100644
--- a/dev-ruby/fakefs/Manifest
+++ b/dev-ruby/fakefs/Manifest
@@ -1,5 +1,5 @@
 DIST fakefs-1.9.0.tar.gz 56514 BLAKE2B 07e84f54413052b3bf37934b395c6115455ca241d42700dc054729be2ce82eb91944b83e01933fd001b46c9db593f2fd7a9b69f5f49529fde3e1ce967498db5b SHA512 e6be021fec79517127c6f514cc3379fa9c64d75c16d0ac80ed5b677f55625f1ee464eafa0768523a4b364323cfb1aae79814057ee9be3a0d947aac22d39a88f5
 DIST fakefs-2.5.0.tar.gz 57850 BLAKE2B fc53d8f3dd40bfbbef81e9c092439a099a9964b4eff8e5fa6d59c2215aca735d02ab24f2a44c2f51fe874c2a3b088190455cff17a3bf9099e9f56effbceed61c SHA512 acc2fd6891964ce6ab3dd307d8bc90dcaa92c9c01328865bfcee5de5959089e7d7dcbb4d52576b5fb81321ad12719c7d3999d6b0102e5e2d9ef88522ca032bdc
-EBUILD fakefs-1.9.0.ebuild 1120 BLAKE2B 7df4041b6aea1999135f4487365a5f9bbbb00e7cab4b618d303a712ed7609a81f627dce41bafcc97548230f1681f74ab38e2f5ce34a4bc0c2616b6dfeee3625d SHA512 b5fddd44abe6b0464648f494f021b1b1374f044767ccba074b7590f8111728945eded741364854b15854ab6e2d6c1dab644512c2e771c8a7c6edbc797d750aad
-EBUILD fakefs-2.5.0.ebuild 1237 BLAKE2B 03059bf55939d40c40e7b8d8bedbca64fd51eea540dcf1127290cf9667579cc09aafee5e5e01e4b16154e726e8d0bf5786f454d66a6a5ec45183394ea19d7aa8 SHA512 97cbef780170c316a5918f2dc7b944f889e500917d96ac14fd0448f4b1c70ee204c64e3a61e1d6a77d676c607c42646d4288aa04aff56bfa1aaf761353c79a7a
+EBUILD fakefs-1.9.0.ebuild 1127 BLAKE2B ba2ee8f2f95b799605be1e0c23df307d228a3fb6b203cbfe66c4f28afcd2400518a7b9800d0b350942195797677de494ffb486e6cafac6c849c53ed8ce1cb05c SHA512 ea63f27d5d1db48fcd01f610c8fc2defaa05284733ef2bf5f7316d3c9ba06491570d1df5314f2ae591206392606b0ed74ffcea0c443fa2518389278ae2f97311
+EBUILD fakefs-2.5.0.ebuild 1315 BLAKE2B 0de93b3b29e7e849530342e8b3fba12087e948f1c2575f7848398340ae8f8dbd3216fa19e011153b1b53b5cdccb86b3d6d787d34ebeb9800b77eb8d0a761889c SHA512 884d1b6bd62cc71d49dc7866ea71952c2789a7bc4f190374216b20a49fd5d222f1817f28fb0056291009785cb7a0a3a48ad49c171e1be377c4556f770d1bcb8b
 MISC metadata.xml 390 BLAKE2B 0bb4b174c4e97c50f3abdc00222b9b761e71b26bc9da391413ab9fa8d69d1f510d3ff57c44caf2a244e5a63c4e1d71ef1aec0b1448d442be28acca14bb4f129e SHA512 8898c4094b8e0d7f161be59595430ad65fb856f72fce0a6cc5fccc3e494d6c63a370fe4733db20256ab56907918559dcef053d60190039d57b1817e8e24d6edc
diff --git a/dev-ruby/fakefs/fakefs-1.9.0.ebuild b/dev-ruby/fakefs/fakefs-1.9.0.ebuild
index 863326d29b5b..a26eb7f644d1 100644
--- a/dev-ruby/fakefs/fakefs-1.9.0.ebuild
+++ b/dev-ruby/fakefs/fakefs-1.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby30 ruby31 ruby32"
+USE_RUBY="ruby30 ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
diff --git a/dev-ruby/fakefs/fakefs-2.5.0.ebuild b/dev-ruby/fakefs/fakefs-2.5.0.ebuild
index c55bf06e9f18..6555ed2c72e9 100644
--- a/dev-ruby/fakefs/fakefs-2.5.0.ebuild
+++ b/dev-ruby/fakefs/fakefs-2.5.0.ebuild
@@ -41,6 +41,9 @@ all_ruby_prepare() {
 
 	# Avoid test that uses the console and hangs on user input
 	rm -f test/pry_test.rb || die
+
+	# Avoid a test broken by newer irb versions.
+	rm -f test/irb_test.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/fast_gettext/Manifest b/dev-ruby/fast_gettext/Manifest
index 6f7c03eaf5fa..92d3607057fb 100644
--- a/dev-ruby/fast_gettext/Manifest
+++ b/dev-ruby/fast_gettext/Manifest
@@ -1,8 +1,6 @@
-DIST fast_gettext-2.2.0.tar.gz 93511 BLAKE2B 8f4a8b169533194a82465ca29b4cbf52e9c724b9976355ad64459826ff9ad15da9762c6e90e237fef046fc6a8114abf54e0022eec573abf98a56bd067e7c06dd SHA512 06daacf46e4c8ef272ac2a60f8fad1abbb3eaa2bf5242991e7f32fd87e911917b6baf4965b0cbc96c11d0be0425585d501258d0c1faa065469dea6c3b8c97797
 DIST fast_gettext-2.3.0.tar.gz 93620 BLAKE2B 2f4dd0f6ad74df593573ce73ee40da549e506fc6fc7ca9ea17dacaa120cec97c202ba31b1fe32b628006fa1381572858dc314110a76c1ee7a91c049664133ede SHA512 517499785022922e54278ad4427abaabb63fd9d0470398cfca1c1804f3ca4992c01105ea727d152d2b8d1cbab86138a7552dfbbd4b3b3241b5fc1a3298db7dc2
 DIST fast_gettext-2.6.0.tar.gz 94293 BLAKE2B b7b955fa87a010c85a22824a9bc5d6835836219cad13c82f42c16b1102a55b5d33a7386394efd2ba2baa299445d29e444ffcc750733ae51c9defc297a769a06a SHA512 1f0b824a8335572646a8486487e22b9fbe4ee63d0e67985a6b56806afac565610492834d34d5e45dab7908e986cc34ab80261aaea87489898e90b6fbe51a4f0a
 DIST fast_gettext-3.0.0.tar.gz 94279 BLAKE2B bc1988a87f9dfe3b6a68d6d614e0d42ead3b6eb6d698a55596fb394ca646fd373a066a49afd9d69806e3dbbdc48e8150249a64aa5f00ab75d88fa650ee02de8b SHA512 870263485465d02e03363ac4db3116cea1ecf2c71db7d5432fec10857de7653bc200241b8cf38ac30a17c51c498c3e1401b5fca3a27fc57a60c9940c7ace4ccb
-EBUILD fast_gettext-2.2.0.ebuild 2207 BLAKE2B 8b615a2090e386bdb17cd2d70cc31cc35d16d2d124e25e7f8b92404a04557bf70c311e8b17789ae5130a22000be83ccad194022d10d4c38f4cc24b295495e36c SHA512 60de634f2b4daa49e95d9270e457c51a02d7d6d6b7d9afda137d9becaebfceed5df683dfa287a5bfc0d5d1d1fef341ba26a7f2cdbd800619ecf0e18aef4e055d
 EBUILD fast_gettext-2.3.0.ebuild 1721 BLAKE2B 5ae27f2b1f08fa81452d36c69e203d049b75369d838797ecdbfc53861303b8290c8687b8ed757b5d60ceb72f729652463293aee244451bad3ff8f0d5e796732a SHA512 58eef293191d6fee9ce92059f232271ed8a2cfd85fcac7c5447d39c4fdf0eb00cb25267fdaa37260e831ff97b2ea80aff3800c8bd0ba802ece1c466d15fb5c1a
 EBUILD fast_gettext-2.6.0.ebuild 1757 BLAKE2B febb9360e1c1b1451e39c3cdc7ee69a4c733b620def311d75f3b24abec7e09b1149a7d3adbfebcdc97325cb5914bba473df7ec06fb221c2cdf463ba21042ceb0 SHA512 ebd76b90c3195015d11ac28b39a8b11f10adf2b84afd7a319d69b38a8ba5dd1311536806154cbba962fca33fcfc60861be1d21010405a18537c4078f39025b5f
 EBUILD fast_gettext-3.0.0.ebuild 1768 BLAKE2B ab2212d200bb86eabee403a30d1bf17ada52feaba089013c97e3ed7d626b0a36d10c8be61057a2e55a5e0ad2a680e3e8a1aaa397fe94e423850cd373036be309 SHA512 0cbc62ae235b63beb9e1a2dcff632b5288215ded36066b464c9d2639e5f272f5c76d793307c9c877e9f461c915e46dbd588abff24efa203b9e2cd478a110665b
diff --git a/dev-ruby/fast_gettext/fast_gettext-2.2.0.ebuild b/dev-ruby/fast_gettext/fast_gettext-2.2.0.ebuild
deleted file mode 100644
index 0d357c632ebb..000000000000
--- a/dev-ruby/fast_gettext/fast_gettext-2.2.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="fast_gettext.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="GetText but 3.5x faster, 560x less memory, clean namespace and threadsafe!"
-HOMEPAGE="https://github.com/grosser/fast_gettext"
-SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	rm Gemfile.lock || die
-
-	# Remove jeweler and bump from Gemfile since they are not needed for tests.
-	sed -i -e '/jeweler/d' -e '/bump/d' -e '/appraisal/d' Gemfile || die
-	sed -i -e '/single/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '/SingleCov/ s:^:#:' spec/{*,*/*}/*spec.rb || die
-
-	# Avoid unneeded dependency on git and development dependencies.
-	sed -e '/git ls-files/ s:^:#:' \
-		-e '/\(wwtd\|bump\|sqlite3\|activerecord\|i18n\|single_cov\|forking_test_runner\|rubocop\)/ s:^:#:' \
-		-e 's:require_relative ":require "./:' \
-		-i fast_gettext.gemspec || die
-
-	# Avoid a test dependency on activerecord since this is now in the
-	# dependency tree for app-admin/puppet and many arches don't have
-	# rails keyworded.
-	sed -i -e '/active_record/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/fast_gettext/translation_repository/db_spec.rb || die
-	rm -f spec/fast_gettext/storage_spec.rb || die
-	sed -i -e '/with i18n loaded/,/^  end/ s:^:#:' spec/fast_gettext/vendor/string_spec.rb || die
-
-	# Don't run a test that requires safe mode which we can't provide
-	# due to insecure directory settings for the portage dir. This spec
-	# also calls out to ruby which won't work with different ruby
-	# implementations.
-	sed -i -e '/can work in SAFE mode/,/^  end/ s:^:#:' spec/fast_gettext/translation_repository/mo_spec.rb || die
-}
-
-each_ruby_prepare() {
-	# Make sure the right ruby interpreter is used
-	sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die
-}
diff --git a/dev-ruby/ffaker/Manifest b/dev-ruby/ffaker/Manifest
index c341f7c38c0b..b9fb35d4b75b 100644
--- a/dev-ruby/ffaker/Manifest
+++ b/dev-ruby/ffaker/Manifest
@@ -1,7 +1,5 @@
-DIST ffaker-2.21.0.gem 463360 BLAKE2B 90742c81b719ef6930269d2b6927add981f7d001a1465b5835894acf4e627e3870123d3e0c5c9449468c2f34c1b783e625daf668d900d6956487f6036ea8da8a SHA512 bff7f36ab6c90ac66781ddf034a628323a673a13325b93f3b12b0298d4934df3d7752e512daf7c1a893378c8d66b2d3facd2d407bfabd1dd02b64944acf73a08
 DIST ffaker-2.22.0.gem 470016 BLAKE2B be1ac238a03e2cc705327b373bf9844aaf2e80440665e46e79127c35e77d576b4de0a4d34f74f7b1e1ac6665850722fa8c4e99897576268444dcc51c9ab0a9e5 SHA512 c9b3f3ee5ccc002a9e590b37c38bd7d1d28aa1a81b7b208f94cc73643735492a804915eb6894643d5733469be6582b59d356a30f62f7cf7647a24a99cbfe019b
 DIST ffaker-2.23.0.gem 471552 BLAKE2B 57442ad9c2a38a44e78e792976238319b03475fe9b974f21d3e96901c6a4393638c0c24e4b2d12dd28d27829208a73ed2375c7f43bc9197f23449469faac68ae SHA512 fa12fc3ec6587f122b86feb3937e9d4db50283ae7370487a662e652b7e0ec4333596e183e4f41a7069d7ed3622de037fe7dea8ee2aa107f624ddf66a98542c92
-EBUILD ffaker-2.21.0.ebuild 534 BLAKE2B 1f403f0c031c1e89b0f8036c7d74d0201fb746ea476f55a8d157951a514d3db1a7b7e100e3873e4de7c980d10ad3446bfb586f3d464c744985dfe5a4858991cb SHA512 9fa96dc4071ba5819d8499778807fe2442e0657b09240f3398a42ab9de0de80480a021c4534aaaacad7a7b6d603c472b92a414d97eefba4e04a93546936ff1b3
 EBUILD ffaker-2.22.0.ebuild 539 BLAKE2B 19e61e2c78f85064c9d5f50afcbcde66273882f88223fe163f4bcce10cc87023c997793343bf52580c47109b7ca1451909dd8904cc46b77f8a4b7af6aec62289 SHA512 c963c0a7d12f0f9d5ffdf2e4b9048a608e306fa127744c5ca0e2cbd0fbcc9998799b0094503b9f2a5ff900ca6a97e8e419105b7cccdb7a3671560e08c4c324da
 EBUILD ffaker-2.23.0.ebuild 539 BLAKE2B 19e61e2c78f85064c9d5f50afcbcde66273882f88223fe163f4bcce10cc87023c997793343bf52580c47109b7ca1451909dd8904cc46b77f8a4b7af6aec62289 SHA512 c963c0a7d12f0f9d5ffdf2e4b9048a608e306fa127744c5ca0e2cbd0fbcc9998799b0094503b9f2a5ff900ca6a97e8e419105b7cccdb7a3671560e08c4c324da
 MISC metadata.xml 390 BLAKE2B be8a8a6775e44e4de01674ca066967feb8282c306578bf1bca996c0c575b83e39754c0535f14f9ebf488be1f0d79caa3af5e86b69e9f29e91e27421cf86f3229 SHA512 1a5a0cbf656410a8bcade49b5fa9f1caca8a7b066b0b05b66a9a63988ab4ea0574a342259a0db8c24822f4a5635cedaae9af026ecbac5451fb59a09cbc3ed5a6
diff --git a/dev-ruby/ffaker/ffaker-2.21.0.ebuild b/dev-ruby/ffaker/ffaker-2.21.0.ebuild
deleted file mode 100644
index 2d982ab3784d..000000000000
--- a/dev-ruby/ffaker/ffaker-2.21.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md REFERENCE.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Faster Faker, generates dummy data"
-HOMEPAGE="https://github.com/emmanueloga/ffaker"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	sed -i -e '/test_image_file/aomit "network"' test/test_image.rb || die
-}
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index 61d8f37045e7..49d4e3459288 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -6,7 +6,6 @@ AUX use-libffi-closure-allocations-on-hppa.patch 761 BLAKE2B a6f460a967752b20ecf
 DIST ffi-git-1.15.5.tgz 168139 BLAKE2B 2ddd5bd7bfb7bcd39b6d740cbb1e0f4cd419ce6cb4ec12926f91f254b3f3142bc6166728a81a6f23dccfbf7aec911c63237c20fb0e2c70d30d48f4648e352585 SHA512 3668bafae936bf5010f014fbcf63258b023bcc318882775e7d2fcfc11334722ec2b6e8a8b9c910d406889fb173dd503c5c13f5af8e4f6927921f12f688461707
 DIST ffi-git-1.16.2.tgz 183435 BLAKE2B e2c9dad9c18f1a675905a000c8cec4ecfd0213df52476df21a035ca96faf257260896721364fcadc2e3bfec364dc7d036fc7402ebcc1c1a10af15f8ce9e2df7c SHA512 8329b67fbb6b1c9a8df1eacc2f8b1c2e2b2d80902914af76060fb9f3dad493ca4cfa0624596c080d641f38324bef165f2a6f7fafefe3e0e0653951f8189ed579
 DIST ffi-git-1.16.3.tgz 183977 BLAKE2B 97f4f0bfc8f43e3a3651b48345c72cc8913f5658c2e838835340082205880309b8f270116dffbc253c78e63ae1c94f392c6ef8741e52852890ac81d00767de19 SHA512 622aae9d55b8e859eab58988eaf976206010ab816351567f2525e606b83b3349ce6b9f114208ba9a7c6de97cc6fe73f5708cf968b7dea0944134c6cb44b55c9b
-EBUILD ffi-1.15.5-r1.ebuild 1807 BLAKE2B 975e97790e1cc70bd1d3dfc8f403dd0df6b61476a65fd0cb9028f33b9d7b9a900819999143ba277b101c9a6ca951fba66400a8ec3f8806a0af06ebacfdff251d SHA512 2ec5139f987450c71e35783af67616effceb988ac34683462d1c0f67492d6c92f8d642a3d7761db2b0517410a53e8ac3d7fa86d684f1919606c361e4055f8337
 EBUILD ffi-1.15.5-r2.ebuild 2011 BLAKE2B a8ee77023acb76d3697a3f4aabeb9fd7b698b10b5cfdc5668b2307ebd8959e6286929370ee8392db592bf9ba928f98cfa4a0d28e6a8a28cd0109131e8d063a72 SHA512 13dff67eb0bf7b5ad5da6d9832884789dbd87ed751223c6e8176b8e0fcce4c3178ecf88d33db25176103909cd4e357ed6c72732c2d2d84c2c3252893b4da6841
 EBUILD ffi-1.16.2.ebuild 1699 BLAKE2B f22cde54a65ba14d8026330f3743c8b9fe91142315a169632f5694d4b659810609804c6f2e2833e257e5a9d97beb6d4f4a29f45cb36b2f512d8e6ccc5ad9e8e8 SHA512 bbaeec58868e19d0d6ad91f4a49b358971d6ccc215e3f1fef63bf7762b42ad19393ab0080eaab25afd79f1fe700126fe07a3f9981b12c17897fffc86a0522781
 EBUILD ffi-1.16.3.ebuild 1713 BLAKE2B fa47cfe8ed52e1e8c52e4ad14ff72ea92c3f8f224ad4b42c94775545267cfb4c10b11dced426fa7ae4f17a42e810aec4607dd08d7aaf5518f9a13a625fb4672f SHA512 3180bbbfae9e5c84912f18027a90e798b21f4ed315da7cb822c15850860438e34a0f682b993a8636833ee51e1b77cf75c25421bd004a07446366fb45a2a44834
diff --git a/dev-ruby/ffi/ffi-1.15.5-r1.ebuild b/dev-ruby/ffi/ffi-1.15.5-r1.ebuild
deleted file mode 100644
index 6e437818f9b5..000000000000
--- a/dev-ruby/ffi/ffi-1.15.5-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="ffi.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/ffi_c/extconf.rb)
-
-inherit ruby-fakegem toolchain-funcs
-
-DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
-HOMEPAGE="https://github.com/ffi/ffi/wiki"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND+=" dev-libs/libffi:="
-DEPEND+=" dev-libs/libffi:="
-
-ruby_add_bdepend "dev-ruby/rake"
-
-PATCHES=(
-	"${FILESDIR}/backport-pr-962.patch"
-	"${FILESDIR}/pr-957-sparc.patch" # submitted upstream as https://github.com/ffi/ffi/pull/957
-	"${FILESDIR}/fix-regenerate-types-conf.patch"
-)
-
-all_ruby_prepare() {
-	sed -i -e '/tasks/ s:^:#:' \
-		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
-
-	sed -e '/require/c\require "./lib/ffi/version"' \
-		-e 's/git ls-files -z/find * -print0/' \
-		-e '/^  lfs/,/^  end/ s:^:#:' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Fix Makefile for tests
-	sed -i -e '/CCACHE :=/ s:^:#:' \
-		-e 's/-O2//' \
-		-e 's/^CFLAGS =/CFLAGS +=/' spec/ffi/fixtures/GNUmakefile || die
-
-	# Remove bundled version of libffi.
-	rm -rf ext/ffi_c/libffi || die
-}
-
-each_ruby_compile() {
-	each_fakegem_compile
-
-	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
-}
-
-each_ruby_test() {
-	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc samples/*
-}
diff --git a/dev-ruby/globalid/Manifest b/dev-ruby/globalid/Manifest
index c3d9f8aa0736..73ff1ef47324 100644
--- a/dev-ruby/globalid/Manifest
+++ b/dev-ruby/globalid/Manifest
@@ -1,5 +1,3 @@
-DIST globalid-1.1.0.tar.gz 21131 BLAKE2B 74f49046e84421df1ae4640cf1ecc23d6c09d4a7176583a4662fa89b031ec9c142c09d13b90dfd40cb23417aec3285a93366f975600b2b52b11a62f62878b313 SHA512 42d6fbdaa4de42da6677d620420c96989ed358197b36f4f0e4b4304a4c8a0f2df7d91c0de84381fb0fec87c213d3ba00335e95d92ae2bce59fe7ac7863219c1d
 DIST globalid-1.2.1.tar.gz 24210 BLAKE2B 0cd47d65b6af78b9201ba4300820f94c126e5e69683b87503967a8b7887b9638693d51a9a1d20277dc5678ca925c567d29ed21dc1805825386fe028ddc475074 SHA512 35f3252afd41226a3dd728238be226a1f2ebb62ca853874fdf35e296dd807603319105117d4585df98cdb577efda9166fc5e5733b7af5bea7073d5c44ddec2c1
-EBUILD globalid-1.1.0-r1.ebuild 785 BLAKE2B 32659745be409b629a406da6d81ccec93f1e367e7c03827cf9f766164a407ca97e48f2dde1a4d32f20efc12a88b1aa68794275c9582621ebe17c029ed6d0e8ec SHA512 43c5276503573628c8cddeb3813aeac16baad34857c92366292a39c45fbbf3a9910d3b12243a47d7ecef859f82654140a915edfa9bc4a9f39f09bc14377d3cec
 EBUILD globalid-1.2.1.ebuild 718 BLAKE2B 7607d66c79e6b25576e6afa5be07126f4826c622251e2ba2925fc6ce038ae4b8c9d2afc84b90aef5f10a5b08dc5c8383bd199e1caac81f6b20575222380c2a36 SHA512 31d22b00e653dde83209c5b2970cffcda5c687897a9230ba116612fb870a1af2653f5393bd2cb8655badaa49319de79bf5947cf4902705e1fcbce1e7c0d00a8b
 MISC metadata.xml 341 BLAKE2B e15397f0d2b0ce51ddb3da642f55ca1ed8ce12d69621757ac84ac8649108faa27948164eb1adcd1f5e1aee48b5cb2d01a2c75faf93285bb06c33841f04805600 SHA512 330c1a59a0a77ee5e02a685fb2b6884c16f99028960c308319077b2815a0b86eb4e320bbcae48fc4efadf80931da56ab2163c8b51b544d18c6aab896053c5733
diff --git a/dev-ruby/globalid/globalid-1.1.0-r1.ebuild b/dev-ruby/globalid/globalid-1.1.0-r1.ebuild
deleted file mode 100644
index fc707554e48d..000000000000
--- a/dev-ruby/globalid/globalid-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="globalid.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Reference models by URI"
-HOMEPAGE="https://github.com/rails/globalid"
-SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-5.0 >=dev-ruby/railties-5.0 )"
-ruby_add_rdepend ">=dev-ruby/activesupport-5.0:*"
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-
-	sed -i -e '2irequire "forwardable"' test/helper.rb || die
-}
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index eb3f2370b901..faf8d40bbd84 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -1,9 +1,7 @@
 DIST haml-5.2.2.tar.gz 129833 BLAKE2B d68c24c7a3c817d6d364b2ec92b84b4f56f4fffa48b99d17b2df27da35f50b1fb1f69b184a7b21d899c476e0d4c8ad2b940a7cb2995ec24ecdafab8ef61fe393 SHA512 1aec59fab20d8139a5dfedde2007fa8137a377a345e4d30229f9d1140d56cdf970c8ae70e2647e6a408d7fa543a16050f66a8a636efa6a6b1f91ee1ffcc136c1
-DIST haml-6.1.1.tar.gz 669644 BLAKE2B 239b3a1fe02bcd1e2981198ba7c54c71ca2af0947102fcea6cd600cc6579294856baa290589a7d3a015e54df8bcecf8e50175cf2189e8f4f9c6f9721a558bcc9 SHA512 7d732be085b41b8f0eec418600a82b51c68301081165aa636fa342ae26b74215a202a4b15e592da980d9a7fbe24bad01399f599770420133c4b6ab7523386fa5
 DIST haml-6.2.3.tar.gz 666083 BLAKE2B 8f6c3e6b3538fdd8b6937278073d532245d7ce53bfbb81f2ebc394160af50e8022475bf7225d3e8f8846d0088120de58829dacf91864b91bab4f0ffc18479322 SHA512 28c0031b62c44cf6b057ee88ffb522d2081e92f5d70fc25999b64a59a4430acd63bb9ee4e3fc34139a1a6fe6f678cde6c3ce08b9a5ed5d433d30d661c5983b81
 DIST haml-6.3.0.tar.gz 666327 BLAKE2B 0672d39857fa0dac466bc29468a76e71d583da6637ce8534eb4d84aa4388bdc0f42d747d74cc5389bd24faf428076c13cf1897edc93317b2da7b770830d53b37 SHA512 64ee2eb7fad2e0b77307dd18a268b53a7f21b78b99a8bf80831cda9f8b6d8be983e7a23ba62942d251e7baf2c9732e38c18b842052690e5bbeb27961ca139c73
 EBUILD haml-5.2.2.ebuild 1451 BLAKE2B 7e69cae6af682922121eaa2533730e193a8d559775825cdb1df218832448e727bed7625b512602f2a2fb44ccb18f9bdf27875cb5d4ba527bad9cb809798783cc SHA512 51556e02ae68e0cbe0546ea6a0953cb1157b0f046a8add4959470e083baefe9e97a8989ca24cf730e46a0c5ee115c056a7b9937ac4f99894de1ff07598bcf5a0
-EBUILD haml-6.1.1-r1.ebuild 1611 BLAKE2B 78a927e584ca28ae8caf906d05d4ef2e4cefbb44755edc40eac42ec0f5ae4ee0eea4ca504b66513afeea7e5b226e0f654b847dc116579c9aaab650e027b2506f SHA512 4cebc604ee017ed24c4b1e4e7481dcce78cd5c0f817e3c1c9fdfe09c7b3409b12838c332bab795dcd3c02e2536ab5806586d4967f776aa2fc69ecc44331d0bb0
 EBUILD haml-6.2.3.ebuild 1677 BLAKE2B 0630366ee2fc598762d505820dcba6a5291bf525a22a4554609d5d064e472b05d96778a2e23adaa77a416b317e66fe61be03c38761021e5499dc29d596aca066 SHA512 af19f826dee8052e1197bdb22f39947785a9ef0ee13c7572e850056b29d197f5e8911a908f71301708f234b28c6b2de4b3ec0c6a7529aeaeecf2529d8181638f
 EBUILD haml-6.3.0.ebuild 1654 BLAKE2B 70ad94a35150297e46fb4e1908634a0e01ac29a2e100e8cdbd1e3bc9dfc377384f03c04bbf455ced23943dda0128b378afff481425ffea8595a2d50a559fd6df SHA512 fb292f413049720cf6998aa2775bdca2e38153aca2934dea9b06d69e763f2f48c9fe7112e121b135069821d52dec9afb949cda29d91db9cfe04b3361178e85b8
 MISC metadata.xml 384 BLAKE2B 49a1ec969b1de2c61646aef404bcb19961d7f7b6b8c0324c1f447c8847adb0d3667e653b4273ed1c7e177e7e5216e6275a7c664ee6917ecb48e69d89554a33c6 SHA512 047f50785afcb708d07a770c38e40d7c8be01455832f01bbd006608eb18af8a8470a21ab0c57b7304ad4e2be39121310d0feb1ac64163a1b5e4c1cbf61cb8bfb
diff --git a/dev-ruby/haml/haml-6.1.1-r1.ebuild b/dev-ruby/haml/haml-6.1.1-r1.ebuild
deleted file mode 100644
index a301872e76ed..000000000000
--- a/dev-ruby/haml/haml-6.1.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTENSIONS=(ext/haml/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/haml"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md REFERENCE.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby web page templating engine"
-HOMEPAGE="https://haml.info/"
-SRC_URI="https://github.com/haml/haml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-IUSE="doc test"
-
-ruby_add_rdepend ">=dev-ruby/temple-0.8.2 dev-ruby/thor dev-ruby/tilt:*"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest:5.15
-		dev-ruby/nokogiri
-		>=dev-ruby/railties-6.0
-		>=dev-ruby/activemodel-6.0
-		>=dev-ruby/actionpack-6.0
-		dev-ruby/unindent
-	)
-	doc? (
-		dev-ruby/yard
-	)"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/bundler/ s:^:#: ; /Bundler/,/end/ s:^:#:' Rakefile || die
-	# minitest hack just to match rails/activesupport
-	sed -i \
-		-e "/require 'minitest\/autorun'/igem 'minitest', '< 5.16'" \
-		-e '/bundler/I s:^:#:' \
-		-e '/simplecov/I s:^:#:' \
-		test/test_helper.rb || die
-	# Remove tests that fails when RedCloth is available
-	rm -f test/haml/filters/markdown_test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -rtest_helper -e 'Dir["test/haml/**/*_test.rb"].each { require _1 }' || die
-}
diff --git a/dev-ruby/hashicorp-checkpoint/Manifest b/dev-ruby/hashicorp-checkpoint/Manifest
index 920451e1974d..8d185c820362 100644
--- a/dev-ruby/hashicorp-checkpoint/Manifest
+++ b/dev-ruby/hashicorp-checkpoint/Manifest
@@ -1,4 +1,3 @@
 DIST hashicorp-checkpoint-0.1.5.gem 13312 BLAKE2B 4318cc7748797732ea3719965debd9621136a097bdc6a9bc6577d563eb69c4bbabe8451396bd9281874c1b4adca690fe443f0a98eb10857b1f6b561aa732b508 SHA512 77effab526b798da1739c19021f3832bea7aab9503a159909a712f18da7a0cc6d750dd0783c2bc5a31f650f00f0a65dad706e2159882bae70dcf7425fdb35a40
-EBUILD hashicorp-checkpoint-0.1.5-r2.ebuild 720 BLAKE2B 7ff41c592434fbd04f68b579eb0a5671d8361eedec936df805b9cb530d1bbdfeb3d3cb4c79d419719a5c9ebb22ea64c79178d01d5bcdfab9cb17fdf6db61a98d SHA512 dabf720a2874b30e9fecadcb3919cacc9f6173be5a5b3a4c266ec553de617b221443edf0a90270843dcd055d34d1c24bd8d5507de3e9a2a67dfaf98f5d44fb33
 EBUILD hashicorp-checkpoint-0.1.5-r3.ebuild 713 BLAKE2B 37ef929245237f0d75b6bf2d30b1de068c6052500bbe464a38bc060b9fc17752a77011e1e6bb745ba39579c140294c3c9ee56631bd7fcaeb70ad2870de6437e1 SHA512 20ed0f58a35d3e33d2cea415455bc0baf2cebf37d81d71c4a22c8d6a94bbe4bb5fc8323683d42bdc6f7d6892c2ab74a5cddc91248ad58d06d9140e62c9a25ac3
 MISC metadata.xml 605 BLAKE2B 937bea9911209843d0b56439254061666420ee1fb0b0701915a3f4bd21da836915190cd1b4c0fa314d7f924412b3abd4a927542d46662d4b409e5e8a38928183 SHA512 c4f663167658edc14233365f0211da43323937080c457fb26e611c4b476a0b3585c0887738c0ee6419a48cb9fd47dac8e48a282400874b0aed1fc416ef9e60d2
diff --git a/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5-r2.ebuild b/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5-r2.ebuild
deleted file mode 100644
index b591d117716f..000000000000
--- a/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Internal HashiCorp service to check version information"
-HOMEPAGE="https://www.hashicorp.com"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-
-# Tests require network
-RESTRICT="test"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/rspec-its )
-"
-
-all_ruby_prepare() {
-	# remove bundler support
-	sed -i '/[Bb]undler/d' Rakefile || die
-
-	# Make tests compatible with new ruby versions
-	sed -i -e '/check/ s/opts/**opts/' spec/checkpoint_spec.rb || die
-}
diff --git a/dev-ruby/http-cookie/Manifest b/dev-ruby/http-cookie/Manifest
index 343a696af9f1..6961da0a26aa 100644
--- a/dev-ruby/http-cookie/Manifest
+++ b/dev-ruby/http-cookie/Manifest
@@ -1,3 +1,5 @@
 DIST http-cookie-1.0.5.gem 39424 BLAKE2B 569a0d18c962be378f3974b400ddf2289c72490b2b93619fcd83ed6c00bbf5def76239c52163dc6231060792abf3a19988285a6cd28f158ff7339252da912e61 SHA512 d530d64b5c2fc3757a6de03384fe768317e24a523d4a4215f5bcc6b5bca9e7b94eeaad1e52fbb67548396b7b2ca7c9d8b68ea7b99109e24770fcf34c950469ef
+DIST http-cookie-1.0.6.gem 40448 BLAKE2B 428cd8aef9d08ff86486c1dab10f75e2cf0aa614eda598a95e35598f945a41cc35cf7a871b4b6b56f01435790c7995d1cb83c2fff46463282d66f0e1cd8a0883 SHA512 088949816b70c3eea5464b492cb067d1d1cea8608ba8ad791876b5a33cc57c95b036420e3e9872a40e35c84168a37ab6b4615a049ea98b04588000cdf594bc5f
 EBUILD http-cookie-1.0.5-r1.ebuild 766 BLAKE2B 63ae5fdf150dd535139ca190a422db08bb2843ed7e446386b085f2e9b50c57f3b0dee766b15a1f76c077fdca6a74f80ba2b00fc23296230e823c9fd821c37426 SHA512 d889f2f38d99cd8605583fd7d79b35cbeecaa700409577ab1cd5b5fbfd0de4e122d512ab132c21d054f72ba23e9c78a2fbb993a53fd61e966459db99ba085463
+EBUILD http-cookie-1.0.6.ebuild 816 BLAKE2B a921e373a9cde65fdd089f236539f73a1efb614c95db2e2580587c235973581f787284b48d34b72bcf916de680dbe8908efd3ae8a4b048c50e8801913d4d397f SHA512 cf84d5c7ae31cf8f1aa51c6a74929dd0e8857386b6f5f51c65ac847b64910b85c66f022e7803be9f45458a19a56a066d615e734c26a80b7c284f00cf795f542d
 MISC metadata.xml 352 BLAKE2B 0e1cc1e4cc97d4d773c64a068d2f7246c863fae1c17504f83275d1ab15e59a9bc6535c22fdf0c02d89d778079d100b74e29170b0fbe6fc1ad5464e221751a56d SHA512 821e08b75914f51a4a341149db588c8e3b17fc401a14de9abd44918b9f6bf88bc1d9c76b460a10c1b312669db478759aab90d0bb08bc04129bc8c964e7b3a314
diff --git a/dev-ruby/http-cookie/http-cookie-1.0.6.ebuild b/dev-ruby/http-cookie/http-cookie-1.0.6.ebuild
new file mode 100644
index 000000000000..80e69e9381ec
--- /dev/null
+++ b/dev-ruby/http-cookie/http-cookie-1.0.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby library to handle HTTP cookies"
+HOMEPAGE="https://github.com/sparklemotion/http-cookie"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# See https://github.com/sparklemotion/http-cookie/issues/16 for dropping domain_name
+ruby_add_rdepend ">=dev-ruby/domain_name-0.5:0"
+
+all_ruby_prepare() {
+	sed -i -e "/simplecov/d" -e "/bundler/d" Rakefile || die
+	sed -i -e '5irequire "cgi"' test/helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib test/test_http_cookie.rb || die
+	${RUBY} -Ilib test/test_http_cookie_jar.rb || die
+}
diff --git a/dev-ruby/introspection/Manifest b/dev-ruby/introspection/Manifest
index d17511fe2d58..e0d9315b8008 100644
--- a/dev-ruby/introspection/Manifest
+++ b/dev-ruby/introspection/Manifest
@@ -1,4 +1,3 @@
 DIST introspection-0.0.4.gem 9216 BLAKE2B c97279576a60dfd74453d16a6eb0885326dad18748bd182fe3b5c2a73121553cd3ea66690841df6554fd105e50f5f6df075afb94795b94dbd7caf4615ca67764 SHA512 c228827ac9d8a82a104e78daadf038c674cd464bf726fc3bd1efa82e9d9cab37f6ee909f578585e7846378f0b755ed4d60fa119fd699f6c40188ea2de4ac7084
-EBUILD introspection-0.0.4-r1.ebuild 681 BLAKE2B a38d161dc90a883e217f0e1b0ca710e4c95a07041b1bb380e3bc96d7f1b270deb586794e87542024991b703fb937be2f3be21e11e866281b8f79f1856e87da1d SHA512 c021882e4f0ae41445eb4af4eae206cd276f3f2ceceaeb3736ca2cc90614ab1414959a72ea26135904439c5baf9aa0ff7d498c9ee66547c4dae31733f83abf43
 EBUILD introspection-0.0.4-r2.ebuild 675 BLAKE2B cba928530ccf2e835ddfc785a8bd0fdc5713f3e97a42d859626f6f9e309a63741dd9b872585623790b5baa61bd11e83609dd5e7031254ec0f78346c382753cbe SHA512 f0c160024ea0b530225b01c32db410b04516e10e9ce0fd702a697ad884a6ff0831ac3a1965a3b47249711ce4d1e4e8160d5cb3080e94c97a121ef434080bb07d
 MISC metadata.xml 334 BLAKE2B e4bbe4f19f68bba0947fe3a32442712fef7703eb1a27d9d8612ca32057960041a65c9692fa4f084aaccb57c9c8d0c1e8761a3ab54ccb76cf7f02496743f17299 SHA512 23e1823c17c9fdf37fb731223b93d77f37a752d676cd526549fbb2ddf91f23e3493f92eaf6028fe773ecb538a6ff8fb9c0d2b078df2df1dbb5358488bf4958ad
diff --git a/dev-ruby/introspection/introspection-0.0.4-r1.ebuild b/dev-ruby/introspection/introspection-0.0.4-r1.ebuild
deleted file mode 100644
index b8e10237506a..000000000000
--- a/dev-ruby/introspection/introspection-0.0.4-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
-
-# No documentation task
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Dynamic inspection of the hierarchy of method definitions on a Ruby object"
-HOMEPAGE="http://jamesmead.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/metaclass-0.0.1"
-
-ruby_add_bdepend "test? ( dev-ruby/blankslate )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
-}
diff --git a/dev-ruby/io-event/Manifest b/dev-ruby/io-event/Manifest
index 8908c56722f6..c19771c71c77 100644
--- a/dev-ruby/io-event/Manifest
+++ b/dev-ruby/io-event/Manifest
@@ -1,15 +1,11 @@
 DIST io-event-1.1.7.tar.gz 35211 BLAKE2B d288ec902c4d775b49315d4eeda8bb0582b7444e7adc60846283fbffbe8ecec6e13c1bc7ce898c4aaf3e78d5eeee2602045f9bde561f6f50c797b7aecb3d7b01 SHA512 f61d0eb7203b4bd4b38d1f42a23c67d4ae04dbbb4c7018149d52db440d769131581347198f4a6da6e99aaa1ac526ad1c1cb9d56ecf48c1fc70fbf1b62fb161e7
 DIST io-event-1.2.2.tar.gz 35405 BLAKE2B 9fb96c920524db8111b8d3650f2559df71e262f2f4cd32080a3e04f09da5df3d0f0a6777b1d37aba7848b9f7298d9fe5c5684c3211ff39b5178d452d10dede70 SHA512 6ebffd24eb40392496f488ee578f17fcc2e713d3b90cea20899c82e26a6d601b0670d21383d5e33345cad9a33ae43120e8c1d017bb7bd44ff95be2c17bab6712
-DIST io-event-1.3.2.tar.gz 45587 BLAKE2B b4a6e03d6470e0e1fd214e8d4ec9c34b44590b949dd3c2206ace0d963a7eb5f0164d4ddddbe7524e3e050869e45fdccce391174342b6185e2a8c29aaa9e8c1fb SHA512 532dcaf2fb658f4770cc99a486adf1c2d853260c9f4b9bc9d411dc1a84f439881b96ba365523c7566f8a87cfb44a375642a92f327c9ea95803183dd552dabd7a
 DIST io-event-1.3.3.tar.gz 46284 BLAKE2B f2d6fe2a1eb3c1d0f26097847b9b0d464fa274d215f620ffa46e7718d89f97a7ff8bb00b145d29763caed527410d0e3040dab313445e11b26b2ef3891d05f604 SHA512 71391822d2664f9c9534cc474b2e9b052d98f44d7c985b768c93ff2956379f2c107094ba4ab9e376bb3820e085f15187f210566229a31ae493334cf4af073bad
-DIST io-event-1.4.0.tar.gz 46329 BLAKE2B ece30e2673f14f9529b0808f5725f45ee847c337d08b5547161fa7d9cd2f807cf969ff22a25a21c0869b12b9ccd47a3d12bc6694a97ea49ab18700a30bd8365b SHA512 a7002e6df70180208c2f617d59e72bce98c13b2bde6af459f72bdf7fc0045e989225ddf39acf0be9b33d1d252443cf6cfc0076114dfc2c832732c0f7baa06569
 DIST io-event-1.4.4.tar.gz 46919 BLAKE2B c66b410c1eb3e1b398b2ff8f1cad103f0d75e680b2b79ba8e0144ebfe0d0ce29de4996c2c758447c665231c07a939e31af5f3fc47725be33733dcfed8afcd12e SHA512 f8c7503d5d924de2847a57e6af0b01cb8c1638f4b3060a3afc58ca7cc3a719d5df2fa7b83252d1d761f4a3dc8da68b759797e1d1cd6168ad16421924ef3ef316
 DIST io-event-1.5.1.tar.gz 47618 BLAKE2B 239beebca88dac137ab826df0da9f4c7a0b910a9401e46a542dd73a151009ca6d3b0d94584421a039e693e1f5e3f40e37fa98611ff8f603dc5d4bd30bc0788e3 SHA512 71f343ffdcabde14f1737574e66c198934cdf5c88db0c9dc58106da588a7156d4b36cd2a3bd0552758468bcd78c8ee3ae1d59eb0432f7e66f57e3d9dfe75fa3d
 EBUILD io-event-1.1.7.ebuild 864 BLAKE2B 037dc38604de903a4042610ba47c7328911e9092e3ca19b0822c2f7e2439d1fa013682efb1cfa34f7e1d8a2b00ee5bfa8afeb2a2694b98418686af56007ea1de SHA512 d3cc42893d9bf4a7aa00564306259bdbea3d5fbc602e8359889d023e31ad8b786595c2dc319755b6b1c2efc802efabd9b67551c1408bb1b754a97f8f9d9d3ef3
 EBUILD io-event-1.2.2.ebuild 992 BLAKE2B ba1a508df70f4258e119355786979639d20158160f6636ae430f9b62ec01dbf52d68848df9221d8672475b51a66a994c9aa9fdac5b40d363b58dc48d57c45978 SHA512 3cb74b7e67a94fab22bb4bb8c6298ab4a3c599d782cc803d92c21c65b94754ba878dc5d2f994e493901286858ce10c67a4de450fb4eb2a04952ac1c269b9d7f5
-EBUILD io-event-1.3.2.ebuild 985 BLAKE2B 33f1ce0167ede05a2d63832701db2537d6bfa835e0959515d8c49ba2ab504ce9dbc55d2be3d368f9d54925e59f1d4495ff3903ae74a23eeb62c933271d5525c4 SHA512 169059990dd6a0a30d1b8f22ecc6c4177226b186917ddabc01000ca96788e682f70f516394abe62e3cafaabeeafe3080bb7c8a80ab018cae1ea961e84aefc7bc
 EBUILD io-event-1.3.3.ebuild 983 BLAKE2B 1aa0f8a2ec73822402defb15b19fe21e10ff4fca6aa5c71c993482ca7aacfd18d9fa5a6abf7e60c790ca3be93a4d1f8701224e4f8b6f5782e00520606d6668d8 SHA512 b1062b3c43d9c90d409733ab9fc1f7df421f14e4b99968ce51685eb066087756eae4761e3ba0b59f4a1327a46f916ca874baa1283606f204c8b230258b9b7843
-EBUILD io-event-1.4.0.ebuild 990 BLAKE2B 231cedb074e8eeba0dcfe1310656fb42a43930fc80da5c40b8cbff69f0105979da03510691ce51e93c6ff2125c33ebc02279ffd19182619a471e408be34cc211 SHA512 b3d1f759b7fb6855c79874603dca47b650cf92123e822dbbe4fca32d4d90ea84cae028472a3ea395aadc23cf119d23b159dbc3c6d0e28f17dabcab239c52502a
 EBUILD io-event-1.4.4.ebuild 990 BLAKE2B 0ed85c57bfd4c5bb8ce3bd6f4bdd0dd1ac2de8985eb44c2ced441ceefc0416ff50c9ccac0158a1adb7c09c4eecf991de3f51d313f948921c0dffe94f56d1137d SHA512 c3034285f5ca0b111afac0b0ae54ef680435a47fbe8b89de82770a6d73cd29150216c766089748b1b4eeb899b699e0645271e8589eb15b02112ba0753279313e
 EBUILD io-event-1.5.1.ebuild 990 BLAKE2B 0ed85c57bfd4c5bb8ce3bd6f4bdd0dd1ac2de8985eb44c2ced441ceefc0416ff50c9ccac0158a1adb7c09c4eecf991de3f51d313f948921c0dffe94f56d1137d SHA512 c3034285f5ca0b111afac0b0ae54ef680435a47fbe8b89de82770a6d73cd29150216c766089748b1b4eeb899b699e0645271e8589eb15b02112ba0753279313e
 MISC metadata.xml 453 BLAKE2B 6f734840e504644c7d84ca58d0ac13f4f36a6e3f1d4d7a412871e224199d0efd071bbab9133f5a95ecf64928b4234787172b6d61c9ce085a6cc15c362e60195a SHA512 cc8b195ee59e7927a6cf1d9c1e82c222d697044cc917ebdcb4406ccb6372b3a51f09696b1618559e83b0ba98fbb2a8fd4b2977bb4adb46d437df90d2474648cf
diff --git a/dev-ruby/io-event/io-event-1.3.2.ebuild b/dev-ruby/io-event/io-event-1.3.2.ebuild
deleted file mode 100644
index 03298eeac45f..000000000000
--- a/dev-ruby/io-event/io-event-1.3.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-RUBY_FAKEGEM_EXTRADOC="readme.md"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_RECIPE_TEST="sus"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An event loop"
-HOMEPAGE="https://github.com/socketry/io-event"
-SRC_URI="https://github.com/socketry/io-event/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="+io-uring"
-
-RDEPEND="io-uring? ( sys-libs/liburing:= )"
-DEPEND="${RDEPEND}"
-
-all_ruby_prepare() {
-	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
-
-	# Avoid dependency on unpackaged covered package
-	rm -f config/sus.rb || die
-
-	if ! use io-uring ; then
-		sed -i -e "s:have_library('uring'):have_library('idonotexist_uring'):" ext/extconf.rb || die
-	fi
-}
diff --git a/dev-ruby/io-event/io-event-1.4.0.ebuild b/dev-ruby/io-event/io-event-1.4.0.ebuild
deleted file mode 100644
index 9c7ed6bf4f25..000000000000
--- a/dev-ruby/io-event/io-event-1.4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-RUBY_FAKEGEM_EXTRADOC="readme.md"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_RECIPE_TEST="sus"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An event loop"
-HOMEPAGE="https://github.com/socketry/io-event"
-SRC_URI="https://github.com/socketry/io-event/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="+io-uring"
-
-RDEPEND="io-uring? ( sys-libs/liburing:= )"
-DEPEND="${RDEPEND}"
-
-all_ruby_prepare() {
-	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
-
-	# Avoid dependency on unpackaged covered package
-	rm -f config/sus.rb || die
-
-	if ! use io-uring ; then
-		sed -i -e "s:have_library('uring'):have_library('idonotexist_uring'):" ext/extconf.rb || die
-	fi
-}
diff --git a/dev-ruby/jbuilder/Manifest b/dev-ruby/jbuilder/Manifest
index d2d86601c220..03460d4f3600 100644
--- a/dev-ruby/jbuilder/Manifest
+++ b/dev-ruby/jbuilder/Manifest
@@ -1,5 +1,3 @@
-DIST jbuilder-2.11.5.gem 27648 BLAKE2B 0a40c82ad1f68df5748be4425605eafd03bcd0262957915bc491037c45c21f5542ffae3d3f4e7dc8a20874f96dc1a7c3c3dd348a4c09b08f15117ca45103d260 SHA512 65caea9426cfe146fd4aaf0c9313e04f8f9d23d72faf959da4042d090f4e31be6a7040418fa9e6dc3f02e8acb3a0e2b5d3216af4f2fed8761b70a35101f4eb96
 DIST jbuilder-2.12.0.gem 28160 BLAKE2B e4e32c7d6b71b0daecd0148d74179115b14bb8450c00315518fa31c30c1b510534329804f8050da07edb338d642df9067b28e6b14b7627231518732d7e1f2d3c SHA512 6c5a9bf4bc7c60c8c4f12d94265eee7e1888d5a4aa8653f294ef58aeb936c70e207d559d9b3dd5ce5eaea1847c73b1bf2e4e2d22de3d7a5e66dfb95fa60bc4a7
-EBUILD jbuilder-2.11.5.ebuild 627 BLAKE2B db73ade2d44bec0edac63a45d7b4a135af2f3d0c18ca75df3b53dc4fd221fe9d5d7be25ef5a03231d141823275f2c17b043cfbf69b81fd303c2186ff355a7929 SHA512 64e1cdc6ba2b48cde747df252dbaf113e64d764e86cf0615d9c54f0f39575a7b5ca6490ac31fcf0f7282579a40953137d5d186118b793eabf59ae514f24ff7b7
-EBUILD jbuilder-2.12.0.ebuild 769 BLAKE2B 62d284d2bf1e859c47879b80fca5f7aa175cd260ac5390cd13eb73806d74adfe256ffccf729f05264ccf2ec371cb0f203e9a3574b9bdaad8785ab72b3b84ba71 SHA512 50d6d87ffd4d4fa6cfa1f0805ed8a121aa69fd3260cbe1d929a48c4c9a1cab1f8626ca1f02420c508171a441e76cc981be5b34d4fb8313f128df73a719772b90
+EBUILD jbuilder-2.12.0.ebuild 787 BLAKE2B 9e1b8e21091eb700161c92f61df81a3fc3a819c98ac482c5b1204daaf9665fa67bd9aaac83131201de33cabab9541e74af844da1082fc4cbc57e6c2a5283e4eb SHA512 6d771b30b26a783f432687f51bc5aca1572ff987228a49534f71994db0d5303fe8cfa781d2b90e5c10eb917ae14b5f3c73d693ef6328fa821d027ebe8b751e92
 MISC metadata.xml 393 BLAKE2B 013bb2a77f4a32892bd7e135fbaeff82f02f2e5e7247f73373aa51aa4c4da5465659400c54194494c46679b3bded6918658ca3be64ad9b77bbc33bcae6274d19 SHA512 d8bb101ce32dfa351ed2102d61be1dbb8a81d44720df03ef287f666c2e7a9262cb88cd78962b9819bd694040bddbb06359ac6d65620231b151abc8a308e4f479
diff --git a/dev-ruby/jbuilder/jbuilder-2.11.5.ebuild b/dev-ruby/jbuilder/jbuilder-2.11.5.ebuild
deleted file mode 100644
index 859ae269b778..000000000000
--- a/dev-ruby/jbuilder/jbuilder-2.11.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_TASK_TEST="CI=true test"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Create JSON structures via a Builder-style DSL"
-HOMEPAGE="https://github.com/rails/jbuilder"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-5.0.0:*"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activemodel-5.0.0
-	>=dev-ruby/railties-5.0.0
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile test/test_helper.rb || die
-}
diff --git a/dev-ruby/jbuilder/jbuilder-2.12.0.ebuild b/dev-ruby/jbuilder/jbuilder-2.12.0.ebuild
index dbd44244f505..4848a182fc71 100644
--- a/dev-ruby/jbuilder/jbuilder-2.12.0.ebuild
+++ b/dev-ruby/jbuilder/jbuilder-2.12.0.ebuild
@@ -26,6 +26,7 @@ ruby_add_rdepend "
 ruby_add_bdepend "test? (
 	>=dev-ruby/activemodel-5.0.0
 	>=dev-ruby/railties-5.0.0
+	dev-ruby/mocha:2
 )"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 1bdfd4b5ca5f..28be7886121f 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -1,7 +1,5 @@
 DIST json-2.6.3.tar.gz 133077 BLAKE2B f6101f533159fb689b6bf22975137d34a77bd0926c164a9c14f2d5eab982778538ec40551709e8a6470f05e78584a3e5680be740314bb7829b48feb32fb258ae SHA512 1bf9125266d8cdc565deb9e2fe3c884a1fc8d2f3b31caae67a154d0c47e30305074c1c08b49d180dd785c766762b46d3b3ef85919d53388797fcc2f37675317c
-DIST json-2.7.1.tar.gz 125655 BLAKE2B 9921b8dd26123d27b752d3dd633f788437a1aa2003b09ad6d0f43e946362f48a8e5b8dcc70d08f61cc9affa2578750e40c5a78d3bf88e0417af8890100987c79 SHA512 81e7cf51363095088142a7ac15428765f296e9b8c205946abf9ab98ddf7c57aa732c8111e6b0e239606645dfbc24dd40fbe981a52ab2d9fac97c0e3fb08133a0
 DIST json-2.7.2.tar.gz 125814 BLAKE2B 450c9495053c762446e77997bdc7e0291f8baf160a4da7e56d04ed18aa5629a11f1309e40bab0849692433392cfba8a19dda905fe5044ab363591a49e6e18b60 SHA512 5c432c293eed69b9810b5d0ca782383ba3f206d561641c354515e357c663ed4a4fb5ae35d3336d48605f9e82156d2f14a7ec6fa26642351214f60d91bac84f0e
 EBUILD json-2.6.3.ebuild 1391 BLAKE2B df2a6931baf0f5e326101992d3f12a9741136c4f7f7ee8507a9d9e90a6bbd772e01c6dd130dcf736ce0e51b154af543bd2aa058519482193287192da4a69fb70 SHA512 ee4e15ffb2254af61a875532712936c7c5215cc5332b739b5645aefdd0739a0567b22e0da8c1faeacbabc28884d824cf29c2847d7deb8861fea47888d55f7416
-EBUILD json-2.7.1-r1.ebuild 1544 BLAKE2B ee7d13eba7d2335979de854c32bd7aca7d3ed077755ffc8d834a249776dd19747a4fed1d45d2f19f07be15a200638382e04a1980122c76a49947c45da90773de SHA512 3fa640a24a6382d8c98feca60416ee50d15a873fdaccb0d503a93147d0d1dc61811118d084ce2a62ebf7e8c29afe80920bc0d2e631c621db8db66494311a0d5b
 EBUILD json-2.7.2.ebuild 1528 BLAKE2B ff2d817f4f523f7b451654110de4e991803008f01540d095faee0189d4a3635fe90f1e7979f528dd60d295bde9679767560506ebc8efe18a218b4c5fba538039 SHA512 a4cc86bff32792f339b40ce92934d0c1fd21cb3065a52322a9b52daca1038e99157259bd427d180873743ece2911a517812ff8a26bc765a873d1e8219ff08521
 MISC metadata.xml 337 BLAKE2B 6b424567109cd8947377b5f955a9b32d3c12a25001e8d68cf62ac753264a0d8785f0fc60fc2ffbe5ad4e7a16ebd763add075820e4e559b50f6a230ef2f7a61a5 SHA512 e6900f34ad0c2a8310286eae9942432533dd78a14a04fb5d2551be21437cacc1a2d83b40ec93e885b30626cf49491f7db8a19b6e16009b6931cb0fd0c8ca8d5d
diff --git a/dev-ruby/json/json-2.7.1-r1.ebuild b/dev-ruby/json/json-2.7.1-r1.ebuild
deleted file mode 100644
index e35c42b886fe..000000000000
--- a/dev-ruby/json/json-2.7.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_GEMSPEC="json.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/json/ext/parser/extconf.rb ext/json/ext/generator/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/json/ext
-
-inherit ruby-fakegem
-
-DESCRIPTION="A JSON implementation as a Ruby extension"
-HOMEPAGE="https://github.com/flori/json"
-SRC_URI="https://github.com/flori/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="|| ( BSD-2 Ruby )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-RDEPEND="${RDEPEND}"
-DEPEND="${DEPEND}
-	dev-util/ragel"
-
-ruby_add_bdepend "dev-ruby/rake
-	doc? ( dev-ruby/rdoc )
-	test? (
-		dev-ruby/test-unit:2
-		dev-ruby/test-unit-ruby-core
-	)"
-
-all_ruby_prepare() {
-	# Avoid building the extension twice!
-	# And use rdoc instead of sdoc which we don't have packaged
-	# And don't call git to list files. We're using the pregenerated spec anyway.
-	sed -i \
-		-e '/task :test/ s|:compile,||' \
-		-e 's| => :clean||' \
-		-e 's|sdoc|rdoc|' \
-		-e 's|`git ls-files`|""|' \
-		Rakefile || die "rakefile fix failed"
-
-	sed -e 's/__dir__/"."/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid setting gem since it will not be available yet when installing
-	sed -i -e '/gem/ s:^:#:' tests/test_helper.rb || die
-}
diff --git a/dev-ruby/jwt/Manifest b/dev-ruby/jwt/Manifest
index 1a02869bf558..547f286059eb 100644
--- a/dev-ruby/jwt/Manifest
+++ b/dev-ruby/jwt/Manifest
@@ -1,9 +1,5 @@
-DIST jwt-2.7.0.tar.gz 75020 BLAKE2B 2bfa009912f4037dc13672ef6d43557e70bc9a06d399d949a6c5ddee641dc550a218242482ec0a66eb470ab117d1e192dd1ca6fdb5a03926d85f4902d72500e7 SHA512 8e0bb9909d123b7b73fe01fafc4088e45140e417b1bff84b240a317f3dca8085b2b987bd1e93cb1506efc66a1f7371168f8202a590308ee0e4c52820983a9789
 DIST jwt-2.7.1.tar.gz 75003 BLAKE2B 5c43fd78cf22960749358cbfcbfb5c47dce935ef8fd83235137a963572b95b19583399e142136663d113df472ebfb5dd976ce60156b75cceeff387950b6190b0 SHA512 efcdd81bc472a18764e0033f1040e9e2506952cbfb691acfc1ad90a5b34ebac864911e0cfeb28b82ac2ce1da7e3578a6677c0b113d1e45a81a3f4c4f8fed1047
-DIST jwt-2.8.0.tar.gz 71132 BLAKE2B 195bce2da7598c2c16d22db6b0322b6b8b9ab76dba70bc66f88ae44a030acc4a2d70a9864c760ebabb6b6d6ae6256fe291be33aea4e67432258f4243e939d9b6 SHA512 d2ef3505aa38f0337a658fa365258195be118939ec300dc8d17ca6cb950358b2e9a7c64c0dea3ef50df250c70da4e2233a4daccbe8fac97e902e28b7e9dcfa0d
 DIST jwt-2.8.1.tar.gz 71939 BLAKE2B 07eb3df24165c72f13a77dfff658a94574e4fc5b5aed3b56041c58cf9bfb8eba663e76de7eb91e2870bbb8dcdeb79b9c2a7888d29f41feee06e2f07a825b90b9 SHA512 df4ad49f223bba0ace69a37d229868c2deabed5c09fd84e5e4ce4021242cef9e30c07a592b5bf54af6bdcfec552487d808620cf020d242757fc4310d201469c2
-EBUILD jwt-2.7.0.ebuild 810 BLAKE2B dca0ac1b165b6cf264a1248ae71529e88d4c785dc3bc1631453d76c29b220180b6f987608826bb6db280b995ac1e42da29f3d0091a9af521edcb2d533bda01c0 SHA512 6e224dac2965a1c2833b1544d6d6f52dc8d6d1471529c09ce1f07ee3c13c51b93857112b29397edc1bb62ad69b23a56b1fa17f24d6de007254eebd33719eaf2a
 EBUILD jwt-2.7.1.ebuild 803 BLAKE2B e2e52f6828e050dff937ea6ea39d1603c8f6fb6a55f118cf3c7e6a7d2cb51e42710cdc39f413de4c7ceea6e0c3e0c5ee7f81d90dfe535ab73c4347d8b6a3e412 SHA512 35a34fc830a577e97c5bf77623e61de13af2fb87ccd0220a6ca5396898939ba1ef4f59be311302ee6125333c0642065154da765e76e82bf5c63dbdd5fbd61ea8
-EBUILD jwt-2.8.0.ebuild 807 BLAKE2B 55173df6c418aa3a2db0abb5452550b1a17717ce46ca0d067bfd4abaa02ff53ac836bd756e870e75a7a6714037929df48f739b924333de2377bf05424ab01360 SHA512 18d0ac49b4feb4f697d0a02d5009af4cb8c89293169d339678744bb491f68035cb54c6c0c01d143890a01b0368f6dc64fe3dd65ba9937f4df06268646249734b
 EBUILD jwt-2.8.1.ebuild 807 BLAKE2B 55173df6c418aa3a2db0abb5452550b1a17717ce46ca0d067bfd4abaa02ff53ac836bd756e870e75a7a6714037929df48f739b924333de2377bf05424ab01360 SHA512 18d0ac49b4feb4f697d0a02d5009af4cb8c89293169d339678744bb491f68035cb54c6c0c01d143890a01b0368f6dc64fe3dd65ba9937f4df06268646249734b
 MISC metadata.xml 339 BLAKE2B f797d6d373de253b9c14671570c04706d02d9ce5c931b54984eb89fb13dc29090123b6b30a8d3cacca6bb5e2819b294e0acb86b337a649dee292d8b579640b68 SHA512 2a3235a78045ad0be735dae3f33d3b946f162c837e6d903da889780879c370c586315300cb9b4dc5ee7ca73a545ece43ea949cc0f94f20c3430a8090f491aa70
diff --git a/dev-ruby/jwt/jwt-2.7.0.ebuild b/dev-ruby/jwt/jwt-2.7.0.ebuild
deleted file mode 100644
index 5210e3c5ef34..000000000000
--- a/dev-ruby/jwt/jwt-2.7.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_GEMSPEC="ruby-jwt.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby implementation of JSON Web Token draft 06"
-HOMEPAGE="https://github.com/jwt/ruby-jwt"
-SRC_URI="https://github.com/jwt/ruby-jwt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="ruby-jwt-${PV}"
-
-ruby_add_bdepend "test? ( dev-ruby/rbnacl )"
-
-all_ruby_prepare() {
-	sed -i -e "/simplecov/ s:^:#:" \
-		-e '/^SimpleCov.start/,/^end/ s:^:#:' \
-		spec/spec_helper.rb || die
-
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/jwt/jwt-2.8.0.ebuild b/dev-ruby/jwt/jwt-2.8.0.ebuild
deleted file mode 100644
index e092f3ff6285..000000000000
--- a/dev-ruby/jwt/jwt-2.8.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_GEMSPEC="ruby-jwt.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby implementation of JSON Web Token draft 06"
-HOMEPAGE="https://github.com/jwt/ruby-jwt"
-SRC_URI="https://github.com/jwt/ruby-jwt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RUBY_S="ruby-jwt-${PV}"
-
-ruby_add_bdepend "test? ( dev-ruby/rbnacl )"
-
-all_ruby_prepare() {
-	sed -i -e "/simplecov/ s:^:#:" \
-		-e '/^SimpleCov.start/,/^end/ s:^:#:' \
-		spec/spec_helper.rb || die
-
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/mini_portile2/Manifest b/dev-ruby/mini_portile2/Manifest
index b9a70db9a167..6a063ea09cd8 100644
--- a/dev-ruby/mini_portile2/Manifest
+++ b/dev-ruby/mini_portile2/Manifest
@@ -1,7 +1,9 @@
 DIST mini_portile2-2.8.4.gem 30720 BLAKE2B 33f5e67e1ef647c781cf4f5a4b04a2164b27fb6846e0d76ad42f1cdbdd04cae69c4e14cde4ce5bc36c392de74d256770f693485e896b443aab8cceb0a6cc28e9 SHA512 19e3e4908e54fb73d695f0674a5c95d96bfa2cf6f87c0d59c32f8a68941b729adc065b3bea2d5eaada489340d8c76e098b9db839d075cac5d183f47d2cee7d9c
 DIST mini_portile2-2.8.5.gem 35840 BLAKE2B f14d071bebf5f1d7160b5196564279ea46ae4ec306587a6ec550c3dbc105db0790b55aae1d7595d2d11d5d21826a07ac382c62e4c22ba15aa22323520040789e SHA512 fa09bc2c4aefc341cb249dc33b5ad3182aa582ef150645793e323bdef4d19cbeeced0348c3c962a7225a9aa91b40824347fa1499955326525eddcf867f6ff798
 DIST mini_portile2-2.8.6.gem 35840 BLAKE2B 0173084a911ecc6400c1d7cff9645cb7cc99db6e8aac934c7ee723300b3016286dc21dbd2299c9b703a817527a63cd86c31334c880e57a879f78ab24a109e844 SHA512 7131806ef5af09082e08a05000256ad7ce9fcd170ef3485f42618c69e0bee6cdf8f2e14b67e61d36b9efed5c1df970045720a01d9e0b7ffac434da651a28f238
+DIST mini_portile2-2.8.7.gem 37376 BLAKE2B ba12a85f227df501f7b93a35b6ceb50f6c51470cedc293090c640ffbbbfca0b1089a5174aec914e7655d5f780792dba898beedf1239428e91b8b4852352d932a SHA512 9376a6c2a77a863369d9980dedde3750696ee05ad2249891c35dc03385a2442b0fd182cb4c62da967138f3a9b83c075a6cf8f2a80dd5b76f6f61dbe4e1982fbe
 EBUILD mini_portile2-2.8.4.ebuild 673 BLAKE2B 81880d139ac7b7b276cf3d0fe343b7a927a802a8083c12b0351bda2642a305af703e3c908e9fc7550ec7aff1acf2bcf9af78aafa3392940ab576cafffd751e68 SHA512 8e91fcf855c65760e16cd5fc7951fd22667be3f336676dc5fb1545a4bbb510be02150e7a4c1677772ebf21ac898cb91b1add5a558dfac148d0e0ca84368fa181
 EBUILD mini_portile2-2.8.5.ebuild 915 BLAKE2B a675a435b5e8e29130264575f886f56a4c3e40b1bb5caa1b14524f1fb0f63260c575161e31857703f27b4137dbc9e64ccb22c35d4fb12039648c1effc5ddf64e SHA512 267961e67871b88a25c50b9608659402e8f8b5efc05dfb42d7c2f179dcb5c049c88f84529f5a8bb5fe0bc99e28d04023b78cadb4796c61fe89225e1f49dcbd5d
 EBUILD mini_portile2-2.8.6.ebuild 915 BLAKE2B a675a435b5e8e29130264575f886f56a4c3e40b1bb5caa1b14524f1fb0f63260c575161e31857703f27b4137dbc9e64ccb22c35d4fb12039648c1effc5ddf64e SHA512 267961e67871b88a25c50b9608659402e8f8b5efc05dfb42d7c2f179dcb5c049c88f84529f5a8bb5fe0bc99e28d04023b78cadb4796c61fe89225e1f49dcbd5d
+EBUILD mini_portile2-2.8.7.ebuild 915 BLAKE2B a675a435b5e8e29130264575f886f56a4c3e40b1bb5caa1b14524f1fb0f63260c575161e31857703f27b4137dbc9e64ccb22c35d4fb12039648c1effc5ddf64e SHA512 267961e67871b88a25c50b9608659402e8f8b5efc05dfb42d7c2f179dcb5c049c88f84529f5a8bb5fe0bc99e28d04023b78cadb4796c61fe89225e1f49dcbd5d
 MISC metadata.xml 351 BLAKE2B 1089816679cc238435b30f4a2365c7d1fe7a15837602f266924604629bf4300462b1ded28a537b9337c9fe13e4b397fcb1e97672bcf901eb65162090a514751d SHA512 80f58025f07a49376e4fab08a8396ccbc5e09ea76eea09263c3388666b14cea9dae84bfadff887aca2468c8651666d5e907911782968b76b7c1f3289036586e0
diff --git a/dev-ruby/mini_portile2/mini_portile2-2.8.7.ebuild b/dev-ruby/mini_portile2/mini_portile2-2.8.7.ebuild
new file mode 100644
index 000000000000..ec718bb6b313
--- /dev/null
+++ b/dev-ruby/mini_portile2/mini_portile2-2.8.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simplistic port-like solution for developers"
+HOMEPAGE="https://github.com/flavorjones/mini_portile"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos"
+IUSE="test"
+
+BDEPEND="test? ( dev-build/cmake )"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitar
+	dev-ruby/minitest-hooks
+	dev-ruby/net-ftp
+	dev-ruby/webrick
+)"
+
+all_ruby_prepare() {
+	# Avoid tests that expect gcc to be the main compiler, which we
+	# cannot guarantee.
+	sed -e '/test_configure_defaults_with/askip("Requires gcc to be the C/C++ compiler.")' \
+		-i test/test_cmake.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -w -W2 -I. -Ilib -e 'Dir["test/test_*.rb"].map{|f| require f}' || die
+}
diff --git a/dev-ruby/net-ftp/Manifest b/dev-ruby/net-ftp/Manifest
index 49738c2cd649..df0a643aa82e 100644
--- a/dev-ruby/net-ftp/Manifest
+++ b/dev-ruby/net-ftp/Manifest
@@ -1,5 +1,5 @@
-DIST net-ftp-0.2.0.tar.gz 29845 BLAKE2B 710ad47552242dfc30fd971cff683d67e0e1cda73086e3504b0e45ab650ad4666c19c46d221bb5b64fab2d507a9063c64fc8da17de9221de4fd487acb0cb3514 SHA512 a6b2f30bde4c39568690db7f57e917e0fab046d456acfe68eb22a0ee81ad71b4be4a6c7752dc556bb2481f3e0fe5fc81193e194e2b5056087abce633e0d2f7e9
 DIST net-ftp-0.3.4.tar.gz 28020 BLAKE2B 2962f61c17b4314a044d3a80c62693948d1241f783b6f948a056ca34b8f076c8357dc150f04e09a245236b402c6e711e02f6a3717b60aa816a6ca419cfa1ed08 SHA512 1f289b8b0481abf66bbe000cfdc08d8f32559d02ccee186159696e1b563aecc1178d975946d969064bdb8abf8f76d50b5d5bde0423e12bf2ba0b757796c9b046
-EBUILD net-ftp-0.2.0.ebuild 865 BLAKE2B 79c55672fa260698b53a8804b3c5ef8e79ed3b3b2544cf39fece97176128e069436577770375ad2adaf2160e7c2f26bb0ec1e032175c9a699271b9d28e328b75 SHA512 9555e9c3fe163d140ebeee5a55b1d3f5c0b8f5cf4625b394c0c167c6ab8a903c2abd0417e818f114ceb422dc3a09bda7131f8b813c337e9572e00353bb581353
+DIST net-ftp-0.3.5.tar.gz 29007 BLAKE2B 4c7c9154f41333151b8249f38cdf1baf3e7cc4cbdb3e5f27cba1f2f97be463b16ede73b6e49b3e43bd591ece6784d102919c4028af636bddc34ac3e03f889b82 SHA512 551aa99200b4ee629a07f1107f1aee0f896bbed8bc88aba49103db244081cc28dbdbcc21cb0df60588b721aec9e22007ac5749d2485bb534c38621df28c04adf
 EBUILD net-ftp-0.3.4.ebuild 849 BLAKE2B 8f671bbae701e7de2b9e3a5cccd80b672ceed16aadb1c558c9c467dd24d90976b040a43e9cc8b12f8ee8da5a4375fff03d7a2118bd7e28d196b4f88f8931476f SHA512 f5a174d5482c66151d1e7b9d0729b171073ca84dfc6c49e1c905bf396fc97130975999d8a8150d23ce8f04c25c472c4a4b6774bcb4cfedb0ea7ceff0c6c2670b
+EBUILD net-ftp-0.3.5.ebuild 857 BLAKE2B ba3ed94db2532a4e2d4fa4f0981b3320ae02447b0f1eb73f1c1ea77cd2814d512b2927313468cdd046c32589c5a311e86a1bc9dd407efa198578254f8eae9ef7 SHA512 e74a703af8e2dc6aaba964540095f787e750f95e0f865180e1514b83ab8316aa876be20499333779d52b4ce376244612fb6261b7d4a13ce43d4dd257fcafb766
 MISC metadata.xml 339 BLAKE2B 3c2418dd7ddec0598782ad012aa5a33ec70d5179cbe0eaf602a65865f2d516366410f1c5117e2a7f4f7b03003fe77b4ee2cb888dcfaaab08631dd7b1a8d3b99b SHA512 caec07b9c960c4f24e06adb37e4705caa5a13f5a7ff388c11b15953efda289dcddc47e84864e082f26b0b720d299724fd0ffc9d556ea6a7cae1dd3242bfcd1df
diff --git a/dev-ruby/net-ftp/net-ftp-0.2.0.ebuild b/dev-ruby/net-ftp/net-ftp-0.3.5.ebuild
index 87b1ff8c5865..506af331b8a7 100644
--- a/dev-ruby/net-ftp/net-ftp-0.2.0.ebuild
+++ b/dev-ruby/net-ftp/net-ftp-0.3.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -16,8 +16,7 @@ SRC_URI="https://github.com/ruby/net-ftp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend "
 	dev-ruby/net-protocol
diff --git a/dev-ruby/net-imap/Manifest b/dev-ruby/net-imap/Manifest
index 40e0490eb59d..73ebb64a37e7 100644
--- a/dev-ruby/net-imap/Manifest
+++ b/dev-ruby/net-imap/Manifest
@@ -1,7 +1,9 @@
 DIST net-imap-0.3.7.tar.gz 138906 BLAKE2B d6bc143d3947ec8a97cd7e0628e05447574f83296c78275dc7414d9cc744e820bcb6b8917de9215152be8b6141f69d4d6a1ea9e2265791eb4989dcdcce09b10c SHA512 6917d3bd980bbca86938232a59104dd924ffe7ec2f095e8c997165c726ada8020c821b26a0e8748433df49cf8802c4a434c805bd27f415d1f2644ddea1a94db8
 DIST net-imap-0.4.10.tar.gz 241688 BLAKE2B 459581055564669e99f40436b454a1a072de57fb64fc81ee55bee602ca6e3ed97c81cda1975d462b5d583264adad72803cfe801319ba8724fd8ae229cfb7ec68 SHA512 0f05588dc80cef7f121cbb40e2e9ddd6cd44e5ba96ca8451ea32339275d394f1233bc6a8bc30aa1de6852f49a469e0ee64a3821d08e12199e4af51fca4e79ccf
 DIST net-imap-0.4.11.tar.gz 243069 BLAKE2B 7d8eb7ae4604358c408d855c731d4a99a4383f123abf6da9d4ba68414b470be6e4d511ebf10824b69563f7de73cbcb50a943b7a3d1221fadbb673a59f5428d8d SHA512 7f6eb23edafc9ed47e84493a3bd5baaddd5ba6ff3c4c2a0afb6693f98d0ff2574495580d484077e8600a1a2351f8595865e8e6acecf8e0ba690b9122e59c7100
+DIST net-imap-0.4.12.tar.gz 243885 BLAKE2B d3ccd6f799671f2101c38fcba437ae3962a61a2fe4b73545fbeee5f10ad035c0819afb25e7617fdcfce88337b4c99c3c4d98eeae914a1fc77a90519430b4e889 SHA512 ad3b030ba5a7daf8831a34a0e0effe0780134d7c81aeb4025adb39f11dd97ba57bcddd555b9038a34bdcc809ea722d778e0368a26d04739e084f6d4b7714aed8
 EBUILD net-imap-0.3.7.ebuild 937 BLAKE2B ad75d1bdd852d6928798558c7585e918db157ade5867035b8b7643bad8a5c7a0e754d7c53e922461798562cd43799ae4dbc787c5f5b77cd71133466469d57ec3 SHA512 be0a555c97b313ad36cc258d73fc169d950d5f68c557ab4bb983ff70dc1cd04bbef15619c04cf4f95802624038472ca32ef66e0fdef3a3d1133f27caf2f445b5
 EBUILD net-imap-0.4.10.ebuild 1007 BLAKE2B 51c038ffd38bb0cc13847d7ece1f8b91ca0cfad493298bf1c212efe54e4b1e9d898ae113d59f7be64c20bfb8a1594cc713b1b89605dfb1cb4c864d356e0647e6 SHA512 f3dc7664e20ba5990d624699c4fef854dc445de78bb4acdb9cc9810575900753e1cbf8dbf00607acc34de05f4a52e5e9d30af11567a3a346e5c5bac99dd23cb1
 EBUILD net-imap-0.4.11.ebuild 1014 BLAKE2B 1e1ffefb39f9e4dadc70807df7831c72f202d083f10e2097fb8a8d6bcd7e847c998f68d3a22da3f2c938f9d2254f76d0c589ddb956865819252b21be263f6b34 SHA512 1f260dcf0d94fd8c9d3782e92e76701a8e8048bdf2622ed07c48b58fe6229439c3bbf1dcc0c06a8b80f897c225dadc8aa8aa3b34ec543c636c946ff010745542
+EBUILD net-imap-0.4.12.ebuild 1014 BLAKE2B 1e1ffefb39f9e4dadc70807df7831c72f202d083f10e2097fb8a8d6bcd7e847c998f68d3a22da3f2c938f9d2254f76d0c589ddb956865819252b21be263f6b34 SHA512 1f260dcf0d94fd8c9d3782e92e76701a8e8048bdf2622ed07c48b58fe6229439c3bbf1dcc0c06a8b80f897c225dadc8aa8aa3b34ec543c636c946ff010745542
 MISC metadata.xml 340 BLAKE2B ce089ee2eed44b5b96fa730c464c6e0299db5bbee1db0052a5c5e959079e7c14c23c0a7d1b6bd8d8e7faf83ed8379535d5059c10ff75b69cdb9d522c5d0099ce SHA512 ecf13d294eb224c7510bfedb5a093c78de5d2537431335708bc1046254941b583b3c013006adeea41d2f8df147dcf45c46c6c9b50841500761d6a6f0e0c71bdc
diff --git a/dev-ruby/net-imap/net-imap-0.4.12.ebuild b/dev-ruby/net-imap/net-imap-0.4.12.ebuild
new file mode 100644
index 000000000000..78de90b9b8ae
--- /dev/null
+++ b/dev-ruby/net-imap/net-imap-0.4.12.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="net-imap.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby client api for Internet Message Access Protocol"
+HOMEPAGE="https://github.com/ruby/net-imap"
+SRC_URI="https://github.com/ruby/net-imap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_rdepend "
+	dev-ruby/date
+	dev-ruby/net-protocol
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/digest
+	dev-ruby/strscan
+	dev-ruby/test-unit
+	dev-ruby/test-unit-ruby-core
+)"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/pg/Manifest b/dev-ruby/pg/Manifest
index b394d61b6074..f62fe4596806 100644
--- a/dev-ruby/pg/Manifest
+++ b/dev-ruby/pg/Manifest
@@ -5,5 +5,5 @@ DIST pg-1.5.6.tar.gz 300559 BLAKE2B 5430789943f107e18f9b509ab7963d6a5dc702782c30
 EBUILD pg-1.4.6-r1.ebuild 2031 BLAKE2B e754a11411c8908433cbfe8e504f2b53562035899755f4a95760a864b7062bbb56a767e9359a68554f52e6e7c236be7e02636b4059f5dd24621c3eba3bb1836e SHA512 f9b033a92dd15f74b2c9fd8b6cba65872d9ae4f6acb56e656fdf5fb7f62bd653e75e93773d687274dbee6bb0f67b79ecafa37628d002a66e8a22cbb236d434b7
 EBUILD pg-1.5.4-r1.ebuild 2026 BLAKE2B 56aafe630bda983c65d347de63c6499c499451270886a83371ce3879ad01b80a3a9454c90a41518fb3e969ab843ec641e69af5ea6dddea81c78a19f263140fcc SHA512 706078b222eb79d703d40c093806648aa92a4b761ec84db3cb75b536c95c23b18970faf1214ef8255317448ccb22a2ea8b40384153c734dfa0af7efde956b5a0
 EBUILD pg-1.5.5.ebuild 2032 BLAKE2B a5d73305f030328435e3a1116ed09d71cafa1356d536eaf54a1fcbc7b08032cd28b79a52f6da922f7c7e6fc51c36d2264dd4a056a5bb77daf278d51397fdc18f SHA512 7fc347ca799ca0fa05bb9d8031e8a765bf991fc46bd5fac197170c3cc69ea8a6a1dde3674592a6ba741ab308d8ec50a048bc1c643d48959c7605a3889d49ff44
-EBUILD pg-1.5.6.ebuild 2032 BLAKE2B a5d73305f030328435e3a1116ed09d71cafa1356d536eaf54a1fcbc7b08032cd28b79a52f6da922f7c7e6fc51c36d2264dd4a056a5bb77daf278d51397fdc18f SHA512 7fc347ca799ca0fa05bb9d8031e8a765bf991fc46bd5fac197170c3cc69ea8a6a1dde3674592a6ba741ab308d8ec50a048bc1c643d48959c7605a3889d49ff44
+EBUILD pg-1.5.6.ebuild 2259 BLAKE2B 056e8eab9111bfd05b8575322215f7c149450b872ecbcdf29281051b793218ab69913fbee69385b70960b0a06609b5b311b1518239649274709dd583174e02e3 SHA512 47f0c668e83a5b438c687e1f2477fc3d849040222f8b0c8aed6d04f170e702c5a797eccc342b2c2b06ce42f6955cd5b105e2ce75e81f8fe41bf2e647e2f94e18
 MISC metadata.xml 338 BLAKE2B b827b967fa6a0795016f741de3ad7738103580b06bb6d1f56957fbbcde06a63eeacc6b9aa2bbd726bad77c91b28659a3318e6ec43d141cd1cd05982b209c2f1d SHA512 8f1ea2d36aaa43547b48d39df2f403bbbf63b5bd57570bddf8515f84bea573793f1ecacc807d02f05d96a919c8778465f4c87822bd1807ebeca115f6dec81e99
diff --git a/dev-ruby/pg/pg-1.5.6.ebuild b/dev-ruby/pg/pg-1.5.6.ebuild
index 2f148b514659..0233cb967774 100644
--- a/dev-ruby/pg/pg-1.5.6.ebuild
+++ b/dev-ruby/pg/pg-1.5.6.ebuild
@@ -41,6 +41,11 @@ all_ruby_prepare() {
 		-e 's/__dir__/"."/' \
 		-i ${RUBY_FAKEGEM_GEMSPEC} || die
 
+	# Don't allow sudo calls that try to tinker with /etc/hosts (bug #933234)
+	sed -e '/sudo/ s:^:#:' -i spec/helpers.rb || die
+	sed -e '/refreshs DNS address while conn.reset/ s/it/xit/' \
+		-i spec/pg/connection_spec.rb || die
+
 	# Avoid tests that assume IPv4
 	sed -i -e '/expect.*hostaddr/ s:^:#:' spec/pg/connection_spec.rb || die
 
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 221595950ad2..dcc38cb3c9b9 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -3,5 +3,5 @@ DIST rspec-core-3.12.3-git.tgz 409316 BLAKE2B 7d7ab38346895499403ff5ce7770f7605e
 DIST rspec-core-3.13.0-git.tgz 412734 BLAKE2B a3808e96fa58250f606aab757d0b09dc8bd06c9cc7ce375b5ffb97f4a0fbde456f4d3b3f190b1f70393ae6765c2f29dbd7876c92d9e19318460b8956772f04bd SHA512 4d84384c8a8d22b72d1cdab40f1fe43dec7a5c0dd1ab2ce11739e1a52510c6deea6417130bf100d582cae7293aabee6217f21cd80d4b92f976119bba465650bb
 EBUILD rspec-core-3.12.2.ebuild 3296 BLAKE2B 1d5c793a064e23be9bf7b4083b05e0b28cd0e078a40e50e4b866633eb7ea0b1dc9f52b46495f210baf146c57444b5c17558670e91d25b735aae3989af6ac2f21 SHA512 12947dec8b3bbe741cc62ef10570a03e39b0e84982d21c60041319e140a006704a354e68e443ba792b08fc60dc40e72696a58aed3058bfa6076a62787dc0573b
 EBUILD rspec-core-3.12.3.ebuild 3312 BLAKE2B d62d003bddd2e6bf1f990c073ace8444c6d18eb3c701689737d841e5c858db1853b793b253354ecd058a7dabfa0bac5869f22b9c56c5f29025a50d485691dd15 SHA512 7d905ea5546aa87474cf80a28e529a73fe9326222b00d1a4ace39df84bad96e04b0ff0397083aa7bd6cf1b1ef604b2acf5517e1d61bbc8a6393cd2f5947f00de
-EBUILD rspec-core-3.13.0.ebuild 3312 BLAKE2B d62d003bddd2e6bf1f990c073ace8444c6d18eb3c701689737d841e5c858db1853b793b253354ecd058a7dabfa0bac5869f22b9c56c5f29025a50d485691dd15 SHA512 7d905ea5546aa87474cf80a28e529a73fe9326222b00d1a4ace39df84bad96e04b0ff0397083aa7bd6cf1b1ef604b2acf5517e1d61bbc8a6393cd2f5947f00de
+EBUILD rspec-core-3.13.0.ebuild 3306 BLAKE2B 82953467881cdc64e8ef30c3c0055c8424672af9d995f282c2b938fe7333594368f63f3989cf11b756bd073dbf8d235b18f56c4cf3bb1a48086ca5573c125f20 SHA512 85abb37931b23e8cf2950d7f7a0105c81f278fecbcb12be563557f6794f768407ae68e86b00a2d71f8ce50213f2277e65ea3f07e03faff52c67975e676562ddf
 MISC metadata.xml 466 BLAKE2B 008536967fd0a54923be3f70885dce7b04ca3746699dec4bd0f2ef56a41997c0e44cebd553d4c899fd815c587eb1f5338d86033d1d3e96289aaffdf9a9fcde06 SHA512 9a1f175cffe5136506e4d3b185a7bb974dd3de45683beda00267d47339472ebf8fc1cbbb37ef6012f14cb3b0535e386d98e3bfb7a955f9ee20484cd2ad9013c5
diff --git a/dev-ruby/rspec-core/rspec-core-3.13.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.13.0.ebuild
index 13e66548c64d..a7e4e8181421 100644
--- a/dev-ruby/rspec-core/rspec-core-3.13.0.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.13.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="highlight test"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 2a8d7895e698..70612c74132a 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -3,5 +3,5 @@ DIST rspec-expectations-3.12.4-git.tgz 219529 BLAKE2B 8858b586cb2b50f06c93530304
 DIST rspec-expectations-3.13.0-git.tgz 220792 BLAKE2B 526282d357f47d82163b8a44f5fffc0ce24f0fef0d0f5c5f33da93c91680ae704a065c4903a8b7eb3b619d3910314ff137d1c7b636207c0a3383ed0520e2ffaa SHA512 9e1e502d12704fd7573a57b7f01cf4ffe97e2eefe83dc3144842f460165304dc234a1b1946147f2cbcae105d755c8b42b25aec815f9af0c67844baf858c0a6c7
 EBUILD rspec-expectations-3.12.3.ebuild 1402 BLAKE2B 364417588939e7907552fb88cbf1e9d78f2c3b43646afbe7dd8bd9bf690fb9d3bc2b0c18dfe1da61ed4fcd6edf8eb6c3512a9a1b4358328409d6245b1464adb1 SHA512 8b7a5b037c2660c7fd3deb0f064848db36aff182a4d45979909cc5177dcc5f3e0a5e569022a0407be556cc46f32856ca80bd88219915a9528a8c908dd02a298b
 EBUILD rspec-expectations-3.12.4.ebuild 1417 BLAKE2B 23a08dfe6e4d874c39f9d5780187f9011d250a90c83cc8dfb1a627be81786f58e7ec095c0f2c9a81182fbc24b769c3f752004f1174dcf25b8e233bba3cb38ae5 SHA512 b668535c975b5c3edc3c200b21c9d38e972f8b5e72b30745417c2e208dc3819a77ff9b849a16cdd0647b66e0f9732cc3863def7a5d827a012ed8e88c36692c07
-EBUILD rspec-expectations-3.13.0.ebuild 1417 BLAKE2B 23a08dfe6e4d874c39f9d5780187f9011d250a90c83cc8dfb1a627be81786f58e7ec095c0f2c9a81182fbc24b769c3f752004f1174dcf25b8e233bba3cb38ae5 SHA512 b668535c975b5c3edc3c200b21c9d38e972f8b5e72b30745417c2e208dc3819a77ff9b849a16cdd0647b66e0f9732cc3863def7a5d827a012ed8e88c36692c07
+EBUILD rspec-expectations-3.13.0.ebuild 1411 BLAKE2B a461dcfca51ebdfa196f85abfaf3d5e30510e2b415155e49c501fc23785415ea00fc57fff0ac21222a7a0490f2dc02a1490047278e10e133850202b45d2bf1f5 SHA512 513dd9eedde30970e702458412391f68171b5cfc1ca95b3ef7b4b7feab75673518bceba34d104ab8b4928400e15bc0fad1cafb451f05cb6ab1e3a968a3d29a8d
 MISC metadata.xml 351 BLAKE2B d819679f0a74e7885241c77f001e1522143ea052a1cd511d128c3321aa96d6060b98ef11c615165f631d4081f5757c7ed463de58f44acb6187d026ce86a2042c SHA512 1f43d7394a1fc32d2aae92b66a513af0572ee1ed4bed3d391b4774df97919113ec9ec9d0da68e26f1c5558d877e1c8fef01aca6b92ce6b70bc3b256ad70dade0
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.13.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.13.0.ebuild
index 96e2fb7e5b11..49654865096a 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.13.0.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.13.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 2bb0476a61e1..133fdb00cb51 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -5,5 +5,5 @@ DIST rspec-mocks-3.13.1-git.tgz 208640 BLAKE2B 5f8fa06c3058b5b2cc405b7c309377697
 EBUILD rspec-mocks-3.12.6.ebuild 1588 BLAKE2B 6eaa22c0ba401e9bc9121561d1a10f7468473c4d46760a0f0ad577e10072f392264362e8b578fce9b872d31941b58f372f10dd3b195d19179993b674bb485dc0 SHA512 cc7df0564e7cc1612ffc23fd0936a180466da4564baa3633fe270e2f7b29e815250de2bdf329689ff604b86ab832f1dc637e165df17a4ae3d70a47dfa672d050
 EBUILD rspec-mocks-3.12.7.ebuild 1603 BLAKE2B d5797c54ff68f0da2a531b42331110c6e4ddc08272ad747d41032f95f4a59f0ec6fe386aa012a4a00c8e387415a6ca9227fbcf3c8b1bd36270a84ece47e1726b SHA512 a7b37bf38da3ba8226f11b5514cdb0e2742771811716cdd0b3482d0b834ff26fca4def10e19bce5e2994cccbdaa0b7921bec87f298ca256f2c1ba18fb8c1fafb
 EBUILD rspec-mocks-3.13.0.ebuild 1603 BLAKE2B d5797c54ff68f0da2a531b42331110c6e4ddc08272ad747d41032f95f4a59f0ec6fe386aa012a4a00c8e387415a6ca9227fbcf3c8b1bd36270a84ece47e1726b SHA512 a7b37bf38da3ba8226f11b5514cdb0e2742771811716cdd0b3482d0b834ff26fca4def10e19bce5e2994cccbdaa0b7921bec87f298ca256f2c1ba18fb8c1fafb
-EBUILD rspec-mocks-3.13.1.ebuild 1603 BLAKE2B d5797c54ff68f0da2a531b42331110c6e4ddc08272ad747d41032f95f4a59f0ec6fe386aa012a4a00c8e387415a6ca9227fbcf3c8b1bd36270a84ece47e1726b SHA512 a7b37bf38da3ba8226f11b5514cdb0e2742771811716cdd0b3482d0b834ff26fca4def10e19bce5e2994cccbdaa0b7921bec87f298ca256f2c1ba18fb8c1fafb
+EBUILD rspec-mocks-3.13.1.ebuild 1597 BLAKE2B 4d1ed24937b09a85b84ec70a462befb180d7f38aae3f8191ff86346f0c2541ccd1d3c65daa83b6fe5c016c9e3b3fcb38c68ad085981b35b084934bec24dd2be7 SHA512 34d6be09b399724e40122fe48469a7b849053561eb88659d1e583111ef8801f5fa4b941e473cce65aff5faa953c74be7e3304cf6de1b3bf3b190be01db26e211
 MISC metadata.xml 344 BLAKE2B 5b939c668a8c75c33348bff9e8a0fa6042702fb59cdfdc2c8b45db1d9d191950a63d6f9b1329e6a2717a097d7b001afecb9ebbd0fa08badaf95664d37b06eb17 SHA512 026e9a293c2f99d86a11f37267fddcf54dbdc33aec00f470a988d477d6e3198ccc478c03cca059be0a4e324b9f256719c99c7c81af97c75fd7cebab433d4b1a1
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.13.1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.13.1.ebuild
index 113c3889a987..fe1a04f3e368 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.13.1.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.13.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index c6016eb2fb3a..878d854d0ed2 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -5,5 +5,5 @@ DIST rspec-support-3.13.1-git.tgz 79672 BLAKE2B 73a1b7c8508fd361ca06a647b3291e51
 EBUILD rspec-support-3.12.1.ebuild 1864 BLAKE2B 7ef93481037f3f7f940d78b69c2dadc3ff20178fc0887c10543f47fb6b6bd81d7e39aa0dd395338d9441a99ad53f2caecdee63deb3ebdd2b1b15f033dca61efb SHA512 da4540ba2637aeacc73e51825e56afe4191cf685a4c502e0ec38f282e7afa8fbce4dccd909495be551f3b93f0227ed345340a93657c7bac572a3b5d2bc06a1fd
 EBUILD rspec-support-3.12.2.ebuild 1879 BLAKE2B 9749dbf0afd270ca633b8dbad94c064b9f2a6aadb29cc0083616711a0a074331b31369e1af1f2049382bf6a044498a39eab4788ebb9fe4119365b844083dc49e SHA512 8991e0133a60ac023d9a590f74ef650a5bcbbc7c92ea66b2a3e47a7d2a0b0e9f2253f8d7a6caae758f76eec7c3fb7ef343cb9927905594e24e8c5e327422e5ad
 EBUILD rspec-support-3.13.0.ebuild 1879 BLAKE2B 9749dbf0afd270ca633b8dbad94c064b9f2a6aadb29cc0083616711a0a074331b31369e1af1f2049382bf6a044498a39eab4788ebb9fe4119365b844083dc49e SHA512 8991e0133a60ac023d9a590f74ef650a5bcbbc7c92ea66b2a3e47a7d2a0b0e9f2253f8d7a6caae758f76eec7c3fb7ef343cb9927905594e24e8c5e327422e5ad
-EBUILD rspec-support-3.13.1.ebuild 1879 BLAKE2B 9749dbf0afd270ca633b8dbad94c064b9f2a6aadb29cc0083616711a0a074331b31369e1af1f2049382bf6a044498a39eab4788ebb9fe4119365b844083dc49e SHA512 8991e0133a60ac023d9a590f74ef650a5bcbbc7c92ea66b2a3e47a7d2a0b0e9f2253f8d7a6caae758f76eec7c3fb7ef343cb9927905594e24e8c5e327422e5ad
+EBUILD rspec-support-3.13.1.ebuild 1873 BLAKE2B af2aa54089fbdf3c62849549b5b6f65d8dbfaea8ae866d4f40c2d394ed33aac7031dd8c67e45ed6d29ccc32e5bcb9ef89f29a5c4b3d6571b11febf2b5733dab3 SHA512 dbfa9deabd08a8babec66754740dc758b5881ad6e7ec8941f632354bf6f7cc91da251babdf13c3dbdb190a442a30ba599da6b5188863f53ad675951eddd67740
 MISC metadata.xml 346 BLAKE2B 74d62cfe1930a3bfaad9b1b14ce55b0de81a0963f1e4e5ba0f104ea51adac0ba86c7cbc38831630029a8e487623df0d279028b5d1b2391eb2bdf060582c80be4 SHA512 60c7dd2d3d9d103b3c0e505d62975571eab89bdbc92203c2bff8cd9b854dda3020490f9592464760798b8e5d973ab3be7b142dca2d03583b822fb0a83761a225
diff --git a/dev-ruby/rspec-support/rspec-support-3.13.1.ebuild b/dev-ruby/rspec-support/rspec-support-3.13.1.ebuild
index ba109801fee2..ac05eb8e862c 100644
--- a/dev-ruby/rspec-support/rspec-support-3.13.1.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.13.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index 1792c7e92392..2757bec14138 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -1,5 +1,5 @@
 DIST rspec-3.12.0.gem 10752 BLAKE2B 80beb56bfed2200e05c8fbe040a265f4176a7142a7c077564821057eec2aa02f68c2417eae5e0309221457d419bf0c9af9123c5e8f1f19992a9361298240c0c8 SHA512 24278c467e5226ad1a5bb4c64190fb5d1077777237d9c2e5c4f16a00b026bf26d8f15e2c74a34221b198992f73ef06af314488a61358968e2083f935467e5a35
 DIST rspec-3.13.0.gem 10752 BLAKE2B 41df21678a628fff7f86167bf80afcc602da2d5263c2f12e666cbce9401a51ff82887cfdf32fec85194b2511930525e2b2f1dda902437379ed45b78d99f830b2 SHA512 4031dc10cfd3fbdd8f023328df661159bf01d6fefac89a2750119c2dbe58ed2daf75737598002164c9760e366bdb7e5c1076430c2d67502ab0cae51ef94b5ed7
 EBUILD rspec-3.12.0.ebuild 629 BLAKE2B 66b493a510332dc60b1c637495537c8a79473c44dfe86e7093ca7609b33d1c58fe34e236de6fd715a0bff85b67150c9a1c25413245a2e22b0c09f3bed0906937 SHA512 06292b12748999845554de6bec44f81741dfa1055e06840376fc3d55f6cb7cdc389f6fa9a0c03f62cdfb55063efdc550aec7543175b02dee90360ae286d35748
-EBUILD rspec-3.13.0.ebuild 628 BLAKE2B e4104be3209d8c8c198ccef143df87dd4fa23f8d84b603a63fda6fb9de3700ef1ecd6a7efd1b9760f41f5dc6fc99f0cb9d3a736be0fd5ce567c0bae27bed44b6 SHA512 45743951d41c6961f32a50139010809ba84fc00da84b7e5f1d0e0f1ffd22c19bbf19838ebc380906ab3810a54943d8dc87eb2b1bd0db0b2567d0375c44918168
+EBUILD rspec-3.13.0.ebuild 622 BLAKE2B 2db04db616e25bc1ba6d7a9fe5389f27cceedd660ccfa869523f59a74d3af4a1f891bb81e32ea182b520dbea4f8bdb71323ebecb3dfa1a0b03c3e968b153bd7f SHA512 3e0c08eda05dac5e0d1ec2a2062550147b0d36a6a95bacfe2f056a87e404aa1a023fea49ff0bc2cb472dfc975f56a8b0df21149e74961320eaabfd81c5d9a762
 MISC metadata.xml 338 BLAKE2B 1e5e8d2aab4bb1d0c8d8826267a9d957cd051b4d9d687f38609d44f78222bcb13f415f7ea46aafb968f005a701b94716e00137d8e5afc55944f618694d9fdf5b SHA512 8230df512530fd14410adcb365feabe3e79b826b047759a2631d234bdc00ba807a790eeb646fba74547aac12c577a0b34cfe4ca1b71c0633728982f0b6d1bd17
diff --git a/dev-ruby/rspec/rspec-3.13.0.ebuild b/dev-ruby/rspec/rspec-3.13.0.ebuild
index 696efc9c4ae0..391b9bacae47 100644
--- a/dev-ruby/rspec/rspec-3.13.0.ebuild
+++ b/dev-ruby/rspec/rspec-3.13.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rspec/rspec"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 SUBVERSION="$(ver_cut 1-2)"
 
diff --git a/dev-ruby/sqlite3/Manifest b/dev-ruby/sqlite3/Manifest
index e821b798ea59..84fb11eb2a70 100644
--- a/dev-ruby/sqlite3/Manifest
+++ b/dev-ruby/sqlite3/Manifest
@@ -1,11 +1,5 @@
 DIST sqlite3-1.6.7.gem 3249664 BLAKE2B 021edaa3d1a9d4cd8eeaaf3354e6e5aab047d8e61abbd5416ae50b2a7e426e5a6c1a484bc9f0c47a838b006b37eb3b41d7c51c200851f9d7bf0525b9dc91b597 SHA512 83455e533bbe84c71045b28ec6262b50804e774f3de4811e123cdb780ea4989227c01a8b6939179813ae3b59e1261e2d694830cc10ca05e7789dc635ff4d9b97
-DIST sqlite3-1.6.9.gem 3277312 BLAKE2B 85360858f23ad20efce1d2d0dfb5661440425ad2d45bee3ff4c26a1489a9c3e8d1a875a8a0a2f71b89f9dde85e01ab10b65ba9bebcc9f4efe2dfb9214d983a5e SHA512 d5bb7b928c9cac2a8a97f9ce4e56041713d41364bef6e37ea10e47d795576b0f524eea9a8369f2022dab12d79cf0d28f85383d731ecde1af5edfb0c6421c83ff
-DIST sqlite3-1.7.0.gem 3277824 BLAKE2B a836cccf0ad6572139589a534bd95e011108f313c0f3876da612196ddb58d4ca7e4de4534d896566c1d86e3990f5601f9953bd14b25ae9a7aa85559389ec11b1 SHA512 d87b9567e58018c51788d7d524f983f4a4503e95f2b25fd0e0eb655f357fff7c18ebdabf0cdd057a1ac2215c8c849e7eb4e10a323bdc812632830ab886510c16
-DIST sqlite3-1.7.2.gem 3305984 BLAKE2B 944ed6206476e4161361b31dfb09bcf0c91a7a5c7a675f21892aa9831d41218d367e459459a4774e86331aeabec9db1bd12956e01f004f23e2d95beed73d5808 SHA512 1e0ad4266230108f30716a1ab1dd2defc47f52e5a43250e32295e2506fa1398334010ad3aa771a60c2127618aef2344fe902e064ea525e95c99438db8c3b73b1
 DIST sqlite3-1.7.3.gem 3307008 BLAKE2B 0df742c7cb4a8f920196106b5701eae07e60e668f040ca6e3276afdd0dfdeed3fb19ed455425f332e13082ca740f42d914536ccdf565ed151b6eb0f6ccd7c676 SHA512 b6ed36a5618134ca1f993b21a351ac279ebb7e1370be521eae67ed9224a1fac11d71ddd7573b3b14da47657756cb68b3eab0164b6e6ed058d3f64fa95699bc2f
 EBUILD sqlite3-1.6.7.ebuild 1466 BLAKE2B adfab61213d954e7f1dd48196cbc8ff32c2a43fa4e71a20c222f348a480f7865ddfc67fef7c3682d16443c280dcd2a3918c3835decc2b33d155c9e704b4f1a4a SHA512 8a9cc9be55b6d8c320a01d6f6229584cac653908d72ef64b85e18095ac87e78e26b983af0a865689174d2e3c3c3a7b2c012fdd8cb2db42aa2b90295735a92759
-EBUILD sqlite3-1.6.9.ebuild 1470 BLAKE2B 3b5346ca8710f5c4cc09648a86438948dab2ed0ed8cb2dbafca414e52360d7aef152fe63d039a88cc2c7ce69d086ac2725ac64f40f7b9ac38b78cd090faa7e19 SHA512 14c2c30a2790ddb440964f68cdc4b247283dece2525add3a817785b52ddbbb4d0e82f9b6ab5d4e438a7464f1f0654d177abd61ba8d775c46c96aefa5284ef56b
-EBUILD sqlite3-1.7.0.ebuild 1459 BLAKE2B c8d2d679a0411a79399e1af13482cb57a25ec52bca953dbb966fc856899a8ecc20fe7e85a45468d8230fba26a95efae817756cd07d4505be51a0684d76a8c121 SHA512 961394fd6c74db01823ca17da5eff8bf0b6a39441ef8041fc3a6d1e6c8432e7f60e8b822e0fb2a78bbaafbb6ba5d1b738f84a6c8ec7a2e6f3482575875369e16
-EBUILD sqlite3-1.7.2.ebuild 1467 BLAKE2B 89789912d20cedf7c26be4c7d6c77c8842946c4719b77edb2a6f26d14db9db4ef40ff43e14ff0ae4c38d649a1fe22a2a2dac97e0a86493ba69e18c92bb200a98 SHA512 089f5ac1d9905e9ed5d62dcb02c5ca66c0b952189c9ad4292f3287c5171dc75a83ac1a4a344892ea779c0d9ac5fcd04fd06c0d05661c89f225ca116e628b5629
-EBUILD sqlite3-1.7.3.ebuild 1464 BLAKE2B 855ebb8350d305ae35b5c781f0710cc6e3c015d254cc3a72c9878c12ff54bb7ea65879140c0d16293c46d714fe16a98bb2e18238aba21136f1f20c0f0f840367 SHA512 bb77ada2517480b35b96f3710af85bd01155339ac04ff7bba17105d504ced923a8e01596a8d1c56a6108ce1b0b31e2ca4f84a26aa814daec79ed40b432e368da
+EBUILD sqlite3-1.7.3.ebuild 1486 BLAKE2B 6df9887cd0ac139f5d158348cfb4dd678b63c490152cf099c1c77b823f2e162eee00f3d30b15a6eea5f4191529cd6683a309aba500318b386b0c56c02e269bda SHA512 2f8baef1a1ab502434657e5ed2a4728fbf7c81f85b5d1e293e5ebdec6a8713e978dad31cd4727e239edf0c2f883f552603474205543c85c25039b463706e0988
 MISC metadata.xml 343 BLAKE2B 8246e0b7df67080839741f0258357ae19da18bd7ad8615bb77b943bc89db7560d58f95a8cba4e770070efc477ba56ee1f5c9ba098674ffc01dd5fdd9b912189a SHA512 541f2db81c9383013da74a8a54f318ff7535ffe5c6ea789f8ddc451f629a121e56b322d8b3a0730e0b27b111e16e27d8fa49bc5805a7c61fcf91ac7110ca712b
diff --git a/dev-ruby/sqlite3/sqlite3-1.6.9.ebuild b/dev-ruby/sqlite3/sqlite3-1.6.9.ebuild
deleted file mode 100644
index 02ac7a89108d..000000000000
--- a/dev-ruby/sqlite3/sqlite3-1.6.9.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32"
-
-RUBY_FAKEGEM_TASK_DOC="faq"
-RUBY_FAKEGEM_DOCDIR="doc faq"
-RUBY_FAKEGEM_EXTRADOC="API_CHANGES.md README.md ChangeLog.cvs CHANGELOG.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/sqlite3/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/sqlite3
-
-inherit ruby-fakegem
-
-DESCRIPTION="An extension library to access a SQLite database from Ruby"
-HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
-LICENSE="BSD"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-SLOT="0"
-IUSE=""
-
-# We track the bundled sqlite version here
-RDEPEND+=" >=dev-db/sqlite-3.44.2:3"
-DEPEND+=" >=dev-db/sqlite-3.44.2:3"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/rdoc dev-ruby/redcloth )
-	test? ( dev-ruby/minitest:5 )
-"
-
-all_ruby_prepare() {
-	sed -i -e 's/enable_config("system-libraries")/true/' ext/sqlite3/extconf.rb || die
-
-	# Remove the runtime dependency on mini_portile2. We build without
-	# it and it is not a runtime dependency for us.
-	sed -i -e '/^dependencies:/,/force_ruby_platform/d' ../metadata || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc; then
-		rdoc --title "${P} Documentation" -o doc --main README.rdoc lib *.rdoc ext/*/*.c || die
-		rm -f doc/js/*.gz || die
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/sqlite3/sqlite3-1.7.0.ebuild b/dev-ruby/sqlite3/sqlite3-1.7.0.ebuild
deleted file mode 100644
index 6a59e359cad9..000000000000
--- a/dev-ruby/sqlite3/sqlite3-1.7.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_TASK_DOC="faq"
-RUBY_FAKEGEM_DOCDIR="doc faq"
-RUBY_FAKEGEM_EXTRADOC="API_CHANGES.md README.md ChangeLog.cvs CHANGELOG.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/sqlite3/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/sqlite3
-
-inherit ruby-fakegem
-
-DESCRIPTION="An extension library to access a SQLite database from Ruby"
-HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
-LICENSE="BSD"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-SLOT="0"
-IUSE=""
-
-# We track the bundled sqlite version here
-RDEPEND+=" >=dev-db/sqlite-3.44.2:3"
-DEPEND+=" >=dev-db/sqlite-3.44.2:3"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/rdoc )
-	test? ( dev-ruby/minitest:5 )
-"
-
-all_ruby_prepare() {
-	sed -i -e 's/enable_config("system-libraries")/true/' ext/sqlite3/extconf.rb || die
-
-	# Remove the runtime dependency on mini_portile2. We build without
-	# it and it is not a runtime dependency for us.
-	sed -i -e '/^dependencies:/,/force_ruby_platform/d' ../metadata || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc; then
-		rdoc --title "${P} Documentation" -o doc --main README.rdoc lib *.rdoc ext/*/*.c || die
-		rm -f doc/js/*.gz || die
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/sqlite3/sqlite3-1.7.2.ebuild b/dev-ruby/sqlite3/sqlite3-1.7.2.ebuild
deleted file mode 100644
index 0824284115ae..000000000000
--- a/dev-ruby/sqlite3/sqlite3-1.7.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_TASK_DOC="faq"
-RUBY_FAKEGEM_DOCDIR="doc faq"
-RUBY_FAKEGEM_EXTRADOC="API_CHANGES.md README.md ChangeLog.cvs CHANGELOG.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/sqlite3/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/sqlite3
-
-inherit ruby-fakegem
-
-DESCRIPTION="An extension library to access a SQLite database from Ruby"
-HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
-LICENSE="BSD"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-SLOT="0"
-IUSE="doc test"
-
-# We track the bundled sqlite version here
-RDEPEND+=" >=dev-db/sqlite-3.45.1:3"
-DEPEND+=" >=dev-db/sqlite-3.45.1:3"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/rdoc )
-	test? ( dev-ruby/minitest:5 )
-"
-
-all_ruby_prepare() {
-	sed -i -e 's/enable_config("system-libraries")/true/' ext/sqlite3/extconf.rb || die
-
-	# Remove the runtime dependency on mini_portile2. We build without
-	# it and it is not a runtime dependency for us.
-	sed -i -e '/^dependencies:/,/force_ruby_platform/d' ../metadata || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc; then
-		rdoc --title "${P} Documentation" -o doc --main README.rdoc lib *.rdoc ext/*/*.c || die
-		rm -f doc/js/*.gz || die
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/sqlite3/sqlite3-1.7.3.ebuild b/dev-ruby/sqlite3/sqlite3-1.7.3.ebuild
index 8f141ca5827b..437c4cc99326 100644
--- a/dev-ruby/sqlite3/sqlite3-1.7.3.ebuild
+++ b/dev-ruby/sqlite3/sqlite3-1.7.3.ebuild
@@ -24,7 +24,7 @@ IUSE="doc test"
 
 # We track the bundled sqlite version here
 RDEPEND+=" >=dev-db/sqlite-3.45.2:3"
-DEPEND+=" >=dev-db/sqlite-3.45.2:3"
+DEPEND+=" >=dev-db/sqlite-3.45.2:3 <dev-db/sqlite-3.46.0"
 
 ruby_add_bdepend "
 	doc? ( dev-ruby/rdoc )
diff --git a/dev-ruby/timecop/Manifest b/dev-ruby/timecop/Manifest
index 17dbc99616e3..bae0d1375c69 100644
--- a/dev-ruby/timecop/Manifest
+++ b/dev-ruby/timecop/Manifest
@@ -1,7 +1,9 @@
 DIST timecop-0.9.6.gem 17408 BLAKE2B 53afa8313be94fb8774812b014f11d9a134b51b7dafcc0fd8d91d10756e042bfd6d56b10f8072c1d606519e532beb2e02032bd4e3f6d45b4cf41dd968ba86224 SHA512 a5cbdf38caa5bccb9887a6abb5d99bdd1470c9ff8d52d19f0c46f116dc73b62512f76021adc1ec98ca4abe85ca61a4ab1e821d80980fa7ab3c821abd13b9695a
 DIST timecop-0.9.7.tar.gz 17818 BLAKE2B c978a3765864963b4dbbb8a9cf2172208fa7b66afd68417a057bba44b6d35141bab5182bef3404d6233f394e9d874026886dc85b2e400908bdbf2f3af273b6bf SHA512 4db43b655225b8017769497b5ffc88d7b6d728677439ade09d8e0b8e8ef01c0307e49575ed9e1d2ac379cd222a5a0d34feae018d15ee34b70934e93a019a76e6
 DIST timecop-0.9.8.tar.gz 17936 BLAKE2B bb66dac74df498b6a5c284805c2c8a486523d43c2923c2e11f65d24bc2e9ad59c3bdd356bf3e93946859ed9e95ac9924e48747afb17ec81a5378e0370d7dff20 SHA512 cbf74e8d4e459f17cb841fee14353feccfa26e401d999521abb5653639a3d6b8e0dbd73d4317cb18b185d33d23e20e7603992cd6e2752ac74cbf0c0c927263b3
+DIST timecop-0.9.9.tar.gz 19926 BLAKE2B 452f013c9326291207001555f62dd3f4cb8fa8d08214465abae7e4a44fbd62df2c001c52c2068438c11c60c9e8ade604407858d6990c25ba3fcca770e90050be SHA512 62612d44198d5992721df5b5b56993d81b4d0a2c75a8b1e8d1072742e3d28b4b4eeaabda7c08902365610065af277e30be366b8340b16e8faeeba9c435586cd2
 EBUILD timecop-0.9.6.ebuild 1025 BLAKE2B c1a0ba1550ac783fc0701f1fd1f15a524c4bbc3f460d2e5a4f901a5a549a8cd30ddbbb7bb6706461592afb569cf2c399843e9a5e3e0ffe0e98a30d42359e85cb SHA512 41552d7765f8cc6b53e23f7ecaf3569caa5c85b913ae7593d910d836f8285d91249359a1f1785fc271ac61c2397ddc8946675144a6067ff70e94cafffdba1478
 EBUILD timecop-0.9.7.ebuild 1131 BLAKE2B 55f4682d36adf884c2866a77afde4722ce6d36acfc874ea73a38a5439409730aba60ff797ba6c4c6c3b63a9b3d626565e86a1a54c29d1df82dcd8175b60e8940 SHA512 ae2190d9f47fa67900f43c63804237dffd0372de70d5efd3448a89f2f00d9b728982f8c3d06bf48a5efc77218a915f9b5afa08d6c9f12a1996c604dc8f40ebd4
 EBUILD timecop-0.9.8.ebuild 1131 BLAKE2B d8587a2019e09853cd06032a04f1c02ff397503e21d109efeec93be702a69a6e14badc5c39fd945cd0cfc92d556a7968cdc2989570b7629ec2f91ee3bdbd11ab SHA512 ce2d672a3987f204278a5c9dd293246c6180a89e789109f0ad7b3d979d2cb1830c81755e133e894b8fb8cbb8666a4721fb320dfa71a50c6e20503d9a68407641
+EBUILD timecop-0.9.9.ebuild 1135 BLAKE2B 996085ca80f0b07f11d2378af56ec2e4ba39106ad6557f3ca9cf75151dfd4f134999d995452da6ebcff858c9c3479799f9da0b95302f0124e9ab5b776f5debf3 SHA512 78a0b5a17e1778ee948baa147915db4cb516a788c13961f8a72c3fbf7b3ded03dc54c629db7911b38855f401c487fee909fc53af0d7ed4dd5af01f4b34ae2882
 MISC metadata.xml 348 BLAKE2B bba76a39d1feb832ddef50069d8a62e8449ecb1db1aecf3388e281d908447f0d61cb8dbe0a41b08ee68e11293778cd3a9b150cd5da705e2f56f1559a5147e7d3 SHA512 86bd1dc85754e017925b4a527b459260d8cda42ceee3dedef549d415bdc5326705e9eda325af5761876297d0beb6210633ce1445cd2745565ee720852d86d13f
diff --git a/dev-ruby/timecop/timecop-0.9.9.ebuild b/dev-ruby/timecop/timecop-0.9.9.ebuild
new file mode 100644
index 000000000000..8c17e583d7c0
--- /dev/null
+++ b/dev-ruby/timecop/timecop-0.9.9.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_TASK_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+RUBY_FAKEGEM_GEMSPEC="timecop.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A gem providing 'time travel' and 'time freezing' capabilities"
+HOMEPAGE="https://github.com/travisjeffery/timecop"
+SRC_URI="https://github.com/travisjeffery/timecop/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/activesupport dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -e '/bundler/ s:^:#:' -e '/History.rdoc/d' \
+		-i Rakefile test/test_helper.rb test/timecop_with_active_support_test.rb || die
+	sed -i -e '/rubygems/ a\gem "test-unit"' \
+		-e '/minitest\/rg/ s:^:#:' -e '/pry/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_test() {
+	for f in test/*_test.rb ; do
+		${RUBY} -Ilib $f || die
+	done
+}
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 8173b7af20fa..8234fb0cdf17 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/chibi/Manifest b/dev-scheme/chibi/Manifest
index f513b0ebea6d..71913a470cfa 100644
--- a/dev-scheme/chibi/Manifest
+++ b/dev-scheme/chibi/Manifest
@@ -1,4 +1,6 @@
 DIST chibi-0.10.0.tar.gz 1148573 BLAKE2B 1435d5734bfc44b6d6ddafdb339eea659345eea0db0e9b227830d7a6b6b14d3655af10906e43b6f8abd7eb2b90596fcb5dcc024abd2cba123a184f66ffcd0961 SHA512 348c20468e3b3b084ed25d38860f1afdecfb06ad9ff9ceb178c36930c14aa66a78f48b881a8eda28a30498662e7c722938212ea77b1cea89834d1a4377f0f648
+DIST chibi-0.11.0.tar.gz 1228817 BLAKE2B aac54db3a323078323284e4d3e08f49637f4932d895801871a0d62e18b975bf7855c5db86985dfaf806696cd432160cae3dcde19fa63387c50842c73edf27b38 SHA512 00b56266398212a97603527ad1e4e56ac2a80ecdf0c13c5c41fe495a7af601bba3f00b7d36016284e76ab3d18e2c51bdb19a84523a158f50cec232ca950ac25d
 EBUILD chibi-0.10.0.ebuild 944 BLAKE2B fa45b59f8521af3b896898d066b711f4cd1d7bc66fff86853adeb5fdeb5a436aac2c15467f351b88093964c14a34da517470cfe70a717ba524014b25c0e12ce0 SHA512 daca3c9a2d7d7511d3c04310d1ff017c47ab450551cc7e50a911134b3f1425315176a66c9a28426709eb257d29d25fb0c005c6b4fc27bb097819ace41d9c521e
-EBUILD chibi-9999.ebuild 954 BLAKE2B 4a73664e4b355e94796c61949120f88123e69056aae460c8b40ca1ac764a5c3d06dc1519a5d3433fa29050aed5963e24b76d2d40a492c000d8accc886a56a733 SHA512 90ef12956cb8655edf691ceb1687ea6750c0b1b8794d9d19a2b8b13bc7a72b61e0416377beab5bbad784b0eea8e579edaf1d76bcdf8819ec4f5532e21c0574ee
+EBUILD chibi-0.11.0.ebuild 949 BLAKE2B 1f7536c4868952a15fdad15dcac809c65d65c4ee07bf801d477c4a537d488861c0855b7edd3fbe4d3a51281b886bb53821802567334ebf8a9e3a2a349322ee18 SHA512 73463c711b1d1d67691ca0a455d3225e53fcefbf0341ed086034c66bd3cbfefc450a3b9c8c64d76b9a45ab5dccbbdb97adf4e0cf3a639f9e63cdc8c15e89995b
+EBUILD chibi-9999.ebuild 949 BLAKE2B 1f7536c4868952a15fdad15dcac809c65d65c4ee07bf801d477c4a537d488861c0855b7edd3fbe4d3a51281b886bb53821802567334ebf8a9e3a2a349322ee18 SHA512 73463c711b1d1d67691ca0a455d3225e53fcefbf0341ed086034c66bd3cbfefc450a3b9c8c64d76b9a45ab5dccbbdb97adf4e0cf3a639f9e63cdc8c15e89995b
 MISC metadata.xml 1355 BLAKE2B 0fcce80e3e0fd747b74e5cb5e83904a22de2596bba8c5e664e1d0fd29e9ed43d62357b618994cc586391a66a60ca6fb53a68a9cfd221853ad66171b9b7a47a8e SHA512 f0f8613e22a15e02d34de4c41352a797fba65c2c8fc78b37f9024bfcc57ab99391d2ffa28eb0173d872421744d901655beedadb44e32a04a467917b3a8476fe2
diff --git a/dev-scheme/chibi/chibi-0.11.0.ebuild b/dev-scheme/chibi/chibi-0.11.0.ebuild
new file mode 100644
index 000000000000..40985662f005
--- /dev/null
+++ b/dev-scheme/chibi/chibi-0.11.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+REAL_PN="${PN}-scheme"
+REAL_PV="$(ver_cut 1-2)"
+REAL_P="${REAL_PN}-${REAL_PV}"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Minimal Scheme implementation for use as an extension language"
+HOMEPAGE="http://synthcode.com/scheme/chibi/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/ashinn/${REAL_PN}.git"
+else
+	SRC_URI="https://github.com/ashinn/${REAL_PN}/archive/${REAL_PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${REAL_P}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+src_configure() {
+	tc-export CC
+
+	export PREFIX="${EPREFIX}/usr"
+	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	export SOLIBDIR="${EPREFIX}/usr/$(get_libdir)"
+
+	# If "ldconfig" exists it is ran, overwrite it with "LDCONFIG" variable.
+	export LDCONFIG="0"
+}
+
+src_install() {
+	default
+
+	dosym "${REAL_PN}" "/usr/bin/${PN}"
+}
diff --git a/dev-scheme/chibi/chibi-9999.ebuild b/dev-scheme/chibi/chibi-9999.ebuild
index 3860b98dfaa5..40985662f005 100644
--- a/dev-scheme/chibi/chibi-9999.ebuild
+++ b/dev-scheme/chibi/chibi-9999.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-MY_PN=${PN}-scheme
-MY_PV=${PV}  # May be tagged incorrectly, see bug #858245
-MY_P=${MY_PN}-${MY_PV}
+REAL_PN="${PN}-scheme"
+REAL_PV="$(ver_cut 1-2)"
+REAL_P="${REAL_PN}-${REAL_PV}"
 
 inherit toolchain-funcs
 
 DESCRIPTION="Minimal Scheme implementation for use as an extension language"
 HOMEPAGE="http://synthcode.com/scheme/chibi/"
 
-if [[ ${PV} == *9999* ]] ; then
+if [[ "${PV}" == *9999* ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ashinn/${MY_PN}.git"
+
+	EGIT_REPO_URI="https://github.com/ashinn/${REAL_PN}.git"
 else
-	SRC_URI="https://github.com/ashinn/${MY_PN}/archive/${MY_PV}.tar.gz
-				-> ${P}.tar.gz"
+	SRC_URI="https://github.com/ashinn/${REAL_PN}/archive/${REAL_PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${REAL_P}"
+
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}"/${MY_P}
 fi
 
 LICENSE="BSD"
@@ -39,5 +41,5 @@ src_configure() {
 src_install() {
 	default
 
-	dosym ${MY_PN} /usr/bin/${PN}
+	dosym "${REAL_PN}" "/usr/bin/${PN}"
 }
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index dbdc9b74431b..ea4e4e4f45cd 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/mingw64-toolchain/Manifest b/dev-util/mingw64-toolchain/Manifest
index f568359412c2..7781260f4049 100644
--- a/dev-util/mingw64-toolchain/Manifest
+++ b/dev-util/mingw64-toolchain/Manifest
@@ -10,5 +10,5 @@ DIST mingw-w64-v11.0.1.tar.bz2 10057401 BLAKE2B 3222eed35522bf95a571b11dc52ea231
 DIST mingw-w64-v12.0.0.tar.bz2 10474283 BLAKE2B 6500045f7d77f7de01dea0f4e03f3e4ddf6154586c5e3ee9718ee2c7ef1cc83ce3cbd644b6f1dc293ae6e0bfb55a6b68d439622bd1cfdefefc4cc547317f1943 SHA512 949b2bfab8763ab10ec4e9fdfdaf5361517a4ab787fb98ab419b38d02694061c2e821ebbf6e2e4b39d92bdf17419d116daa8e63afd9e01d11592f39df4da69d7
 EBUILD mingw64-toolchain-11.0.0_p2.ebuild 10880 BLAKE2B b5f3771c437e07243a53c097a0d032ae480879c52884459613b9c8e36e021c1156c54470a8312437cdcc5e7c4555968abecdaea7ca00b8616af51fed2e71ae52 SHA512 93fe213774132ea102b69b97926e2f3848fd362f7884ea632d9026e60b5cb0fbb6c3669d8a43234f6d3e748e7316be5141a93c1ad5520782a9b2eec426224193
 EBUILD mingw64-toolchain-11.0.1-r1.ebuild 11538 BLAKE2B b08f6d1f0bcb401a4e9df38f1747acecf1faf04e76229023c6cc1a4785277f9d8b430877adb60f63c6a8a2ed2fbc0649122afff8f5c91cc73208e3b588d28195 SHA512 db5c662ef8205437cdc3197b4fdc2cdbedcb4b284c516aa4607677cb1fc2a790e5520b0cfcfd0e5c626556c96167947676363314fa66c352f9ff36af6f80c934
-EBUILD mingw64-toolchain-12.0.0.ebuild 11861 BLAKE2B d99f9cff990c00892ffa818ca87fccf0cfef2bc61d654e7958fb692efae4783b54d00e82ba097adab7c8c4d21579fb54821ba296f37e8c74f1ab3824a92efb90 SHA512 61323aa797079f2ab83fa589b9ec3a905edd7eb69fa96e0a3585c56c95d2d41fcd13aa4acb7dde6f9bf63e7e1e126bdd4efb7d6e59ce056c9f075c61925771cf
+EBUILD mingw64-toolchain-12.0.0.ebuild 11834 BLAKE2B 4b37e1c1105fc56106c6ae4ce71e5975aaf980225f5a655e7ddbfa9186a6d603173b6789221988a12d9439f93c83d159574309c2a641feed0381ed54068b687f SHA512 c6663066ef8675d0979e27ecd6bd7d71b96b09148d378c41fc195739f1b185138927e81739d2b2023dffdf784bbd8f88a55510aa4fccb200c54b0913b1c83643
 MISC metadata.xml 639 BLAKE2B 40e8fb879c8f26b7ba49bf453f242fbfd2a7950a0ec07f41945172a97ae77bdcf3ddfda741c6cf9f436efc42e9f5e72ccef67b408f62ea41335383eab76761f9 SHA512 280133ff26c17f4195635d3ab124a60d73bec1a2d841c91d89821dab18058381d30c4661f621c586ba4af31955cd902f1ef042301e04ff056ce20d0c45b7c4eb
diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-12.0.0.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-12.0.0.ebuild
index 9d0caa3aafaa..299f57892c6e 100644
--- a/dev-util/mingw64-toolchain/mingw64-toolchain-12.0.0.ebuild
+++ b/dev-util/mingw64-toolchain/mingw64-toolchain-12.0.0.ebuild
@@ -40,8 +40,7 @@ LICENSE="
 	ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain
 "
 SLOT="0"
-# unkeyworded for testing
-#KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="+abi_x86_32 bin-symlinks custom-cflags +strip"
 
 RDEPEND="
diff --git a/dev-util/nihtest/Manifest b/dev-util/nihtest/Manifest
index 3de10ae74c57..5c02ead6a711 100644
--- a/dev-util/nihtest/Manifest
+++ b/dev-util/nihtest/Manifest
@@ -1,5 +1,5 @@
 DIST nihtest-1.5.2.tar.gz 39901 BLAKE2B c6b71b457ec7ff2d154061d31f009e44b4208901bfaf7ff16c3b70d4da7e0790238ed21c310651e89ac7a8a335c9d5131b974a945ad41bff74da5ba14ecbf581 SHA512 7f7e29e6c1320cb2f1886b6a73c43e11a672bd42471d01a47d0941970b478361b3e463d7d64b4275ed707d87fe27773b34c0f79f398494393330d7091f9f2f53
-DIST nihtest-1.6.0.tar.gz 40473 BLAKE2B 98c1247485fc49a3a4b8f96dce16e35f7ac706ce8da7fc491ed62ad2c18a1514225ffdfcecae05266958f210d839897263bf2862abf0d771870f29a911f257fe SHA512 b70a7cd5624f7930f48cc75b454993f878a1d3d42035fa6dd90e89cc6d2b1928e8489974c583a814fa009f33749d9dc4614869f0693f51de1d1c74cf77801f0f
+DIST nihtest-1.7.0.tar.gz 40925 BLAKE2B c21a5de44c3739b8e9dceac2391f1dc53ad276759389cfbf93e4cc0688ae7170f3cd56423f3c0be3b12ca7ea07f7168b78f3a0e3ad7c6a959019253360b57ed1 SHA512 2f84a4e3491fff64f9ae41c69cb79cd917c9c3ce7f6912d54e2110e1221b62c1a129c2e31ebac077d635f5cd788e97c4d9465eb3fb414bb054e5ceed32260ddd
 EBUILD nihtest-1.5.2.ebuild 1243 BLAKE2B 0ce6e0a167ba44846f6e707046a5ed405faae1316cb975b70cabf21c59fefcf73ebe87b8617578c82e51f2a85e0c3545bd5dc953298cd3f032c52ce49fd97a19 SHA512 d1db65bac3b01f895d5f8c26e92516e3781e6147e887021fb6a4153a653530fca36b1bed18f9797e18859cf2f913b6e2123e92a0b8c932be3b123cb242cf790f
-EBUILD nihtest-1.6.0.ebuild 1245 BLAKE2B b0e80e40c32383d5cee591829e004be2d7e70edd1efe6bc21e8bcf23d09097236ccc8f54ae0d9dbc3339de8a237c5db50ffe65b0ea95135902152cfb64338568 SHA512 c44ff246fc3fdb6d76f6c615745baa1c7c335776c492a5a1a7d014de6c4fdda9f3b655b06dd0c16cc421327fe5cef4aa8c95d1e3377b0a9f8f20bfd7105d410d
+EBUILD nihtest-1.7.0.ebuild 1248 BLAKE2B 01bd510a576d460b2c511d7bc697392b4103eecc6d6d7bc0b5c015ba1586077cf8706ab830c53a42b8732f5919712d94fa430321bb17a75b43f261637588af37 SHA512 ae09e0d6a6bfabb843b7561d4165c2564bfceaac9cd687eed8f6dd25c3c7264089173e95a9a4905198c02c998ec9a04c7c0fda07ac4f1ec4ad8b8767fc0811af
 MISC metadata.xml 579 BLAKE2B d72bfd9d67cdc33a02940e23874f8d989477d0affd271e35d294d65e1db5568e21a1091ce5e9261371a873d5f466cc252d6e62a72a64c8b21e235ef18cb330c7 SHA512 965fbb83abf169bca5ebe9720a020c6e4737b6ee4a1dd208d8d258424563c93193b2db7123f6d61f481ba1573f41429e5847cd7b6ceb667ab1d03bbb897bea48
diff --git a/dev-util/nihtest/nihtest-1.6.0.ebuild b/dev-util/nihtest/nihtest-1.7.0.ebuild
index 5dbe563be3c9..00f9602d2d51 100644
--- a/dev-util/nihtest/nihtest-1.6.0.ebuild
+++ b/dev-util/nihtest/nihtest-1.7.0.ebuild
@@ -50,7 +50,7 @@ python_test() {
 
 src_install() {
 	distutils-r1_src_install
-	newman manpages/nihtest.man nihtest.1
-	newman manpages/nihtest.conf.man nihtest.conf.5
-	newman manpages/nihtest-case.man nihtest-case.5
+	newman manpages/nihtest.mdoc nihtest.1
+	newman manpages/nihtest.conf.mdoc nihtest.conf.5
+	newman manpages/nihtest-case.mdoc nihtest-case.5
 }
diff --git a/dev-util/packer/Manifest b/dev-util/packer/Manifest
index e3b6810fb0c6..10d1b3509bbf 100644
--- a/dev-util/packer/Manifest
+++ b/dev-util/packer/Manifest
@@ -1,10 +1,4 @@
-DIST packer-1.8.6-deps.tar.xz 386558076 BLAKE2B 54903da9788ad483bb9dd66fd9c130f6a5beef6ebd70733b0e05437fe4d58a00769e2bef46c381610d3fe8769fdacc9527ba812eb40b2437160abec84662eb97 SHA512 c2c8cfcd85ae683e5558742965b5782a96d05cc2a5331e66da24aad094d2082c6cb6a1eba901bbaf7e9b56fbd3a754a0334c1be18c75c3f01643667ae1f9b09d
-DIST packer-1.8.6.tar.gz 2265929 BLAKE2B bb56ab642d3f358afed58153de27e52ad1d4fa9e97f5ab94ad9212cb6e46ba845606c266246ca89a74cc93738ed197e545772c0db22f32ed9c2f8b1bcb7d1f3b SHA512 1e0e36959f1efb6eeae076da3d27c200f4888a6a08e759072ac6c767e1cc3e14876f09f96bdd208b788d32efde9420357afe3105337b7edcc87ba2d99966578c
-DIST packer-1.9.4-deps.tar.xz 330480200 BLAKE2B 8c02e0fac4763f6a4cff98631ee0151a8d66ad199ae4979a0750e684c8b51284c59e5f99dd265590737be37e8ff0f65e692d3ebb11dcbcd8cba372e393c9e517 SHA512 d0bf06769ac66fda4d721388a612d7d8c981e091172a6ef0ae7f5ec461b32f834d024c031dd9c9da08de4ac46ed8bb69ca5f5f0eee0d764d8fdf5f9bdffb5790
-DIST packer-1.9.4.tar.gz 2301344 BLAKE2B 431b843076cc20127bdd0bc1acbb030cecc42ba9c3200a1c3b72c8e2ea4081e99a5c9f15d73397c67c176902f4ef1bbf4796efe32bdd1d8fe583a5996bb5f7ec SHA512 966de31fc7a174e5397e89b0c84979c13cf538971b2ea228f6fbf7dc54bed61d7cb21b58699175e93b9c81a9fc0c515e7cefffbd7b2865f2f6c36e4f78a81a95
 DIST packer-1.9.5-deps.tar.xz 373922748 BLAKE2B 793b0e5501bca56849a2471fbe2892c4775c3aa2d3ad6346e65f3d0cf1e3d86339a64371a35e4fddb0053082e98e2ec527b4f052b901bf8d35bd5db08a577ee4 SHA512 1f49b45841308dba95fcce2139d21931708e099102cc0870be00f2142cfb0d0e8ce9e2c729c9556ca68c1036e224f120fe0cd8833715a62cc212eead2448a6e3
 DIST packer-1.9.5.tar.gz 2302965 BLAKE2B dc0b8fedd83a477594c7235ffe6ca2052ba389e105bd451ad6c3987cea68c37f9c3153957012339f2a09045f20ac81ff6a59ed33834247408a3539643d9ecedf SHA512 7df1a85d0746e400c42f2b2a52b14ef5a806bcd2dc346eceaf5f8928b42a8b046ff8da7b45e5af0486bd444d8325e1cabdcd15f7b28711241a46034c9781a279
-EBUILD packer-1.8.6.ebuild 782 BLAKE2B 81c1510edf376fb2119db7e14bceac85c4046765acd0e2c8759473f7b6ead8118dc0a9001705cccbcb6ffce793d592f242625ca7cc72b19e371057ca5be0953c SHA512 2184baea8a3cb822477356c72079f14fee5ce3061e7e56e40c6a4cc3d87c3168e4f1b936fd394563e3380b1fc3e8dfb94e927059de6680464c331216d998445e
-EBUILD packer-1.9.4.ebuild 762 BLAKE2B 23f81351b95c960ccaf1548f8e26d888b6a672d0c120c424818b2b1a684b5595a8e5df8f8c0094e47dd9bbbd9f2379d4eec60ec4770671661e369bae05fe74a4 SHA512 5f00c8f619b94f383f4c1bec59025e3fe6e9533f796e2826f3ca5a1045340bbd6ce9a609e73a6317ef44a976160567b041db37bd926b3e4b4a1b33e053d28910
 EBUILD packer-1.9.5.ebuild 762 BLAKE2B c970a797ba9409c0403873b4378de49c195d03662a0b8af2b52d854b9f2010a262cb1247d57032780595add9372acd20c6fd4e947c2cac4688cdc8ba0feda099 SHA512 cf116262ea2fbed1d19d6d29da6130e153eee4d5fadb35fcd560566f71cbd92109792dd54fba0bc568f6f8b5ac587bebe116e41798fcaca11e4182004ae32c9b
 MISC metadata.xml 1408 BLAKE2B 04204c3ac4c45b58a23e611fbd34014423fd1839829101f7a30a188fc8b4588532f72b05c41a77f093170c6a6d9bd804c47bc831a8006ecbda5d3a30ccf6ade6 SHA512 2a45870ccadf85968c81c3129cfffa16184c3cc6ed135b716a84e545d9c80ed35064be231386b0bbfbe6fb7f9a12704c25d7fabc9383b3211d61720691c2ae9b
diff --git a/dev-util/packer/packer-1.8.6.ebuild b/dev-util/packer/packer-1.8.6.ebuild
deleted file mode 100644
index 5d2c7f38d9d4..000000000000
--- a/dev-util/packer/packer-1.8.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="A tool to create identical machine images for multiple platforms"
-HOMEPAGE="https://www.packer.io"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://gentoofiles.s3.eu-central-1.amazonaws.com/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD-2 BSD-4 MIT MPL-2.0 unicode"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-DOCS=( {README,CHANGELOG}.md )
-
-RESTRICT+=" test"
-
-src_compile() {
-	ego build \
-		-mod=readonly \
-		-ldflags "${go_ldflags}" \
-		-work -o "bin/${PN}" ./ || die
-}
-
-src_install() {
-	dobin bin/packer
-
-	einstalldocs
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/zsh-completion/_packer
-}
diff --git a/dev-util/packer/packer-1.9.4.ebuild b/dev-util/packer/packer-1.9.4.ebuild
deleted file mode 100644
index 20a7d1166c80..000000000000
--- a/dev-util/packer/packer-1.9.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="A tool to create identical machine images for multiple platforms"
-HOMEPAGE="https://www.packer.io"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://gentoo.neutroniak.com/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD-2 BSD-4 MIT MPL-2.0 unicode"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-DOCS=( {README,CHANGELOG}.md )
-
-RESTRICT+=" test"
-
-src_compile() {
-	ego build \
-		-mod=readonly \
-		-ldflags "${go_ldflags}" \
-		-work -o "bin/${PN}" ./ || die
-}
-
-src_install() {
-	dobin bin/packer
-
-	einstalldocs
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/zsh-completion/_packer
-}
diff --git a/dev-util/rpmdevtools/Manifest b/dev-util/rpmdevtools/Manifest
index e2626d551743..b9ce61c7b7d3 100644
--- a/dev-util/rpmdevtools/Manifest
+++ b/dev-util/rpmdevtools/Manifest
@@ -1,3 +1,5 @@
 DIST rpmdevtools-9.5.tar.xz 96724 BLAKE2B a406581be0286a6cb4b611289820f5a2db4306b731b0963881091e27b04b213c155243aeb95eadb41a27ab7a481bf1464d27d31fb52c6b10c3cedb23c1b22d21 SHA512 d2a110e7557eb149113560d64b3ec1ce75e5ee5ee541de3b4ed88f2bf11ef0248c864383bbffb49f8c32920563704da94004a8f9c099ce3610e6168aabfe440a
+DIST rpmdevtools-9.6.tar.xz 96956 BLAKE2B 8e6e6db9de7424cb2f6d79cbc8511d635c02167d0ef52d4d2b30fc8f2d0cdb9b8b238450d5c79e0edd4cab16205346f6fce93c4e26c8934345056c6ded94d742 SHA512 691fec8944029dbe60cb3eab0200d1201f5aa3dd11cd49e8313ee7c1fe998237217ea9c5ae7b4a70f61f3c998093f23d26266b23f41607ddca3148d5f6b6ae06
 EBUILD rpmdevtools-9.5.ebuild 897 BLAKE2B 5f669fbfaa782aff236347cf58054adb5bbcc7c9ce539972de1613e135223ade5941b43e4770b8ef4945e16b5db132242b8b0c951032b529dc181d4c9da0c6ff SHA512 5a78a4ac5ef995890d4f3bcafc9bbb7cefb8f4c60fcecd8e72eb20c67325d1e9af9b959dcf70525e6df944d6c00afd16ec606ebe2d5dde758f8b97ceb4d0603a
+EBUILD rpmdevtools-9.6.ebuild 881 BLAKE2B e6c2f288823affc748ba121cd92c7de2d94f8e5628fe56391cd2ab8c405c1fce320771b803cf1ec5db33f2a1f4f3159c8f7206374b54ccce1708e5aec240dc03 SHA512 49f376c2456f206fa3e00a7c587c730bc592ca92513bf78d0cb55a2508370aab1e5d7025a915753594f1daa60da81c53f18d16543a1f0da028eb4b2827d87416
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-util/rpmdevtools/rpmdevtools-9.6.ebuild b/dev-util/rpmdevtools/rpmdevtools-9.6.ebuild
new file mode 100644
index 000000000000..2b96823a8f91
--- /dev/null
+++ b/dev-util/rpmdevtools/rpmdevtools-9.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit python-single-r1
+
+DESCRIPTION="Collection of rpm packaging related utilities"
+HOMEPAGE="https://pagure.io/rpmdevtools"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="emacs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
+	dev-lang/perl:*
+	$(python_gen_cond_dep '
+		dev-python/progressbar2[${PYTHON_USEDEP}]
+		dev-python/requests_download[${PYTHON_USEDEP}]
+	')
+"
+RDEPEND="
+	${DEPEND}
+	net-misc/curl
+	emacs? ( app-emacs/rpm-spec-mode )
+"
+BDEPEND="sys-apps/help2man"
+
+src_prepare() {
+	default
+	python_fix_shebang rpmdev-{bumpspec,checksig,rmdevelrpms.py,sort,spectool,vercmp}
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index aeda17c7804c..5d91cae9c86c 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-filter-repo/Manifest b/dev-vcs/git-filter-repo/Manifest
index 446257d1ed08..2c162dd80ea0 100644
--- a/dev-vcs/git-filter-repo/Manifest
+++ b/dev-vcs/git-filter-repo/Manifest
@@ -1,3 +1,4 @@
+AUX git-filter-repo-2.38.0-new-git.patch 1373 BLAKE2B 4c078e9c4fea40054ff4f2c5f6282c2993c5de61c62c80e0fabeb1aaa3e639cad95eb2d8987a63dd6ce1efd0865427a04c22f77dfb6072796605b57aca93d394 SHA512 09d7979141bbe529c898b5e349016a2c810770992f800c064379567006e78f05de2665e6f1e99c3083a83630a313a9c0b5c528e3d628e91a637f88ccbcc1d973
 DIST git-filter-repo-2.38.0.tar.xz 153772 BLAKE2B 491269226c5db9fa57bb5e2038e2c8cb3e82577ff1ba8b34920857c2ec4275d4491e8e17f5bd34e63148ae0d6f7bb57ab3d1d36ffecd390579e0fdc773046d71 SHA512 786c27c1952a5e3625c924e71958cfd61d9065d32754a3e957f258767ccb5b147778c5d499eb82c7c1bf36a2f5a50b1cde372ebbc927aeeedbd713e5ab6563d8
-EBUILD git-filter-repo-2.38.0-r2.ebuild 1343 BLAKE2B af7186865e0eed2292234388a5b2a92453d1b92dbe245ef30eee0a8f7c46be6dc11823f061e725d77e69e03da3eaff9cc6259380b1ffa9146fa04665209d6c5f SHA512 b0d2aa30fd0dcb81bc9dad525c0a87ec858cc1d5d338afb83bf72f00d79af5662ae10c7ead429ef5f1adf2937835fa7ef6dbd6e9b5a7355824d976f8e424869c
+EBUILD git-filter-repo-2.38.0-r3.ebuild 1494 BLAKE2B 79203ea21bbdf780a7faa2543b3aec3dd22315c696449d1ac61c735ffcc4289d0b5ef4866fdee45d70f3870d673bcd92d98d56a3118d0d5fdcab06b7e8af8faf SHA512 01ebd5da5bdcd93d6735df2059db107b82a3ed95798833ba8c3c7322ea14202c11962f02efae36cc3916331400a0a0ff3e20b26f830116eb154792b851f8da8e
 MISC metadata.xml 332 BLAKE2B 768cfa834a427091d08c837a789a642a1542d9cfc0075426f43f6316e7a405841c2b858aec27d82b7201807d0aa2af759d2daf6a5b3ac86629bbf8a970d5f781 SHA512 9d4e308e7fb88017a68b0e2b6b612c39c805d10fa143824e7e9b7a881f5b7f132e0b77d0c51ffe57cca773cd4439ae31888ef90854ec0801f6d074d37b3a35ee
diff --git a/dev-vcs/git-filter-repo/files/git-filter-repo-2.38.0-new-git.patch b/dev-vcs/git-filter-repo/files/git-filter-repo-2.38.0-new-git.patch
new file mode 100644
index 000000000000..d54c6a7f8223
--- /dev/null
+++ b/dev-vcs/git-filter-repo/files/git-filter-repo-2.38.0-new-git.patch
@@ -0,0 +1,30 @@
+https://github.com/newren/git-filter-repo/issues/523
+https://github.com/newren/git-filter-repo/pull/526
+
+From 1db1650e6e14443a5a8163213434aec5e190f193 Mon Sep 17 00:00:00 2001
+From: Vladimir Petko <vladimir.petko@canonical.com>
+Date: Fri, 8 Dec 2023 15:05:34 +1300
+Subject: [PATCH] support git 2.43
+
+Git 2.43 changes --mark-tags to --[no-]mark-tags and --reencode to --[no-]reencode. Use both options for the detection check.
+
+Signed-off-by: Vladimir Petko <vladimir.petko@canonical.com>
+--- a/git-filter-repo
++++ b/git-filter-repo
+@@ -2067,13 +2067,13 @@ EXAMPLES
+     if b'--anonymize-map' not in output: # pragma: no cover
+       global date_format_permissive
+       date_format_permissive = False
+-    if b'--mark-tags' not in output: # pragma: no cover
++    if not any(x in output for x in [b'--mark-tags',b'--[no-]mark-tags']): # pragma: no cover
+       global write_marks
+       write_marks = False
+       if args.state_branch:
+         # We need a version of git-fast-export with --mark-tags
+         raise SystemExit(_("Error: need git >= 2.24.0"))
+-    if b'--reencode' not in output: # pragma: no cover
++    if not any(x in output for x in [b'--reencode',  b'--[no-]reencode']): # pragma: no cover
+       if args.preserve_commit_encoding:
+         # We need a version of git-fast-export with --reencode
+         raise SystemExit(_("Error: need git >= 2.23.0"))
+
diff --git a/dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r2.ebuild b/dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r3.ebuild
index c54f9866d9bd..fe82886559bc 100644
--- a/dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r2.ebuild
+++ b/dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1
 
 DESCRIPTION="Quickly rewrite git repository history (filter-branch replacement)"
@@ -27,6 +27,14 @@ BDEPEND="
 # requires a valid source of version info, this one is for distros
 export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 
+python_prepare_all() {
+	cd .. || die
+	eapply "${FILESDIR}"/git-filter-repo-2.38.0-new-git.patch
+	cd "${S}" || die
+
+	distutils-r1_python_prepare_all
+}
+
 python_test() {
 	cd .. || die
 	bash t/run_tests || die
diff --git a/dev-vcs/python-gitlab/Manifest b/dev-vcs/python-gitlab/Manifest
index b723e023f84b..a298df71c85c 100644
--- a/dev-vcs/python-gitlab/Manifest
+++ b/dev-vcs/python-gitlab/Manifest
@@ -1,3 +1,5 @@
 DIST python-gitlab-3.13.0.tar.gz 270646 BLAKE2B ff7e3c35525ac1bf1cb6dc6e668ca9c8aeefb12073636f115c8e078aa4b9f623f6d847d8487e85e9a325b6f0ad1ef93826631cb32fd86c0bd9023688aac5add9 SHA512 373347392d7030c817a8dcb4cceea71d0609f9e09dce348514c1ca024307094b1a72e287c871ce5fcba9b9d4cdfcc7dc6b4495e2b225b845a3dff2e2dfc4fe82
+DIST python-gitlab-4.6.0.tar.gz 470253 BLAKE2B 25859017478c9c1896088bd706da1980f5c90dff075fa8a9373933852e1a83daf543f7a48acce4619da7077cdfaf64b0cc9f868cd99ee4d8868294f3328d0d13 SHA512 1d0178dd4d0456b25d5d6ecbcb39137cbc273bf4ac1863b696d39fcdb50c927b606b18ea3b21ce66e92102979584bc3922e65577e0d0c72ae937e984ec21cbc3
 EBUILD python-gitlab-3.13.0.ebuild 996 BLAKE2B 606d0da9842aae4538739b8920363111d95c9b25424615669193207640cc999da854e2c1a882eadba9369e1317e0fc0e6fee40d8ff605874a0da88aaf45b8c7c SHA512 b6b4a746e2ceb29b995eca5adad37885c81b88c0beb8dc605e819215fd58c3574afe4aebc4549bce56b2a93331a2594e0052122f2b7c4a756fc7a7d5ac92a37e
+EBUILD python-gitlab-4.6.0.ebuild 1086 BLAKE2B 66e3974c3f31453fa6bb562442f4dc6f4eaaa4195b15a74e5d48ef4d31aebb87ea47d8c2e8d2340e10769e087dbc40d4fb8d6c2cb27a96b8ce477533aae439a6 SHA512 a7abe19049706087d62c345ae80a6993cc6fb8cef4114257e0befd0225f1c7a1e46f0fa1fb6dc5f69b1f332ecb85c8ddfee29c321853b77eafec77f7d10ca4d2
 MISC metadata.xml 467 BLAKE2B fe85595edfdf791a5ae099188cdcffbbb80802f62a7ce0f95576f2b217e91e3b835fdf4989a196678c91e66108bc969108fadc1b04ba026273c8bb71dfe52d6b SHA512 8e3332d042520e9ae097575c6b25ca3f1b9b706676fc79f54bfa639be6baabb060e2e0da290008f6ea4cf592e4b538a068abb593f7019b87d4b9aedeedc446eb
diff --git a/dev-vcs/python-gitlab/python-gitlab-4.6.0.ebuild b/dev-vcs/python-gitlab/python-gitlab-4.6.0.ebuild
new file mode 100644
index 000000000000..4da36920b512
--- /dev/null
+++ b/dev-vcs/python-gitlab/python-gitlab-4.6.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+MY_PN="${PN/-/_}"
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1
+
+DESCRIPTION="Python command line interface to gitlab API"
+HOMEPAGE="https://github.com/python-gitlab/python-gitlab/"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/python-gitlab/python-gitlab"
+	inherit git-r3
+else
+	inherit pypi
+	SRC_URI="$(pypi_sdist_url) -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+LICENSE="LGPL-3"
+SLOT="0"
+
+BDEPEND="test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		>=dev-python/pytest-console-scripts-1.3.1[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-5.2[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND=">=dev-python/requests-2.32.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-1.0.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc -r *.rst docs
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 282c1e2ea934..338fa70ca4db 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass
index 4fc838c478af..4966c52adc4c 100644
--- a/eclass/qt6-build.eclass
+++ b/eclass/qt6-build.eclass
@@ -122,7 +122,7 @@ qt6-build_src_prepare() {
 	fi
 
 	_qt6-build_prepare_env
-	_qt6-build_match_cpu_flags
+	_qt6-build_sanitize_cpu_flags
 
 	# LTO cause test failures in several components (e.g. qtcharts,
 	# multimedia, scxml, wayland, webchannel, ...).
@@ -235,34 +235,6 @@ _qt6-build_create_user_facing_links() {
 	done < "${BUILD_DIR}"/user_facing_tool_links.txt || die
 }
 
-# @FUNCTION: _qt6-build_match_cpu_flags
-# @INTERNAL
-# @DESCRIPTION:
-# Try to adjust -m* cpu CXXFLAGS so that they match a configuration
-# accepted by Qt's headers, see bug #908420.
-_qt6-build_match_cpu_flags() {
-	use amd64 || use x86 || return 0
-
-	local flags=() intrin intrins
-	while IFS=' ' read -ra intrins; do
-		[[ ${intrins[*]} == *=[^_]* && ${intrins[*]} == *=_* ]] &&
-			for intrin in "${intrins[@]%=*}"; do
-				[[ ${intrin} ]] && flags+=( -mno-${intrin} )
-			done
-	done < <(
-		$(tc-getCXX) -E -P ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 2
-			avx2=__AVX2__ =__BMI__ =__BMI2__ =__F16C__ =__FMA__ =__LZCNT__ =__POPCNT__
-			avx512f=__AVX512F__ avx512bw=__AVX512BW__ avx512cd=__AVX512CD__ avx512dq=__AVX512DQ__ avx512vl=__AVX512VL__
-		EOF
-		assert
-	)
-
-	if (( ${#flags[@]} )); then
-		einfo "Adjusting CXXFLAGS for https://bugs.gentoo.org/908420 with: ${flags[*]}"
-		append-cxxflags "${flags[@]}"
-	fi
-}
-
 # @FUNCTION: _qt6-build_prepare_env
 # @INTERNAL
 # @DESCRIPTION:
@@ -289,6 +261,63 @@ _qt6-build_prepare_env() {
 	readonly QT6_TRANSLATIONDIR=${QT6_DATADIR}/translations
 }
 
+# @FUNCTION: _qt6-build_sanitize_cpu_flags
+# @INTERNAL
+# @DESCRIPTION:
+# Qt hardly support use of -mno-* or -march=native for unusual CPUs
+# (or VMs) that support incomplete x86-64 feature levels, and attempts
+# to allow this anyway has worked poorly.  This instead tries to detect
+# unusual configurations and fallbacks to generic -march=x86-64* if so
+# (bug #898644,#908420,#913400,#933374).
+_qt6-build_sanitize_cpu_flags() {
+	# less of an issue with non-amd64, will revisit only if needed
+	use amd64 || return 0
+
+	local cpuflags=(
+		# list of checked cpu features by qtbase in configure.cmake
+		aes avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
+		f16c rdrnd rdseed sha sse2 sse3 sse4_1 sse4_2 ssse3 vaes
+
+		# extras checked by qtbase's qsimd_p.h
+		bmi bmi2 f16c fma lzcnt popcnt
+	)
+
+	# check if any known problematic -mno-* C(XX)FLAGS
+	if ! is-flagq "@($(IFS='|'; echo "${cpuflags[*]/#/-mno-}"))"; then
+		# check if qsimd_p.h (search for "enable all") will accept -march
+		: "$($(tc-getCXX) -E -P ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
+				#if (defined(__AVX2__) && (__BMI__ + __BMI2__ + __F16C__ + __FMA__ + __LZCNT__ + __POPCNT__) != 6) || \
+					(defined(__AVX512F__) && (__AVX512BW__ + __AVX512CD__ + __AVX512DQ__ + __AVX512VL__) != 4)
+				bad
+				#endif
+			EOF
+			assert
+		)"
+		[[ ${_} == bad ]] || return 0 # *should* be fine as-is
+	fi
+
+	# determine highest(known) usable x86-64 feature level
+	local march=$(
+		$(tc-getCXX) -E -P ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
+			default
+			#if (__CRC32__ + __LAHF_SAHF__ + __POPCNT__ + __SSE3__ + __SSE4_1__ + __SSE4_2__ + __SSSE3__) == 7
+			x86-64-v2
+			#  if (__AVX__ + __AVX2__ + __BMI__ + __BMI2__ + __F16C__ + __FMA__ + __LZCNT__ + __MOVBE__ + __XSAVE__) == 9
+			x86-64-v3
+			#    if (__AVX512BW__ + __AVX512CD__ + __AVX512DQ__ + __AVX512F__ + __AVX512VL__ + __EVEX256__ + __EVEX512__) == 7
+			x86-64-v4
+			#    endif
+			#  endif
+			#endif
+		EOF
+		assert
+	)
+
+	filter-flags '-march=*' "${cpuflags[@]/#/-m}" "${cpuflags[@]/#/-mno-}"
+	[[ ${march} == x86-64* ]] && append-flags $(test-flags-CXX -march=${march})
+	einfo "C(XX)FLAGS were adjusted due to Qt limitations: ${CXXFLAGS}"
+}
+
 fi
 
 EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_test src_install
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 91e17d8b9bb7..91dff6076544 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index feb46c5133f5..b8e2e9d359d9 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,6 +1,7 @@
+AUX dolphin-5.0_p20220520-gcc-14.patch 985 BLAKE2B ce23b524350d24bc782a6dc6e247015f451c18a1dd51271b89ba20acd4d44a89f6c09850693fcc7bb625314312f47bfdc692bcda53c6ea8889cdca49d53c1ca1 SHA512 72fa9cd0a919b0d38104d7fc050b11ec63c6caac0424477e57b810240bd0a601ec4884fc71c0d52ab302bb198ae202fd7d6fabe94741efc75e53409979300b88
 AUX dolphin-5.0_p20220520-libfmt-9.0.0-fix-build.patch 1473 BLAKE2B ce7d9aaf62fc71262600d72442251241353c6280c84d1d08d2986a99330ae22b786983ba3b99484983adf7e7367c094d3f5a7ce1184e94686516c093d3c9957a SHA512 7bbd120fecf9ad18a2fb242d3568da4c013081dbe39045007e82f4ed56a52800d2afeca7263abf785ff023432f0d60cb36b629fb41555b7b39ef56b12fa16aa6
 DIST dolphin-5.0_p20220520.tar.gz 34880474 BLAKE2B 925cddfe8a5d6febced5721bea6ced7c8d2855619f74ca8940b95dc78ea523b4a1083b9ef6efe3561d833b8e9ecb742cb2adf5a1864c06b629b3ecd9e92cc871 SHA512 4993cb10061b142f6627c96493885a5f9d88857d8949c2e8e8d5df5ba6e19b4f98d199da5e641d3d61294884e1cbbe8191bc5b4445c60bf80723046b2524aad5
 DIST mgba-40d4c430fc36caeb7ea32fd39624947ed487d2f2.tar.gz 12921593 BLAKE2B 8c5cf7b9b53f897f6248ad6bc51efafaa8a9d5df137d42d30f4b042b6d1527049644595938626c8cae1385d329bc45bf42db8dcc4424b963a3899e0df53246eb SHA512 26d7b60cbc7415652bb9ca2a42ccd532856867db57bf6dd91d8204551970109b6b9f4a96c42d643ea96b9d071d6aec924d3c1bb79c251c95183b7fb8536456c9
-EBUILD dolphin-5.0_p20220520-r2.ebuild 4890 BLAKE2B 43bbd867b9a1dc69c05a5c3c0fec53737e8dea3b4b6400c4f0fa2dacc1164628329e4041be740faf74171104d6d0f97cf2298841cd251313341e9f89dd2b608f SHA512 ec5c8351fed047565364d7002191dbc03e2123b6ef257be54b0beda73a7d5db659099418392dcc130d0e834ee65268469ddb60aca9a0250537d965b9f28fc67b
+EBUILD dolphin-5.0_p20220520-r2.ebuild 4979 BLAKE2B 30956f88e4adb8674e641afcb4efd7bd6e6aa2fe7615cabe842d56a12b00fa0a1207b600e493de8a68301ad7a8316076b8c647ac1a026f1271d48b2a6bc8ae45 SHA512 d0247e9612c82bdc7222e1183dcc431d1f905802a22a516465cfa8b72d4163f06690a2a1939a6d97055f725a8744f533ff3bff21904c1210e95366ffac530f55
 EBUILD dolphin-9999.ebuild 4829 BLAKE2B a2419c154b9416db0a3dcecbf96440cbbe89ee52eb18834d6fac6c3e3e1d4b3b9e0a3e62ce7b95381f5faea2660b98b596bcf37409a6874da9beb56f012c1ed0 SHA512 0e350f7afb671b1e33afef83410f376abc671847af16b084f12f7aa331679d6b0adb2df53a07b3ebce531a5c1ef6444bb8ab3fe01bbe0150c3415acc2d1ae8f1
 MISC metadata.xml 938 BLAKE2B 07b08890471080d41dd0bbc37bc94e5c9b7d98f2c0cea33c592dea3ccc331f9e6d8ef99cff08350f382c8298111e2d8f811f703562a045cbe853cf12c482ea04 SHA512 91239b346061f8f474880e13c6d3e877a63637d7e56d4c31106e6a17583e0a30db29eec8fe6a711fb033efcec39a7262037e0f7f867459398841b8339d3f6bef
diff --git a/games-emulation/dolphin/dolphin-5.0_p20220520-r2.ebuild b/games-emulation/dolphin/dolphin-5.0_p20220520-r2.ebuild
index c1f43ed2cbd5..eb77bc5735c5 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20220520-r2.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20220520-r2.ebuild
@@ -35,7 +35,11 @@ IUSE="
 	profile pulseaudio systemd upnp vulkan
 "
 
-PATCHES=("${FILESDIR}/${P}-libfmt-9.0.0-fix-build.patch")
+PATCHES=(
+	"${FILESDIR}/${P}-libfmt-9.0.0-fix-build.patch"
+	# https://github.com/dolphin-emu/dolphin/pull/12575
+	"${FILESDIR}/${P}-gcc-14.patch"
+)
 
 RDEPEND="
 	app-arch/bzip2:=
diff --git a/games-emulation/dolphin/files/dolphin-5.0_p20220520-gcc-14.patch b/games-emulation/dolphin/files/dolphin-5.0_p20220520-gcc-14.patch
new file mode 100644
index 000000000000..44ffb50ae257
--- /dev/null
+++ b/games-emulation/dolphin/files/dolphin-5.0_p20220520-gcc-14.patch
@@ -0,0 +1,30 @@
+From 3da2e15e6b95f02f66df461e87c8b896e450fdab Mon Sep 17 00:00:00 2001
+From: Peter Lafreniere <peter@n8pjl.ca>
+Date: Sun, 11 Feb 2024 20:55:31 -0500
+Subject: [PATCH] IOFile: avoid clearing errors on null file struct
+
+When performing a default compilation with recent GCC & glibc,
+the use of -Werror=nonnull causes a build error.
+
+The error is given as IOFile::ClearError() can call std::clearerr()
+with a null file, which can trigger a null-pointer dereference in libc.
+
+Change the std::clearerr() call to be conditional on a file being open.
+---
+ Source/Core/Common/IOFile.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Source/Core/Common/IOFile.h b/Source/Core/Common/IOFile.h
+index 4b12c3188853..b5895333b1be 100644
+--- a/Source/Core/Common/IOFile.h
++++ b/Source/Core/Common/IOFile.h
+@@ -116,7 +116,8 @@ class IOFile
+   void ClearError()
+   {
+     m_good = true;
+-    std::clearerr(m_file);
++    if (IsOpen())
++      std::clearerr(m_file);
+   }
+ 
+ private:
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index e12ba5ff3355..a61fbfe247ea 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index f56d9c40a134..02dcd7d018f3 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -5,5 +5,5 @@ AUX polkit-cinnamon-authentication-agent-1.desktop 252 BLAKE2B 8a7c10fa19e19c479
 DIST cinnamon-5.8.4.tar.gz 2517117 BLAKE2B 4c3f452480b9e3ce7713221f1b76c475204b8dc1bb34d42a8faf492b0ca86416bb2fbd3849a7f048fef672ecf4613f06c645ec548159b6c3662b7602142e75e6 SHA512 2eaa253cdd01f00cca05ed123db59fde27f84cc24d7b8a3ec751a5f8252642870cbece941d1101f31fe0db43c15d9779bbdcacbf7037757569a4d17205cb10ad
 DIST cinnamon-6.0.4.tar.gz 2538844 BLAKE2B de67c2e465d04dd4ed269172b4b58cfe0391446466e32e15410b5a847248566c075823d0a2fb87d7a693033b3e4e1fc21a18c7b9f45dca89ce8968a0be71eaba SHA512 357dd44f40b195a4a3ca3e88c5c9e55f1c06d36b4cec812a001c54ffb784b0d67bb9f41c1ae74fec590184b3480c9cd21ae54f7ee01e31f80eab0297b0d18a9c
 EBUILD cinnamon-5.8.4.ebuild 5427 BLAKE2B a4ba890d9f120f4afd0e6b8462566c8031829bff8582a723f2db31004c30a2c25213155e9b84edf6a6539f683ef87186fbca98a11bad7be83598751287b743fe SHA512 ebbd44078954d159000edf275794a5b657f92dbf6e7120b754d6ce0f843735660830eb2d9af78ad5959d1c6c4b8e5b125dbac889e9180d8e60fba535fe273b51
-EBUILD cinnamon-6.0.4.ebuild 5947 BLAKE2B d56e4da1055e9af5cf0ebb6b7e9de58d255333e288b77892b761f1cb591dd5d56d2328549ca2454413b9e630d9def05f5e8d9157b89376b6b55e446aa0613f1d SHA512 a8bf69e3d02379ab3d6a9a4e795319e1081e84801177b6229778572ad852a4d515bb94badcd7a76ab44d2359b5f09a835db9f8979cf07ad4f857449b54937a97
+EBUILD cinnamon-6.0.4.ebuild 5946 BLAKE2B 0fcbf690654ce90d69cb21689a42ead2a7248447973221b76950f86ea0155c426ff31de542b888cb2a92e3e09fa1d22a46e80e75471017f396a5556e973bb267 SHA512 c1758bf0b9a70651d87f139d343fefb69bc50f7da800784b508522970de45e95b23e6a8e06ceb0382b60eef89ab449de8ad657c1ab52b77d8c2bbf2055d83e77
 MISC metadata.xml 622 BLAKE2B 10b394cc9a24ba5609b2184c8d31439ae3e172055dba8d283c7bdf834ac715053c3533db0bce7f27d55b69a4891622b9cc21dcacdc0b797146e4144fc87d6b2e SHA512 f079066f4181bc467259651de9c83cedc0bbc4f0e817dac5ce081248001c23d4374ea393482400ffefae7edbb03fd61da87f114d6f4f65145200e156d0e9cc46
diff --git a/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild b/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild
index 1c2639ba7d27..d5b2f85cc1ff 100644
--- a/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild
@@ -16,7 +16,7 @@ LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.
 SLOT="0"
 IUSE="+desktop-portal +eds +gstreamer gtk-doc +nls +networkmanager wayland"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv ~x86"
 
 DEPEND="
 	${PYTHON_DEPS}
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index db95af8f46fd..6bab416890da 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/waypipe/Manifest b/gui-apps/waypipe/Manifest
index aec912b1d866..e69ba8001e49 100644
--- a/gui-apps/waypipe/Manifest
+++ b/gui-apps/waypipe/Manifest
@@ -1,6 +1,4 @@
-DIST waypipe-v0.8.6.tar.bz2 189836 BLAKE2B 4023ddb325982d5cb189bafb9c4bf87f1ccd692c423371b05d273ab2d8ceeeacace256400e5755e89670407746f25ff4499643d3fb722053e5958547ac15600f SHA512 d02afa15e363009820e7e7ad75e8f294a58b42ec74f8a2cd310fc3c65a252b71524a89fb95e3e105cec8d6802fb30470c6842ae69d7c16d687edde96d4ff1263
 DIST waypipe-v0.9.0.tar.bz2 193493 BLAKE2B 891b1015951459faf15c181c35499558458fd69c63695f4b6be67e686c8ba7806f0193ed0fc4500b370345b570536b6fdbb3c01f2fe861e87e00b1d4db7c05d7 SHA512 c37b630f4659ccc52d2a85a749971d552d5d535fc33e30aea1c2d22b057aaf3cf2756d6347cc89e3068ce59a14e871e7ffae9016608803549d0e7b1b6a0bd1cf
-EBUILD waypipe-0.8.6.ebuild 1827 BLAKE2B 5cb4d5c09ed803bc0120322ed1bfad851e0eeb8fa6fb48e52dd85cc3c66ba91318dcc6b792c007f8fa40ea6d064df0832c23fe0a97f3e0bdb285c174eb88464f SHA512 0d44697c6d13d0005fcc78f427372de2d2f367931de2e8c8a70d48bdf99cfad53f49f7219b2667c82ade5fbdf015690722d84e2e1bd0be75f68ba92cf52afa2d
 EBUILD waypipe-0.9.0.ebuild 1824 BLAKE2B 8685fe74be51b1e10e68709e43ed99ac40ed4328e878e2c1a55e51ebf224a14640482ccae3f7a4e89a9b69b9478428994a3b97b0dfe485eae5555b45323174d4 SHA512 21b145e4c3564f98d449a54d77d293697fbe1164a016defd36787ea227bed17e5b9f6c59edbd360b30a33cd94ded00301ab83fdbbdb8b3885d8a71487ded1bff
-EBUILD waypipe-9999.ebuild 1827 BLAKE2B 5cb4d5c09ed803bc0120322ed1bfad851e0eeb8fa6fb48e52dd85cc3c66ba91318dcc6b792c007f8fa40ea6d064df0832c23fe0a97f3e0bdb285c174eb88464f SHA512 0d44697c6d13d0005fcc78f427372de2d2f367931de2e8c8a70d48bdf99cfad53f49f7219b2667c82ade5fbdf015690722d84e2e1bd0be75f68ba92cf52afa2d
+EBUILD waypipe-9999.ebuild 1827 BLAKE2B 457c988b7f87cd6f8a2b99fb134668dabb279644e97601ed60ceb4a438ce62137e8e811634d92f638719b0c46ed757670b4ae4f7efbaaa371df1a5c13eca0f7f SHA512 400f494cb596bdfd279f67dec4506f5bf88d52813c4b0356a742ea98fd6166c00e6e3086ab5074676bd8a60db07528b50e9e494f742b445503c6d3b5ae4faf76
 MISC metadata.xml 790 BLAKE2B 8928c96854495a9bd18ee980c4ab1a3d5d93e06b3ed5f11a1fa90b719f24391fbfbb99cafddaf6fa75ff4b59a0aa72f92cf1db48d9f3d62df8f0603e628e6aac SHA512 eab5538af33b220a5f7896c80d42429677da4cb39426ddbaa18594a39fd23aa1fd00e500f7599c3956105ab47380cee75e1aa42b413f540a5425d6563d9f1c07
diff --git a/gui-apps/waypipe/waypipe-0.8.6.ebuild b/gui-apps/waypipe/waypipe-0.8.6.ebuild
deleted file mode 100644
index 973c438e2f8b..000000000000
--- a/gui-apps/waypipe/waypipe-0.8.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit meson python-any-r1
-
-DESCRIPTION="Transparent network proxy for Wayland compositors"
-HOMEPAGE="https://gitlab.freedesktop.org/mstoeckl/waypipe"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mstoeckl/waypipe"
-else
-	SRC_URI="https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
-	S="${WORKDIR}"/${PN}-v${PV}
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-WAYPIPE_FLAG_MAP_X86=( avx2:with_avx2 avx512f:with_avx512f sse3:with_sse3 )
-WAYPIPE_FLAG_MAP_ARM=( neon:with_neon_opts )
-WAYPIPE_FLAG_MAP=(
-	"${WAYPIPE_FLAG_MAP_X86[@]/#/cpu_flags_x86_}"
-	"${WAYPIPE_FLAG_MAP_ARM[@]/#/cpu_flags_arm_}"
-)
-
-IUSE="dmabuf ffmpeg lz4 systemtap test vaapi zstd ${WAYPIPE_FLAG_MAP[@]%:*}"
-REQUIRED_USE="vaapi? ( ffmpeg )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dmabuf? (
-		media-libs/mesa[gbm(+),vaapi?,wayland]
-		x11-libs/libdrm
-	)
-	lz4? ( app-arch/lz4 )
-	systemtap? ( dev-debug/systemtap )
-	vaapi? ( media-libs/libva[drm(+),wayland] )
-	ffmpeg? (
-		media-video/ffmpeg[x264,vaapi?]
-	)
-	zstd? ( app-arch/zstd )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	app-text/scdoc
-	virtual/pkgconfig
-	test? ( dev-libs/weston[examples,headless,remoting,screen-sharing,wayland-compositor] )
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dman-pages=enabled
-		$(meson_use systemtap with_systemtap)
-		$(meson_feature dmabuf with_dmabuf)
-		$(meson_feature ffmpeg with_video)
-		$(meson_feature lz4 with_lz4)
-		$(meson_feature vaapi with_vaapi)
-		$(meson_feature zstd with_zstd)
-	)
-	local fl
-	for fl in "${WAYPIPE_FLAG_MAP[@]}"; do
-		emesonargs+=( $(meson_use "${fl%:*}" "${fl#*:}") )
-	done
-	meson_src_configure
-}
diff --git a/gui-apps/waypipe/waypipe-9999.ebuild b/gui-apps/waypipe/waypipe-9999.ebuild
index 973c438e2f8b..844cedd732dc 100644
--- a/gui-apps/waypipe/waypipe-9999.ebuild
+++ b/gui-apps/waypipe/waypipe-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit meson python-any-r1
 
 DESCRIPTION="Transparent network proxy for Wayland compositors"
diff --git a/gui-apps/wmenu/Manifest b/gui-apps/wmenu/Manifest
index 7b35bdd9db5f..ea4d802c3641 100644
--- a/gui-apps/wmenu/Manifest
+++ b/gui-apps/wmenu/Manifest
@@ -1,5 +1,5 @@
 DIST wmenu-0.1.7.tar.gz 19052 BLAKE2B 7aa1ccc5a8f4ea4fd0252ce6fe31168fb8346558093df0a72d29023fa2e8c38cec9562f1d4bb733abc3b00ba4bf952dc29ef22dba373db01a05229b420791a7f SHA512 2e949bc1b14e74b65aafa523a01acda3cb7b546dbd0fb4d6561ae0fbae9a017eaf15962e6231b9cd81df22f870477725c2279c2cb1f3d99ac802701b788a306e
 DIST wmenu-0.1.8.tar.gz 20353 BLAKE2B 3d08de95d9a85d2f8d28ccf2a0cd9fda4db93e9ff2cfa4198c40d6f0963020036a91c1e825dcf32ed3c7099f7d250653a55f50aca701acf835f42d527345c4af SHA512 de57f92e80cd4ab02e18e91df7cc4c923464224656f4f90adaf4f7788e2884ead6fb21dba1527681e63c64b5720d3c936abaa46259fcd8d7146d73feaa6bab93
 EBUILD wmenu-0.1.7.ebuild 601 BLAKE2B f494703de05ff5bcb15c4ae6fb9db17b7da291f8deefc51da4752a52f549d2c8a70b205def4fb760d29a2ab5af9d01e710d08dac797b44b5acad87e397ab86bd SHA512 196a2086df7fd8735078611fc70cf5d02339f0a459ac991397f2cafbcf3214f02f5989f33a45c2c984c765d4d33be7c8574a81e2158182a02731f1e14fc859e5
-EBUILD wmenu-0.1.8.ebuild 601 BLAKE2B f494703de05ff5bcb15c4ae6fb9db17b7da291f8deefc51da4752a52f549d2c8a70b205def4fb760d29a2ab5af9d01e710d08dac797b44b5acad87e397ab86bd SHA512 196a2086df7fd8735078611fc70cf5d02339f0a459ac991397f2cafbcf3214f02f5989f33a45c2c984c765d4d33be7c8574a81e2158182a02731f1e14fc859e5
+EBUILD wmenu-0.1.8.ebuild 600 BLAKE2B e9b1a4c7cd56cae823c175f6a324bcf4606b780655847252957fc10cf4a05e95afc132f26f47dc9228fc037f6c7f2b3ba4dd31c01f0f918fb330cc50f371ed5f SHA512 d7a8d17ea288e013cf73ac2387bc199fe1e59c0f6a5f1bcba27e144a2e0207024222db46df048be155ab26e6f986514e5390635b4ab9fb2852c0a42105de86b3
 MISC metadata.xml 491 BLAKE2B 9792de3322622a9942634b437df771ba37c51d44373a76a286a8d78862129d1f4344a4efc64f64edec181ceefd8a31814da0c0623f8abdec63db3a93acc95d8b SHA512 65f4415602b32e69397ae5b2080b2780f79271ca1bea8b9ff98d84a3b0f2da15c6966c46805e18669d01a14594fcaa033602f2dd888db729f4a0f36cb9df07d1
diff --git a/gui-apps/wmenu/wmenu-0.1.8.ebuild b/gui-apps/wmenu/wmenu-0.1.8.ebuild
index 0bc6efb65db1..086cf143faae 100644
--- a/gui-apps/wmenu/wmenu-0.1.8.ebuild
+++ b/gui-apps/wmenu/wmenu-0.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.sr.ht/~adnano/wmenu/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 BDEPEND="
 	app-text/scdoc
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 7e51428f28ec..4698b5d8ec2f 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/gamescope/Manifest b/gui-wm/gamescope/Manifest
index be404b5942a6..3ec8f993696c 100644
--- a/gui-wm/gamescope/Manifest
+++ b/gui-wm/gamescope/Manifest
@@ -1,6 +1,6 @@
 AUX gamescope-deprecated-stb.patch 634 BLAKE2B 33bd10dc41f9fdbbec12ea0bdec1cf8af8fc9bc499324f5f2f329c72273109fd82495a0f3d3ffb2954ee91eb106f7e36479716af6e8d2cfd76ef58c9074003d3 SHA512 56aceec2552868749a21c9ca06ac6b41da3bd901692b376e5691155c58861f941dbd5359f1e22bbe54fd14e061cd586fe06d0109a8a45a0ecf6049ea3a79663b
-DIST gamescope-3.14.14.tar.gz 512146 BLAKE2B 908c8e02a55c454d4442c135769b59287568121c60e4e7a95266e09b42cdd78db5676dd691d0c58a2430d046de93947d2ef8b54ed93ea6820240ab7a21599ac4 SHA512 dfafa32ac736c50bf146bffbbe8288827047ae87a6f0d55038f5bd6705096133f384d940dfa5adf2bdd70991bd6469f4a083eb88273df447d253676cb3f2726c
+DIST gamescope-3.14.18.tar.gz 520343 BLAKE2B 098dc152980c62a7386528378a5c0ad48923324dead15a2ed4be77d34a711065388c96edf8c9707ff13e595b82ca5f5463b489a9b521960f9be3eb744948cc6f SHA512 9b6774665b29fd84884ec057f66218e1e1810bc099d6a2e100a814fbc6250f8de9857b53e75400044b3cd77a958d6f03fcf9b8e65cb4a42e769ad0f9cda7394b
 DIST reshade-9fdbea6892f9959fdc18095d035976c574b268b7.tar.gz 1543894 BLAKE2B 5e2b643ffbbda3ad078deb075a6fada1d0a560c6d865b7febee6a8eaade83ec90db3c5a8f4130d27b6dfaa8ee7b899edd214c23c947678eed28fb8e7165d9bd2 SHA512 4565d094e1c2d53d5073b4976874665d38dcf7ca86e982e569cc76923eaa9187fa32a4385fc577a3a867d2917596e6377e5a023a34bc2d389ff899d5b69764fb
 DIST wlroots-a5c9826e6d7d8b504b07d1c02425e6f62b020791.tar.gz 620424 BLAKE2B 83630b77983009a36fa4f168bbe2eceb73f634f9dd149cc5e6b18fbf647245a32a5d31dc3fbd0d1bed1d0dafc4cbb2fcea3ee4b4f5660a35ca37eff4679b80a2 SHA512 6857ded750fda91d55e53edfc270eb4e7bf44d7330d17c8fcd13c248c71abba685f34260d1e6d20cdb302a8d4f9158fb43421943cca74630fd780a4048aed07b
-EBUILD gamescope-3.14.14.ebuild 3608 BLAKE2B e304f67f0f6c9f168dea8cf8d8dad679c46362ec5c60b48dcdf0cdfedf4d385048f09efe8b5e21f4ce4a97759d4dc8fb680745f56106faa64b4b5bdc5a5ef4c4 SHA512 9f2d53abffd25a92ab85bce7615352e363a72632045d69b659bf7111148dd6185af643a5d79f052183a8a83289acdd180353074b982bbb73bc75be4e9b757d6d
+EBUILD gamescope-3.14.18.ebuild 3638 BLAKE2B 0500cec60dc29770555353befd34f5b19d5094eb91e7088c823c9c391348ab64dc6bdd967769b86bf72191851f37c1dc55cd204fa042d14b2ce1d5be4d72971a SHA512 8a66c21f1db16abb0030d44e516ad959301ca24e55bfe21c3b86f6c440876a5e2dc96b8048ab91cc7b8275d972b29856ff1823a9015c4b1e38a6effa01312838
 MISC metadata.xml 489 BLAKE2B 6930da0ca2827741a902e064b3bca71266ac5c2e61d7cf6d566c37e971efd04b2fcd2381659e1d5babe6fd05dd4d06979c0d82b3ac5e2702bb5d3311ef30df79 SHA512 419f4a3f3dc7a940d0f157323b9afd116b4a4d2efc718eb5979d84677b770a606c532d0777dbed1b6598afa393894e5dc9982dbaf7e31c90a9e0b433938d4e55
diff --git a/gui-wm/gamescope/gamescope-3.14.14.ebuild b/gui-wm/gamescope/gamescope-3.14.18.ebuild
index dd27cbde375a..069182a94bc9 100644
--- a/gui-wm/gamescope/gamescope-3.14.14.ebuild
+++ b/gui-wm/gamescope/gamescope-3.14.18.ebuild
@@ -37,7 +37,6 @@ IUSE="pipewire +wsi-layer"
 # =gui-libs/wlroots-0.18*[X,libinput(+)]
 
 RDEPEND="
-	=dev-libs/libliftoff-0.4*
 	>=dev-libs/wayland-1.21
 	gui-libs/libdecor
 	>=media-libs/libavif-1.0.0:=
@@ -75,6 +74,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	=dev-libs/libliftoff-0.5*
 	>=dev-libs/wayland-protocols-1.34
 	>=dev-libs/stb-20240201-r1
 	dev-util/vulkan-headers
@@ -82,6 +82,9 @@ DEPEND="
 	dev-util/spirv-headers
 	wsi-layer? ( >=media-libs/vkroots-0_p20240430 )
 "
+RDEPEND+="
+	dev-libs/libliftoff
+"
 BDEPEND="
 	dev-util/glslang
 	dev-util/wayland-scanner
@@ -130,7 +133,7 @@ src_configure() {
 		-Dwlroots:examples=false
 		-Dwlroots:renderers=gles2,vulkan
 		-Dwlroots:xwayland=enabled
-		-Dwlroots:backends=drm,libinput
+		-Dwlroots:backends=libinput
 		-Dwlroots:session=enabled
 	)
 	meson_src_configure
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 3ae902bc1fb5..34f9fd2ae857 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index b375f186fb15..aecb15c45f23 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -3,7 +3,8 @@ AUX 3.4.1-spamd.init-r3 1180 BLAKE2B c7290e6016b27247610b050f77368fcbf3dd3f4ab0a
 AUX 3.4.6-configure-clang16.patch 1452 BLAKE2B 72c9cf2b411e54c955c9bfbe10b234e43ba5969d4daef21d3a1aeb95ee32fe337c47cc91375dcca9922f65d0f09ab3eaeeb7b3113002f6036b9f1c260fe0d196 SHA512 0ec2a51263d5211cfca405bcff10a589bd616d1c652f5b07e669d34c3a7c22eff6921836161fa174884d324a6964c89036b0bf1a9d86bd130fcbadec70dac989
 AUX 4.0.0-DnsResolver-udpsize.patch 685 BLAKE2B cea6e3b795bf1a43d975fe33a6b90e03355c1807d79f62b9e25254a88c297190313d0d5ea307f61d4b1e909f22a661389aa9a8a898a6dde8a9f75fd3a15130fc SHA512 a3194f268534984643bd1870de81eb0eba8df07fee5e0cd79954edd3b54e646bb985cd0d141bd272e8c3035348d0d4c8b5b896ac2ead07edd465175bb26b5bdc
 AUX 4.0.0-sa-update-rdatastr.patch 588 BLAKE2B 2740ffdb0d3080259e7cd31362385176c7d5a65928192918fd89d6bd69d5f5ca60aee5ebaad5695301cf4446b778bde0ff553a929dbe15a1f88e50d46741864e SHA512 ce1064fa38ba4d849e3610c3122db12234bf6f04f27c2f74c9437f0fe53657138a8cbd37080df17be331e35006a73884d2b834f3edcb633b015261952cf47f05
-AUX 4.0.0-tests-dnsbl_subtests.t.patch 376 BLAKE2B 8df7bf985504bb76461cdbbe402863c1d66f9179dc6974a1d269f062d84ff4b7361697b24b7bc81446abd13f4a99754e0f721692f6c8c1987bfd6e4df13fa2ec SHA512 7a3739f4286c15e15f91244311253d466ff7fb783fe10a12fc4c8f342ac028bb14b4f4e3c535ac8e678eab576876531d45590f4905d572ef962ac4c920769b5e
+AUX 4.0.0-tests-dnsbl_subtests.t_001_load-URIDNSBL.patch 376 BLAKE2B 8df7bf985504bb76461cdbbe402863c1d66f9179dc6974a1d269f062d84ff4b7361697b24b7bc81446abd13f4a99754e0f721692f6c8c1987bfd6e4df13fa2ec SHA512 7a3739f4286c15e15f91244311253d466ff7fb783fe10a12fc4c8f342ac028bb14b4f4e3c535ac8e678eab576876531d45590f4905d572ef962ac4c920769b5e
+AUX 4.0.0-tests-dnsbl_subtests.t_002_no-net.patch 489 BLAKE2B 4f77a6de8dfc406e9a2faf5fbb0f803f4e33d58c5d8ebe07aab8146822dc7fa5b79e3b82011a50ba0b047f9f89acd4fc1535ce8d12ac9bf54eb29f3714abb4b3 SHA512 8b6e4cbf9aca26b10b834adab372ddc3fadc52782ceeb70d0cc8459939740a17f0666a65896bf7443836e532762f06d697cf60ec6a14063db1b10804b23f0a0f
 AUX 4.0.0-tests-strip2.t.patch 579 BLAKE2B c874e1efebe9b6f2a80ff63b116facbfc55fd05abe0c9e02665764509991d26b029b4bd9e7c03a368a7a1f072ce7e843859a0570b807a7bdc18779bff75a0a2a SHA512 bd5206d77cfa67dcb870cbcdf586457fa287d20555a1972ff3dc89d52ffdca4a57eb5011e734a5c6ca4c0017cb8fc9116c9f8e468db599c91d5fa1ba8a510151
 AUX geoip-4.0.0.cf 2608 BLAKE2B 903672505fb9c8b6a05b100b81b7c6786cd7242065c812c871df8bfe2080644fa53fd762c60587fca8aa8b4c79fe0641f27160bd1f14d16285c0eee5c24cc018 SHA512 f313ac34dd79a577ddec59e6623a27b3645401fcf3375c73f3634ca92f20658d6101a10554c8da1210da8e8116441624c01d2dc88c7dd61f1a2ed5fc8ab192e7
 AUX geoip.cf 2228 BLAKE2B 71d525f3f2abb9372cb1be7bb2698cf3d6495c142acaa96d69083d44108c8d514d23afc4f106c51e00704e24567465eaa76404cf5d586a6117afbe2e3f017eda SHA512 624b90487c426ffc46ca5b091b5a0591c0db8378820dee0cb684fd365336f4cef2c388d51c74bf284ed0a39b16c3cbca4aaf8dbc2dcf43b3dbea175185609aa4
@@ -18,7 +19,7 @@ DIST Mail-SpamAssassin-4.0.0.tar.bz2.asc 833 BLAKE2B 44170d411d9eb656d67bf408080
 DIST Mail-SpamAssassin-4.0.1.tar.bz2 6379932 BLAKE2B 303c54d8731cf0ccb622e3e78efbc6be983fc87c7a71107ea700daa54e7ffb85dbb59696188d8ac666067499b1bc7477e31edb36f6e99c9749288a8f921a36b1 SHA512 66183e356b07d1049cf5598fc1e563e4aab580dfca04bf8ec37781dfb57ef568d33c6f6455076f54f940947f5a5dfefa7a08d233833deea5fe5ea18b669cd790
 DIST Mail-SpamAssassin-4.0.1.tar.bz2.asc 833 BLAKE2B 9a7dd3a3a59b6a85139fe6db461da9a4a23ed9d1b3110aba70df60145252c3307c526bb5b5c129e2c4ee74427b2b59e421b80bc8d6ca71b89a0c6f608ca02ab9 SHA512 b180080c1692684014680a6873f42ed07d1640c40a6e3e330cfb43235bb3e3008f5e21018fbc0e9cba67ab6d9ba5b87cc2d98c3bed15c9503164dacdfdaef9df
 EBUILD spamassassin-3.4.6-r2.ebuild 9832 BLAKE2B aeae24c04e90169b1e87605b53c23e57d3a14a825c023c39dae7a316860fd4f2a9393c68a5963838e4b39bb231db9cf94f417bc0baf9ab0f6752f842424cb523 SHA512 7fb3fdcf03bb93b8e8534dab572408a895c519e6dfcf4fc9016471d539f5ec00220cd5a4246c738d288a553273db78769b2c3feba4ce91548777293604cc44d1
-EBUILD spamassassin-4.0.0-r3.ebuild 10472 BLAKE2B f52a8cd19c705929bd832549be459084a8d234394811a9c30282778986416d938bb133735d1f49657a55196c9000a74813c237451c4eb26c35edd45630a51bd2 SHA512 7be7363b797c21599fa9c2a431702d502fd0e361d6c3d8ae4a9c17492c5ca2a61fd3181945d00b9add251d62e04eac481fded57f3486333fca89331823f439fd
-EBUILD spamassassin-4.0.0-r4.ebuild 10525 BLAKE2B f43b0494ca7b1f1a2d9f172873b579f184d128db6c00848a845678530394f260ca1a6319393d05727b1dba7c9f60573548e3aa1e8fc4c2872fdd6d4c34366737 SHA512 04fe901960a03ffae1423dd9e65956ae892a87f75488827c00bab3a7f211d13c92919b7a9efd1fa1b74f3a000b4c6eba18155d29c663e737bc382fe5d62374f1
-EBUILD spamassassin-4.0.1.ebuild 10397 BLAKE2B 0fa11e9fd5fdc909e7f1769d855f8f47a8720c746f8fc3566aa93de62e1fa1ddb39636566732a0b7ff42365d81bd1db42a09bbd601d0791855f77690d343fe67 SHA512 754e591196a3b7a42cdd6bd41a7ca41d0195d0cb4db0e7f8c697f8437ba4bba7d9d73d48ae74f61d7ef4f5ef32fdcb7ae4bb3d4e7a03f199eca460d509335d2d
+EBUILD spamassassin-4.0.0-r3.ebuild 10551 BLAKE2B 4bd1c8ff07f7ad88d4829615a40eb4fdb25f0a9b837de38acc77d7b8c1e7d73d6ba5da113285381aaab8ccba9036be3fea46f8d30f3702d6318a7e437b80fa32 SHA512 e880889e534e64998a86a05f4ae12d03a876b7f6d81d1abe2b7d3a9d0cb71d234412eb998175b9a2e2f5202ba4a9da81fda51d57e954703b105ea9a6eb0f75f4
+EBUILD spamassassin-4.0.0-r4.ebuild 10604 BLAKE2B a2047e73941026c6944f4b4211bde32a91cce4e13fb3722e8a63d40973a20422f7471333cda3e43b38eebf1f4756485b265641e51782063470a9171650f9e43b SHA512 c30b44b87e417dcb2124bde59cbf57b0838b56b2445c2a18adc6616383070b1bce6d923fc87d71fb946120f19e9fe7937d21574428808a4ce0c7ac5958d785e0
+EBUILD spamassassin-4.0.1.ebuild 10415 BLAKE2B ae2560bc304f3d5bd8c454bbf1581e031f08435f47f59523ef950668961cf9be6e8de197d23a7c0c119ce317933315c8f82fce90623b40f47c9c7861ad7a1e06 SHA512 b32e52304b4bdb9f04e66281c72ea293adf0ca3994c687745d31a0cffc25ece3b139aba89569542a361fc3a490a492663d48196cb3f5bf1d3c8a8f5aee93df6a
 MISC metadata.xml 698 BLAKE2B 09a986c93fde495aceb1370ed7440e2d141d83a3b631e050d09571441637029d5beda9fed264d6d65fe094c99fc27c91a6ba350f55d6aa6136c484b2acbd874b SHA512 1bd90e2b4339e685ebc4af7ddd6f371cebd566610fe8cc256c5bf3d120ae9bb527da633c38fff9a9e1dbd7b4949ccd78dab6cb1016311ee23e143426ed61e515
diff --git a/mail-filter/spamassassin/files/4.0.0-tests-dnsbl_subtests.t.patch b/mail-filter/spamassassin/files/4.0.0-tests-dnsbl_subtests.t_001_load-URIDNSBL.patch
index 6f2a4db0ad5c..6f2a4db0ad5c 100644
--- a/mail-filter/spamassassin/files/4.0.0-tests-dnsbl_subtests.t.patch
+++ b/mail-filter/spamassassin/files/4.0.0-tests-dnsbl_subtests.t_001_load-URIDNSBL.patch
diff --git a/mail-filter/spamassassin/files/4.0.0-tests-dnsbl_subtests.t_002_no-net.patch b/mail-filter/spamassassin/files/4.0.0-tests-dnsbl_subtests.t_002_no-net.patch
new file mode 100644
index 000000000000..47bfea21b617
--- /dev/null
+++ b/mail-filter/spamassassin/files/4.0.0-tests-dnsbl_subtests.t_002_no-net.patch
@@ -0,0 +1,12 @@
+https://github.com/apache/spamassassin/commit/20c6a5a78e31877b3d4fa379d6a011d6112aabb9
+--- a/t/dnsbl_subtests.t
++++ b/t/dnsbl_subtests.t
+@@ -14,6 +14,8 @@ use Test::More;
+ 
+ use Errno qw(EADDRINUSE EACCES);
+ 
++plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests');
++
+ use constant HAS_NET_DNS_NAMESERVER => eval { require Net::DNS::Nameserver; };
+ plan skip_all => "Net::DNS::Nameserver in unavailable on this system" unless (HAS_NET_DNS_NAMESERVER);
+ plan  tests => 46;
diff --git a/mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild b/mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild
index ecbdfeb2c745..089338322055 100644
--- a/mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild
+++ b/mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -90,7 +90,8 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/spamassassin.apache.org.asc
 
 PATCHES=(
 	"${FILESDIR}/mention-geoip.cf-in-init.pre.patch"
-	"${FILESDIR}/4.0.0-tests-dnsbl_subtests.t.patch"
+	"${FILESDIR}/4.0.0-tests-dnsbl_subtests.t_001_load-URIDNSBL.patch"
+	"${FILESDIR}/4.0.0-tests-dnsbl_subtests.t_002_no-net.patch"
 	"${FILESDIR}/4.0.0-tests-strip2.t.patch"
 	"${FILESDIR}/4.0.0-DnsResolver-udpsize.patch"
 )
diff --git a/mail-filter/spamassassin/spamassassin-4.0.0-r4.ebuild b/mail-filter/spamassassin/spamassassin-4.0.0-r4.ebuild
index c08c4884139a..a72db00639cb 100644
--- a/mail-filter/spamassassin/spamassassin-4.0.0-r4.ebuild
+++ b/mail-filter/spamassassin/spamassassin-4.0.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -90,7 +90,8 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/spamassassin.apache.org.asc
 
 PATCHES=(
 	"${FILESDIR}/mention-geoip.cf-in-init.pre.patch"
-	"${FILESDIR}/4.0.0-tests-dnsbl_subtests.t.patch"
+	"${FILESDIR}/4.0.0-tests-dnsbl_subtests.t_001_load-URIDNSBL.patch"
+	"${FILESDIR}/4.0.0-tests-dnsbl_subtests.t_002_no-net.patch"
 	"${FILESDIR}/4.0.0-tests-strip2.t.patch"
 	"${FILESDIR}/4.0.0-DnsResolver-udpsize.patch"
 	"${FILESDIR}/4.0.0-sa-update-rdatastr.patch"
diff --git a/mail-filter/spamassassin/spamassassin-4.0.1.ebuild b/mail-filter/spamassassin/spamassassin-4.0.1.ebuild
index 7ab67f06441d..d778722d02cc 100644
--- a/mail-filter/spamassassin/spamassassin-4.0.1.ebuild
+++ b/mail-filter/spamassassin/spamassassin-4.0.1.ebuild
@@ -90,7 +90,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/spamassassin.apache.org.asc
 
 PATCHES=(
 	"${FILESDIR}/mention-geoip.cf-in-init.pre.patch"
-	"${FILESDIR}/4.0.0-tests-dnsbl_subtests.t.patch"
+	"${FILESDIR}/4.0.0-tests-dnsbl_subtests.t_001_load-URIDNSBL.patch"
 )
 
 # There are a few renames and use-dependent ones in src_install as well.
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 3f80a2c724f2..4587276a47ba 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index 1e47f8872fa7..e85dc1380b0c 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -5,6 +5,9 @@ AUX smtpd.pam 147 BLAKE2B 1706fe27cf53621428f563af146d1197dfc59133dda79fe08141ec
 DIST opensmtpd-7.3.0p1.tar.gz 849026 BLAKE2B bdb83468df12af2a2b39664a4408acfaf0cd81551074fb3823f7eb1b0d30ce79d812876fcea2ff940ddaac8b1a96700e1f4d2c275beab106fed010b733cff5c2 SHA512 2106de43e4b7435e49df759570ec758672ca8271dc451e30a261c250b41908b6ffe28e571a5f52e2ac14f59af132d1df45b272f8fcafeab04fcfb6bd5db970bb
 DIST opensmtpd-7.4.0p1.sum.sig 256 BLAKE2B 312bf5913f7da5178dc6442fa1aa01334a4323252ba6441ba4bf65904f2609332f0da850174306ae7ec8bba6c93a667151c11e2fea84bca4585f402f6ba1d823 SHA512 f7126a1ddc47775d9cf460b2f71267721ee543bdf9f42b712eb22579cf929a07515657551f4e94834b6727c8692d018193e97668749766765a147a0a192016fb
 DIST opensmtpd-7.4.0p1.tar.gz 908307 BLAKE2B f3e919b248da1d10d4ffe3073a19f3239ee3db7f58278103a52b50900c4a5b460d27e97ec974ad504cbe758f0a60f8cf2f58b238190e156d60a61b1a4476bc3e SHA512 23aad112ed8f45547e808592823ba8818d8b0ac6ca82d9f83ee33c4a61cfa6326488e10b6beaa3c9e40030eb680478f485b552c15c4ae2835c7a71af509ce94f
+DIST opensmtpd-7.5.0p0.sum.sig 256 BLAKE2B 535753841c0bb6201a6dcc7c1659436fa25270ed2b0066b97b4e8e8934c5bc131c51e5337ef97c33661c3086071be92ccc31cdf6cf3a774caa34f62e701d7b53 SHA512 78075cc0170cbbf9367cde1201aaa34c3a86e023b3d4f1f79ffc28bfe90bcb74236b48e2242e3076294b1cb9133b9ecd720c10011b7508a9cc67cb9221d911cd
+DIST opensmtpd-7.5.0p0.tar.gz 926333 BLAKE2B 25c5786f423bd3efeae0b00de56ae1737e53b2206c179ba7650012ba7eaaefbfec8d942a3eba43d3b56e83616d8adb7e808f0ff35cb93e64439790f3f7045347 SHA512 1e4bf23e623d40732e4055a8db330b0dc69dbfbd4f3d89ef092ead3359aac4123f8a58feb61661be47d84c58e27d22c706dc308dfa245fa76f1d36ed2bb9a822
 EBUILD opensmtpd-7.3.0_p1-r1.ebuild 2210 BLAKE2B 66f20c04b1fce33fd76c4cbfb1672441eaf4eaacce69680af51d75f132a85018aa6d589b3089c51df28ce90efcbe7d1a6ba896f6bc3916b0e93876d205d93c07 SHA512 7ed7c7a1b9c93e6c1bee11b980827685ca1fcd9be5677e12fa0ef0f9ecdbdaf90fb30c406c17481db7481249d084f5d3afe4a88496b2eeb614f9180971e130c0
 EBUILD opensmtpd-7.4.0_p1.ebuild 2774 BLAKE2B 2a6d9cf2e17287b189fd5e2226c3f1cd7ce3041a28a79da00f86b3c4bd652e64c905e939c2bab7505bad6eb08d0501b9eb0023f0a30cdf3affd0dd1efc1b3410 SHA512 de951adcc39fdc353ae16e1ff52b4add42e02e8bee002bf5c7bfb771068f99759ab826fff5af115ed7019055c0ee49571066717d1cb74396463c20f36e03c261
+EBUILD opensmtpd-7.5.0_p0.ebuild 2713 BLAKE2B 1ed061a003627a87c53add7607542d073bcc0c0ed13838eecbfd80f067629fb427e20cf8a703b8e9a4a7b9921bce7df6bcedd666c7d5d19d5563f66118b695e1 SHA512 d40c9e4412af05b660fb47989ddb44c484414beab2c6655e84f92f0cc7075c9ac097471817bcda1f8a6a13709e2f4e53e28cc3c87e5fcec9aad169fd8bf79f36
 MISC metadata.xml 658 BLAKE2B 95b20eb87c312fa721dff4fa3a360d5ffa1b369596e00ca2cac3e39f0b402a44c2a631aebd9ece485d08692535687900b46140f386960f0633c5cf8fe346e745 SHA512 389dbec4c5e81a205e7c5c2f7c4b80adc88819894a8e4e94d9babab25165efcfb86e1fc243275739eece4cfd0eba105aeabca344f78df3c33988e59d097307bd
diff --git a/mail-mta/opensmtpd/opensmtpd-7.5.0_p0.ebuild b/mail-mta/opensmtpd/opensmtpd-7.5.0_p0.ebuild
new file mode 100644
index 000000000000..c5b98eddea63
--- /dev/null
+++ b/mail-mta/opensmtpd/opensmtpd-7.5.0_p0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_METHOD="signify"
+inherit pam systemd verify-sig
+
+DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
+HOMEPAGE="https://www.opensmtpd.org"
+SRC_URI="
+	https://www.opensmtpd.org/archives/${P/_}.tar.gz
+	verify-sig? ( https://www.opensmtpd.org/archives/${P/_}.sum.sig )
+"
+S="${WORKDIR}/${P/_}"
+
+LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="berkdb +mta pam split-usr"
+
+DEPEND="
+	dev-libs/libbsd
+	dev-libs/libevent:=
+	dev-libs/openssl:=
+	sys-libs/zlib:=
+	virtual/libcrypt:=
+	berkdb? ( sys-libs/db:= )
+	elibc_musl? ( sys-libs/fts-standalone )
+	pam? ( sys-libs/pam )
+"
+RDEPEND="${DEPEND}
+	acct-user/smtpd
+	acct-user/smtpq
+	app-misc/ca-certificates
+	net-mail/mailbase
+	!mail-client/mailx-support
+	!mail-mta/courier
+	!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]
+"
+BDEPEND="
+	app-alternatives/yacc
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/signify-keys-opensmtpd )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/${PN}.pub"
+
+QA_CONFIG_IMPL_DECL_SKIP=( closefrom )
+
+DOCS=( {CHANGES,README}.md )
+
+src_unpack() {
+	if use verify-sig; then
+		# Too many levels of symbolic links
+		cp "${DISTDIR}"/${P/_}.{sum.sig,tar.gz} "${WORKDIR}" || die
+		verify-sig_verify_signed_checksums \
+			${P/_}.sum.sig sha256 ${P/_}.tar.gz
+	fi
+	default
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/smtpd
+		--with-path-CAfile="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
+		--with-path-empty="${EPREFIX}"/var/empty
+		--with-path-mbox="${EPREFIX}"/var/spool/mail
+		--with-path-queue="${EPREFIX}"/var/spool/smtpd
+		--with-path-pidfile=/run
+		--with-path-socket=/run
+		--with-user-smtpd=smtpd
+		--with-user-queue=smtpq
+		--with-group-queue=smtpq
+		--with-libevent="${EPREFIX}"/usr/$(get_libdir)
+		--with-libssl="${EPREFIX}"/usr/$(get_libdir)
+		$(use_with berkdb table-db)
+		$(use_with pam auth-pam)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/smtpd.initd smtpd
+	systemd_newunit "${FILESDIR}"/smtpd-r1.service smtpd.service
+
+	use pam && newpamd "${FILESDIR}"/smtpd.pam smtpd
+
+	dosym smtpctl /usr/sbin/makemap
+	dosym smtpctl /usr/sbin/newaliases
+
+	if use mta; then
+		dodir /usr/sbin
+		dosym smtpctl /usr/sbin/sendmail
+		# on USE="-split-usr" system sbin and bin are merged
+		# so symlink made above will collide with one below
+		use split-usr && dosym ../sbin/smtpctl /usr/bin/sendmail
+		dodir /usr/$(get_libdir)
+		dosym -r /usr/sbin/smtpctl /usr/$(get_libdir)/sendmail
+	fi
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 3f43332c0b8a..5f368fefefcb 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 30eec579c5e7..bbe9ace5e54d 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -17,6 +17,6 @@ EBUILD blender-3.3.15.ebuild 13709 BLAKE2B c560bc5268c459c98d9bae37e3b916666eb3a
 EBUILD blender-3.3.8.ebuild 13708 BLAKE2B 3822fcde22d31852e8b9539c6689fe93b56716e788839a0afa26b944e3a1599a995270ac4c600be792ba0c5f2a88616009bcc6f5c4ed6e7f1812df77488989d2 SHA512 16ad4f61a12b7c238fd6c2c8013b2db38d7dd6e1ab53e01425fb4e917910892bdbbb09febe185416eb4abc34136d214fc5acccec4f234914f44b5deb2a7ae8b4
 EBUILD blender-3.6.8.ebuild 14113 BLAKE2B a431187e9349f2bb9597fe7a2e315ad6cee581b01840a97b711ed0a9cc746532c75594e96ccc3e09c0409afb680a116589990af69e2b5cbfc1e37b1e5c522609 SHA512 cc8491e28fae32313ef14816025c909d35381d870e4c7b8c4379bd5ca8578f1690b34ee9f6074bc644aff2b065b77ca0be45adefc5a95cd1e2329470a05cee61
 EBUILD blender-4.0.2-r1.ebuild 17304 BLAKE2B 53711bb59d854ea714cbc3c9ae7571813312748ed32bde98dac27ae36166b508f3934414924c2a8f419c46fa0210debb517109c7c78eae0c85f6d01ecb1f9fb1 SHA512 07cccc5cabc1743aa1aa2d133adc623c0eef3869791de1e3e4296275350fe679239b0d5e84f098c42a2f19e7ce06019645bd55dae9ff4d436ea492a17e3bbe11
-EBUILD blender-4.1.1.ebuild 17156 BLAKE2B 878b641cf10d01d00e475c767fc39dce3007fb2163ca9bda89b0ac085a0f61d971c4fb6bba098a9ad745da4d3bfdbee42717ec19cb8c9e943ccac195fe306ae2 SHA512 7afebce103ca50c72e69772db3bf186c645e17562f3a69e2b8b1bbfc0154cf923dd418d02c84375f75fac4d795fb82bf16eb31ee25cc18dae6e37a782a784768
+EBUILD blender-4.1.1.ebuild 17155 BLAKE2B 71e8c2a4e31c2e133e0b320a27a4f408aec774728ee73d402324a590f95a72c657399811d1110f3128a6961a2d03aae097e5d58612ce1df771e3c9c828449b2d SHA512 55f50d28ed3ea76f6da145962caa8e19079ae0dea3bd3d8657e321d4c7ee752f948360f882ddcd490922dd23ac31e5005f9f7f4dfb2d0c73b52092c672972d2e
 EBUILD blender-9999.ebuild 17156 BLAKE2B 878b641cf10d01d00e475c767fc39dce3007fb2163ca9bda89b0ac085a0f61d971c4fb6bba098a9ad745da4d3bfdbee42717ec19cb8c9e943ccac195fe306ae2 SHA512 7afebce103ca50c72e69772db3bf186c645e17562f3a69e2b8b1bbfc0154cf923dd418d02c84375f75fac4d795fb82bf16eb31ee25cc18dae6e37a782a784768
 MISC metadata.xml 3679 BLAKE2B cca8c2f8568be6c83244cf5a90b2db0df11faffa4f55820692990e02ce0bfd84cf3e6c2fdb146af9e6c8e09d1c72fe297c73f126e04ad918e709dc9064908aca SHA512 ac8bdbc0e00442f56d9d077d7d8c97deba90121e7dd34aac9d51b7ae6348bbaa875d2fcd01fe20ff7e9b1c3bf332a5cde63fd0b406a1e29c3f4de323225a17a9
diff --git a/media-gfx/blender/blender-4.1.1.ebuild b/media-gfx/blender/blender-4.1.1.ebuild
index 94e2599fa018..654e53884672 100644
--- a/media-gfx/blender/blender-4.1.1.ebuild
+++ b/media-gfx/blender/blender-4.1.1.ebuild
@@ -27,7 +27,7 @@ else
 	# 		https://projects.blender.org/blender/blender-test-data/archive/blender-v$(ver_cut 1-2)-release.tar.gz
 	# 	)
 	# "
-	KEYWORDS="~amd64 ~arm ~arm64"
+	KEYWORDS="amd64 ~arm ~arm64"
 	RESTRICT="test" # the test archive returns LFS references.
 fi
 
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 509d2108be13..a0189547a202 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,7 +1,8 @@
 AUX fontforge-20230101-fix-splinefont-shell-command-injection.patch 5688 BLAKE2B 9940dd5fd04cc61b87e2498064e9b5e70a9806b9a70a2d93a155d932f888e7bd7e7a11a5f44972feec41c6359e39fa4be982850db7fbceba095a6b35968d4d1a SHA512 1f90a8596c831008fd0a4accbd496455a7951c4ca706aebcfff8091148569680538897e02833bd6d5f92dc885921a92cee6b91f89c70543e0e4856767775ef45
+AUX fontforge-20230101-python3.12-distutils-no-more.patch 988 BLAKE2B ea666805ea0bf1a9fe5fa8cad3e76e8410933a5ce954cc09c7f923efebc78981e3cda61d55621680f1b3278b119050c32c33ea3a53dd118b6e507b60552cbada SHA512 f2656af8ca9280524beaa179e93ca40e230957490aab9dbb307a4bc1b924a2a404e4a03d847865584340801fa3b75d09cdb330ad6b5ac890c521511357e6bdc2
 AUX fontforge-20230101-workaround-broken-translations.patch 5219 BLAKE2B 17ead2e7c178911b48de35c6c86ce60b486a000c05ea5d11e79094851b9e4e68e32335a33ef2b49aeaf0fb161b3823e35f1b281feae426b9b69baabb35c5e02c SHA512 250850a8345511b222faeb7cf6209d412611491a5c9d83f7ad14408b1936059c4fe52cbe834b5d26579281539156b93e692bd8873aea445f23b5d78a0e1684f8
 AUX fontforge-doc-no-warn-error.patch 834 BLAKE2B c8bd1cfcf320b7831cc64d67d8de52b37e2f37bbac91d5df709d23e144ae33ec02907606348185eac7030f5151719e0023c0d9fda5395334a15c56f7174151c4 SHA512 6055f1696f1910e81ab1b84b48d336c1a097b53618a3a960e8ce2aeb57e05ad364848d48082b792cd4d5cc85fc95947cddd2e04e7a98c5ceb6f9ced14bd4e674
 DIST fontforge-20230101.tar.xz 13761728 BLAKE2B 69e79e7c5d8b551a847ba8706157b0f559ae2a85f61711f50e4855eb6a177bbfb25de2650caf9bc8a7dd1d6af074ca5063519b2f3c151d8c784c4750c6ddc1d8 SHA512 7684a2824d5199e230d2e0a654c2119cef422a57b64e6dd75afde6ba623abed6581f596fd5b7509e03f3b3ad3cf69629aafd4c85aeda64fa91a9e1ab88c9b418
-EBUILD fontforge-20230101-r1.ebuild 2960 BLAKE2B 5988bbdb0fa1bdd86808ddda887a707d9501581da7c5fa7e88f8b80bdd51217624194411ca2aa1a9b575a85a5a5ad2db116a283423257274319fc9b5097809f4 SHA512 afc00739a406af802cc5a813ff89fdd937b470f1dd1651bb203a5c5feda2d408d8e1cb3c821d3ab000984bb93a3da08e40c5cf15a7cfb9be731837188515459d
+EBUILD fontforge-20230101-r2.ebuild 3025 BLAKE2B c7aa395574cd03aa4e6545620de39482491971684a524061b3f231a2b3aa529c95b82cd4ff0d21050dcf2d1b439e2f18520c05f879a3384a511fc3d0a9757172 SHA512 1d992aa38c0aea9dd61219395889d817f41d2a8c836919d987cedf2dd9160518958942aa8d34fa2ed8d488423d32cd8686e7995ebeec909f2d3622affddc9ed0
 EBUILD fontforge-20230101.ebuild 2877 BLAKE2B 838d3272eaca260bd5728ecdb6a5f69c3ce5fdbb18432529ff2f536951265d646f7c7ca39bad7c5bb7ec57aaeb312492d7537013d466f263efcd2eedb235bdb3 SHA512 f75fd950ed8e356d09467a6b46980dfba2351239b111a8bf89d17d59167172c5ae3eb0f0254ec86831a4b90dbb9157dd4ef30a154f4b1158bb53e8ed7de2c0c9
 MISC metadata.xml 863 BLAKE2B 6a87762712128bf3d57122277839008c4ef057491ae1c1680a166194037ed00e66816f2c0c09be8a17909843ad49b807c06405b95332684dbee3b8d60d30d7ae SHA512 8f33c7d38f031fbf85c82b9743db80c2a3c85ddddeb4deb631fbb911a8e6c2e97b43560b82539ac93df0c577abe74ef743fd4ca1a3e2e2f978b7edfd94cba280
diff --git a/media-gfx/fontforge/files/fontforge-20230101-python3.12-distutils-no-more.patch b/media-gfx/fontforge/files/fontforge-20230101-python3.12-distutils-no-more.patch
new file mode 100644
index 000000000000..c140e7d19955
--- /dev/null
+++ b/media-gfx/fontforge/files/fontforge-20230101-python3.12-distutils-no-more.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/933392
+https://github.com/fontforge/fontforge/pull/5423
+
+From 24968a8bf713396bc4a5dbb8bf3a03a9479b2568 Mon Sep 17 00:00:00 2001
+From: Maxim Iorsh <iorsh@users.sourceforge.net>
+Date: Fri, 24 May 2024 16:48:47 +0300
+Subject: [PATCH 1/3] Use sysconfig for Python module locations
+
+--- a/pyhook/CMakeLists.txt
++++ b/pyhook/CMakeLists.txt
+@@ -21,7 +21,7 @@ target_link_libraries(psMat_pyhook PRIVATE Python3::Module)
+ # So do it ourselves, getting the prefix-relative path instead
+ if(NOT DEFINED PYHOOK_INSTALL_DIR)
+   execute_process(
+-    COMMAND "${Python3_EXECUTABLE}" -c "import distutils.sysconfig as sc; print(sc.get_python_lib(prefix='', plat_specific=True,standard_lib=False))"
++    COMMAND "${Python3_EXECUTABLE}" -c "import sysconfig as sc; print(sc.get_path('platlib', sc.get_preferred_scheme('user'), vars={'userbase': '.'}))"
+     RESULT_VARIABLE _pyhook_install_dir_result
+     OUTPUT_VARIABLE PYHOOK_INSTALL_DIR
+     OUTPUT_STRIP_TRAILING_WHITESPACE)
+
diff --git a/media-gfx/fontforge/fontforge-20230101-r1.ebuild b/media-gfx/fontforge/fontforge-20230101-r2.ebuild
index 261c8f986c79..5a9b97e812ee 100644
--- a/media-gfx/fontforge/fontforge-20230101-r1.ebuild
+++ b/media-gfx/fontforge/fontforge-20230101-r2.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
 	"${FILESDIR}"/fontforge-doc-no-warn-error.patch
 	"${FILESDIR}"/${PN}-20230101-workaround-broken-translations.patch
 	"${FILESDIR}"/${PN}-20230101-fix-splinefont-shell-command-injection.patch
+	"${FILESDIR}"/${PN}-20230101-python3.12-distutils-no-more.patch
 )
 
 pkg_setup() {
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 1ef14746904a..bfc4f5c3f78b 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -11,5 +11,5 @@ EBUILD gimp-2.10.34-r2.ebuild 5882 BLAKE2B 67a9b4c0707f3027f34ba6276b8ac6fd2709e
 EBUILD gimp-2.10.36-r2.ebuild 6001 BLAKE2B e2b78361ae0d4703479e8b9c1a62e99f7099b80a9267ad6b056a15f30a0bba79da7b697af38d76e736ecc01aca6b0a331b90fc7f20060e6872c1854ac56d9ec1 SHA512 cdc970e8766da37a2103010214313a6dd54ce1acfb9bc390aad47474914801884dbff8900ae62107d1c1780a9ccae3803abea10a72827816dff9b72572aab97d
 EBUILD gimp-2.10.36.ebuild 5854 BLAKE2B 811d0ea7218ec368006864732bf94c6f07c7cdb2eeffc1df5deda811bc8cecd76ffa4f17230dd91313fe59ae803a35dc20c6be7e53e2b2143db24ba7dbf57dc8 SHA512 8ad6430138b98b4d384f3657f45733a5e1bd59db25b9619a4593d51af35bcd7b5cfbbe54587cb4f72b54fa1dfeac32a31d4727d0ddb666154810261806188040
 EBUILD gimp-2.99.18.ebuild 7178 BLAKE2B 513d508da711c4c2b57b1df77865a0cbf93a2090fb2669ad6f58cb550fa941445510ccf3592652b025f1ca246162ba3a2a677b8175561067a5a699cfae0b9705 SHA512 58c3695b76c50ab18ae63c35cff5b8f9f13c660b56c3359d064a247a5ea53252b0067a37e6641643c5996232e3b94071ca13772331fe528daaafe2e509c70fc4
-EBUILD gimp-9999.ebuild 7112 BLAKE2B ed4cd65d3e82d45cd102b032dd65d747284cf3140fbc714a87992bffa4eac698f064cd77c56ac8dc4451481beeead8b04e9977fd2ca5c2f5182af03228502f2b SHA512 e1ad4a4d97b17742a27d36b20368e33e9e3e78445ea464a0451e312db495fc79c0d588206f2d096086c178db310e9a7bcd95d1df353b17a0e9c0e97b52f7ed91
+EBUILD gimp-9999.ebuild 7111 BLAKE2B 726d3e15b968938fa2fcbc66775d58c46329cf679b08b36e507c3c26524aba189c8719c78f085b4ff8d574258579ae3e9bd537296f93e7cf0724cadd378230b9 SHA512 170c006ef43c1093f705cf530a21441e8afdbeb7d454c3e9ab0eddd504e2dccdcca24707829b523f0e2eb4025f808cd00d848738b2c26d51f6205ea82f76da6c
 MISC metadata.xml 579 BLAKE2B 7766f3da8488794ee014731965efd289e9e95d07631cd7f08ce9469fb33ed1ada31b646f337afcbb3a540d4de83fa5764fc2aa18c4b132341520d4717c7b251d SHA512 9bf1c5c4442af756e6ce40a7399f096ed1732c095eafdb4ff580e4122154e2549d9e8c36a7cc0391f0bd49c07422c5c59123278d62645330aeefdc9130aef182
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 6ed419a59545..122443176973 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -208,7 +208,7 @@ _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.99/plug-ins || exit 1
+		cd "${ED}"/usr/$(get_libdir)/gimp/3.0/plug-ins || exit 1
 		for plugin_slash in $(ls -d1 */); do
 			plugin=${plugin_slash%/}
 			if [[ -f ${plugin}/${plugin} ]]; then
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 42cf1e9a0a32..bde85c73d158 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -3,6 +3,6 @@ AUX gscan2pdf-2.13.2-t1161.patch 512 BLAKE2B b74f51a2cc70c19ef9b242b02540fff6309
 AUX gscan2pdf-2.13.2-t131.patch 473 BLAKE2B 23ec073509f9b252494e677a7f90f1eb41077a7e63641b1f6a6cb06d9a1329a3b5c96189c92a78b11b515c091b8df16173a40ced65d8f563e87b7d83410c31dd SHA512 ceffdfd0e478047d5da7044e160b8feadda9a0fa09ac99c609a118b84ac45ed10cd386f04c499c832566d8626e5abee4ce5d819a9e51733eb7dc822fa162f32d
 AUX gscan2pdf-2.13.2-tiff2ps.patch 1490 BLAKE2B c8b85f7a21e3e03cc1621d0f65af9f6ab03e89e72ef3839dc6f585cd8d0e6cc2d10c49ff119b671bc9f6fc99cf03c6a0117402acc38e624d46fd89cd02a75058 SHA512 b6357c1ea6d6dc958b7044be062bdb9445667da3d2ff9017bbdd3b041daafa89e742d8c1c9c919d3b8b5c4ab35840db1d24ec27a573a1e75b544c0dfce40bd9b
 DIST gscan2pdf-2.13.2.tar.xz 507244 BLAKE2B 66ac15ddcf74ed2b04f231e24a663afa7494bd5df04ecb190b68b9822382e01953d97949174f3d6280fabc9d0a2ea1cc270c0aa333cf9992cfa2f58f645df156 SHA512 882b707b11df26310136ed72428eab6ec8e2c6cf34686675eee3b14181622f85d21be0e05cab411961f2a2441ad948e7b56c7fe24eecb558eae7a7ac6b4db9d1
-EBUILD gscan2pdf-2.13.2-r1.ebuild 3534 BLAKE2B 1701f2dc7dd1564fd0c9791c56e14f2f6fd2a4d9db2074e81930ed63543c9b39332352d82d9c24090a73de52d3a9a2ae018b60d98f1c7d25a2495f42e5693acb SHA512 91076ffc00738240a6a7b59e1a9ba5a63b657c53d9d759ed0465e14ec990d32fc125cc0d1f58f46a3831ae95da45bb2e925ea8ee88a46aa50cbda95dbd3f0d06
+EBUILD gscan2pdf-2.13.2-r1.ebuild 3537 BLAKE2B 83a366fcdd9c4a8b4e40476f1fcd86df21e6e81f98f7af7a27eb49d0035e5454c404cc3207a75fce3a00f982e8c6451db9b9692deb7a8a5179dd1a5b446d2360 SHA512 455e2f6b8b2b7836571ae16a34b42e95d4df0da3345dc74f04afb0ee0d1664a0bade1d06a4001769ebbb3be24792cdff5cdd4213ae67f474a898b0596ba330c5
 EBUILD gscan2pdf-2.13.2.ebuild 3024 BLAKE2B ea848a2d53e265954eecd3df6e878c2669e65a8cbda53cd0526f84885c46bd1dcbb37fc0a99585293e6ebb75a4bfe6b37c62883131560ef2a5d446c390548fc8 SHA512 82d9fef80776516ac278b4636d16af52629f6904999370defe3dea7e23e8383ef04740218d0b4505d41e1e977caf9bf55741cb4320c9732e13ee927c7f38a59f
 MISC metadata.xml 470 BLAKE2B d9a9ad2f443b0bca02e6b8e91c96f22430543ee82fe8a1174739d4ad59225f73b975d31316fecd4dde6f26002ef6ba9fd39bf5d4adfd2bc82540d14e90d623a6 SHA512 ecd2fe9215c3a65760b8c101989772a73a7e9975dc38a1b11b0334cf6e1d001ccebfca1bc6d7631eb3b3e3e03d1736205563b0c836a2aea026fdfe552d72cbe0
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.13.2-r1.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.13.2-r1.ebuild
index 656fdc789c77..c62432895cb6 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.13.2-r1.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.13.2-r1.ebuild
@@ -58,7 +58,7 @@ BDEPEND="
 
 		app-text/djvu[jpeg,tiff]
 		app-text/poppler[utils]
-		app-text/tesseract[-opencl,osd(+),png,tiff]
+		app-text/tesseract[-opencl(-),osd(+),png,tiff]
 		app-text/unpaper
 		media-gfx/imagemagick[djvu,jpeg,png,tiff,perl,postscript,truetype]
 		media-gfx/sane-backends[sane_backends_test]
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index cfc7a27cb653..202605d76f32 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -3,7 +3,9 @@ AUX hydrus-server 69 BLAKE2B 245851a0bfd7ed4e947d229cae980daaaf213e2ff4238b5bc6c
 AUX userpath-in-local-share.patch 492 BLAKE2B b6de719f01072ccbb055fb9fb10980bf2f36972c2b998b23c90001e33d2b103d3d55f288a08db8bbb9b2e743bafab4c9ed304f94d1abd6869fbc39dd226f8673 SHA512 0811d610c29ecae4cdecf6d8f01950738f02cdebee84223c884ba708347c91692b13bff00eaa835790df6bf9d0db79c3a78c1abee9adf6a4e57903cc18cc2587
 DIST hydrus-3500-mpeg-error.patch 1632 BLAKE2B 9cc969a3a2d476ea606f3f280ecd6e4cc7f628420586e651377945d370a6c50464b118da1c96a577bc55b13bbac946801b9cff251922299f91e4a76dabf7edf9 SHA512 8769d63c7b2a345e1a7bfa0dae200bca03b991ef6a217150e3f50c95f3d1235305242348aa8fabf1183fc3d787498bbead8a96145e4cdd2251f67032469f095c
 DIST hydrus-565.tar.gz 46360280 BLAKE2B 7a9492db917b7f7d10fd92c668dff2206111b5734a707ea86e8d3f5c95359126da31e3bd6fdcea64c621527f5a30e608fdf8cd36b7b7b70185a37c3cc7483180 SHA512 442dde4c9e557c162b8a5cc23f22472d8c48d7717513a192875b413a59000897c05b2b050c16ad480cdbb18548485f51b5e8651e44cb2057fc8e6eb1b99e8f26
+DIST hydrus-571.tar.gz 46371027 BLAKE2B b0ca6a4d7fddb79808340c03d6ba6291021af752be95144b8475a12450394f21e76c5fd80a2f6094f21d6f4af25db22f5f8d2eb79fd3494be609d6bdcdb455cb SHA512 3d6b6dec777332128858fcd62f52026fd7a4ab831f7cc0b3a3af76d52b6c6d1ff7b9687554aa5569988386e1eb0b33111172029e25f0acb9f36bb1cd70fcccbc
 DIST hydrus-test-fixes.patch 820 BLAKE2B 9d912868142cd3e7763241652e81172236094de6d0cf4df888d7203d34ed37b469c4829401a6e3bda945e3683db9f8e577ef21040cb5d57b0e6c01c2c619655b SHA512 a6a322a77638122fdd1f74ca57c23360aa8d58d97877e9517db9d185c11a8187e807b9478533a97a4654d58342b0541cc7eb89b83075bc4c38ceda0effe06ce0
-EBUILD hydrus-565.ebuild 5016 BLAKE2B d5291a005bad4893070b983c56b4fdc5de7e49224da928caf769ba01dc7fe4159641c14c1e29e8ce6fc74562ccfa92bd8215c4d912bd30d67c7213c3486d93ac SHA512 7ea6495c21d3e98733db00a6174b2f2ef51c0da8ba37cf01ccb4b2076761c582f9e3925e1ffd3cb76d925522b7e39430585224e979bfaf1ca9105ae50c328bd6
+EBUILD hydrus-565-r1.ebuild 5014 BLAKE2B a11c28e40bc5d50d81c3540b5b9837b734d3b9c51a7b267b49c89ca8f6933f0dc0949478cdad4446748d06c37d9401d35b88b8815ef4149c9a1f76bbf9e5eb63 SHA512 ef1d178be78e508ec0ed7b8fabdf7d11d21973711b5335fa790f65e39a04c3242c59bf6f9b31fe4909583967171f3bd89e76d8a72b8926323f2c7ff52926e1bc
+EBUILD hydrus-571.ebuild 5014 BLAKE2B a11c28e40bc5d50d81c3540b5b9837b734d3b9c51a7b267b49c89ca8f6933f0dc0949478cdad4446748d06c37d9401d35b88b8815ef4149c9a1f76bbf9e5eb63 SHA512 ef1d178be78e508ec0ed7b8fabdf7d11d21973711b5335fa790f65e39a04c3242c59bf6f9b31fe4909583967171f3bd89e76d8a72b8926323f2c7ff52926e1bc
 EBUILD hydrus-9999.ebuild 4694 BLAKE2B 991178a1b0492857c85fecc15e840887a63c33f1b9ed6cd8f5b7c3bdf27dbf1b6a5b8e09af0a4f9541dda9ee9dadb26d5f1b8ec4e7d77d0b8a2a5c3c24354e0a SHA512 37d888d5423c395fb77652275e44a952bd22f6b36e44aea612a2ed7d373eb925e0a3d8a9376ba2978e0468def104b6c8465cdbcc2f8ba6acf758b40e449bfaae
 MISC metadata.xml 836 BLAKE2B 049faa70763ba176b6e4930abcdb5f4b4b87bd243759aba42dec32b9f2a199b3f2c33f0415ffdd1a392af3b461d939e633ec1f9333b0ff538f74d24306790fbe SHA512 0404c79e85e51eaba13fef930e695f168074e69734d3d8a604515f77196706bae9d36a2df9b3db0530c9f17b32881602509c7e22e7383c957a67e13c2a46e7bb
diff --git a/media-gfx/hydrus/hydrus-565.ebuild b/media-gfx/hydrus/hydrus-565-r1.ebuild
index 1fd94b6ee116..07124a7dd9f9 100644
--- a/media-gfx/hydrus/hydrus-565.ebuild
+++ b/media-gfx/hydrus/hydrus-565-r1.ebuild
@@ -62,7 +62,7 @@ RDEPEND="
 		dev-python/twisted[${PYTHON_USEDEP}]
 
 		dev-python/QtPy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}]
-		|| ( dev-python/QtPy[pyside2] dev-python/QtPy[pyside6] )
+		|| ( dev-python/QtPy[pyside2] dev-python/QtPy[pyqt6] )
 
 		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
 		media-video/ffmpeg
diff --git a/media-gfx/hydrus/hydrus-571.ebuild b/media-gfx/hydrus/hydrus-571.ebuild
new file mode 100644
index 000000000000..07124a7dd9f9
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-571.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
+
+inherit python-single-r1 desktop docs optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="
+		https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/vaartis/hydrus/commit/5d2505a1eb4721f7750861f7622c46adec31db8b.diff -> hydrus-3500-mpeg-error.patch
+		https://github.com/vaartis/hydrus/commit/dc20196f47ac29568a40cd04a45cf4fc5f237603.diff -> hydrus-test-fixes.patch
+"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# Python libraries with no specific requirements
+# Python libraries with specific version, slot, or use requirements
+# Non-python dependencies
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/cbor2[${PYTHON_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},lcms]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service-identity[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+
+		dev-python/QtPy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}]
+		|| ( dev-python/QtPy[pyside2] dev-python/QtPy[pyqt6] )
+
+		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+		media-video/ffmpeg
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+	"${DISTDIR}/hydrus-3500-mpeg-error.patch"
+	"${DISTDIR}/hydrus-test-fixes.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Python requirements file, not needed
+	rm requirements.txt || die
+	# Remove unneeded additional scripts
+	rm *.command *.sh *.bat || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+	docs_compile
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/hydrus_test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm hydrus_test.py hydrus/hydrus_test_boot.py || die
+	rm -r hydrus/test/ static/testing/ || die
+	# Build files used for CI and development, not actually needed. Has to be deleted after src_compile.
+	# because it contains documentation
+	rm -r static/build_files static/requirements || die
+
+	# ${DOCS[@]} files are copied into doc
+	# ${S}/docs/ is the markdown source code for documentation
+	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]" "dev-python/pyside6[charts]"
+}
diff --git a/media-gfx/pngnq/Manifest b/media-gfx/pngnq/Manifest
index ea576318a90c..a3940e89e2f6 100644
--- a/media-gfx/pngnq/Manifest
+++ b/media-gfx/pngnq/Manifest
@@ -2,6 +2,8 @@ AUX pngnq-1.0-Wimplicit-function-declaration.patch 184 BLAKE2B 61f77336540a5e5c4
 AUX pngnq-1.0-libpng14.patch 382 BLAKE2B e85fbdccf1765efff65b638dccab6d3e5afa83aa6782f8be8188414985e18000bb68273e2250d2063eac56bca4f1e0481dadf747fc05e94f1d340eb21cdfdc59 SHA512 4194becadf43c3e8c1d63a15e3de1118c386dab4e4e7e6e5622dbc896d3c1cab5ffaac6f6f8c7a504fdf303bb6c0fad44351e7d89b304cd3c4d15908e347fe4f
 AUX pngnq-1.0-libpng15.patch 359 BLAKE2B f031f310aed6a30ed48e8e0754f3e392ccbc2fe9a929443885f3e2f040fb081f5122d6e1c9b89e63bdc0594051faebdcf53e5085a01b1520f256e60d1e06e9b6 SHA512 e2542833a6950b8e8ab09a9973a0df237d5667ce9d75b2e909485398d38517bd7d7d0237d8b1c3875c4538a6157219870cf6c7e29a98e6a1dbb93d11476d1059
 AUX pngnq-1.1-autoconf-quoting.patch 299 BLAKE2B 454f2c28a31220307b0e1290030f9b28b8864349d6486039bf796e7f896085d1ce24f0ab1e2d972adb2147bde80f94d7996e899b9e16f19482f0b8311acdd745 SHA512 4fedd87a24e8024489b39ecce94ec7425fea7100c57e258c0bc3dc7440baed3db21bbbe2633e070db1716f9e59875daf3ed4279619513e5c7b69fa1d100821e1
+AUX pngnq-1.1-gcc14-build-fix.patch 1426 BLAKE2B 5a9ff973fbbe26fe7542a016274022fd934fde18b4f582d1de459631c52f4ccccd37088a30546d44665652103d881dd723f7e779c78258bb345013319ee9c7b5 SHA512 b2ca1fdc359a38d9fa73cb7c583f89e9c92e3e6cacf8090d6c523d46fb46513eab74d3cb00663979f86627eac1ff29c3276802440a94b591152748a3a99f16b2
 DIST pngnq-1.1.tar.gz 117372 BLAKE2B 94c670342d514c577c386b8fe207307f057e5c0c3816b35ab2b625258051269410b9c5ad45f89c047715bb1ad927909498a6faef5591eb61039fd68c94fc44a6 SHA512 3bbc4ace1375517a7a73bbc65ff39512ef316e4b67fc3941cd0b7269e584a26f915f30591f8aa1c44eea73fe4ebe9519063a7bc426841e412c648aaa188be234
 EBUILD pngnq-1.1-r1.ebuild 687 BLAKE2B 17bf9d6e665e0b84ecb063c7c2e32093242186f82420411c5de14b9fbf44117b5e9cc60695261a15c3da42a7a834ea25adaf61447c7a6140ae478a044a7fee60 SHA512 b61ea24e468b9a19c0bca38823a18a3b537241984813cc022d1387bc1f11dbaf80c5efa03724c571270a3075787e7f407c43d1ae154c125485c970bfd464f4ff
+EBUILD pngnq-1.1-r2.ebuild 737 BLAKE2B c903c56ce977c118203d0520e12afa07132cd9da739e1ee672aa1ecd8bb8e5f9b9ee11add6e7b627ee5e5ee6a0066bf7b9310a704af3971882960793fbfe0836 SHA512 f172fcdf9f15a984a8ff93b94b60a7a32af4f866ac53c745df10b6afbd7a97fbb77d6fb1d45bdb108ecb92b073a07e14664f87b5ed1c20e6d7bec212dd0105d4
 MISC metadata.xml 243 BLAKE2B bc28a5bf618a465e4fe0f7eb0ce8eca6f60cdfa875d7c9d96aea4071a84f17b5a3f7ce20adace95946e312fd8db0583dc2b83a81ec47184f03d6851f05620b49 SHA512 91ef91f45537a1a41d6df99d077d886c517583c7d23c48558d04308f05d9f8c13ee57709c93c4b0852f15b339e75e2b27ff0ddf12b20dec07c4e944679e555e2
diff --git a/media-gfx/pngnq/files/pngnq-1.1-gcc14-build-fix.patch b/media-gfx/pngnq/files/pngnq-1.1-gcc14-build-fix.patch
new file mode 100644
index 000000000000..aa8c1a624cdd
--- /dev/null
+++ b/media-gfx/pngnq/files/pngnq-1.1-gcc14-build-fix.patch
@@ -0,0 +1,34 @@
+Bug: https://bugs.gentoo.org/919210
+Reported upstream: https://sourceforge.net/p/pngnq/patches/7/
+--- a/src/pngcomp.c
++++ b/src/pngcomp.c
+@@ -503,7 +503,7 @@ void printstats(struct statistics* stats, struct blockstats* bstats){
+   printf("Mean pixel color error: %f \n",stats->mean_error);
+   printf("Maximum pixel color error: %f \n",stats->max_error);
+   printf("Standard Deviation of error: %f\n",stats->stddev_error);
+-  printf("Image Dimensions %ld x %ld \n",image1_info.width,image1_info.height);
++  printf("Image Dimensions %lld x %lld \n", (long long int)image1_info.width, (long long int)image1_info.height);
+   printf("Number of pixels: %ld \n",stats->n_pixels);
+   printf("Number of exact pixels: %ld\n",stats->correct_pixels);
+   printf("Percentage correct pixels: %f\n",(float)stats->correct_pixels/(float)stats->n_pixels*100.0);
+--- a/src/rwpng.h
++++ b/src/rwpng.h
+@@ -29,6 +29,7 @@
+ 
+   ---------------------------------------------------------------------------*/
+ 
++#include "pngconf.h"
+ #ifndef TRUE
+ #  define TRUE 1
+ #  define FALSE 0
+@@ -65,8 +66,8 @@ typedef struct _rwpng_color_struct {
+ 
+ typedef struct _mainprog_info {
+     double gamma;
+-    ulg width;			/* read/write */
+-    ulg height;			/* read/write */
++    png_uint_32 width;	/* read/write */
++    png_uint_32 height;	/* read/write */
+     ulg rowbytes;		/* read */
+     void *png_ptr;		/* read/write */
+     void *info_ptr;		/* read/write */
diff --git a/media-gfx/pngnq/pngnq-1.1-r2.ebuild b/media-gfx/pngnq/pngnq-1.1-r2.ebuild
new file mode 100644
index 000000000000..cdfa4f9281af
--- /dev/null
+++ b/media-gfx/pngnq/pngnq-1.1-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Pngnq is a tool for quantizing PNG images in RGBA format"
+HOMEPAGE="https://pngnq.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
+
+LICENSE="BSD pngnq rwpng"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="media-libs/libpng:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0-libpng14.patch
+	"${FILESDIR}"/${PN}-1.0-libpng15.patch
+	"${FILESDIR}"/${PN}-1.0-Wimplicit-function-declaration.patch
+	"${FILESDIR}"/${PN}-1.1-autoconf-quoting.patch
+	"${FILESDIR}"/${PN}-1.1-gcc14-build-fix.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 50adca0bcd7e..da879ccf32f8 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index 889f9ed890eb..19d51746da3a 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -2,5 +2,7 @@ AUX aubio-0.4.9-docdir.patch 1192 BLAKE2B 617f5a63d51440eba157687b752822b3e14316
 AUX aubio-0.4.9-remove-universal-newlines.patch 1198 BLAKE2B 9cd5a5b3880075706938df7c008c6dc160e48402b0cfddf41f7d248c4d0e91a7531a1e87b40d51569220d720b679126ab02693588c4bf4a8c9b12af2a8653665 SHA512 0675f850ddbff6857b1fb7cc6a0f6f5188436fdf74e6c4c123d734e02eee82a0914edf26d2a99351dca4ff9b9a4715d86b24a747746d2b1c4bf4ea7d2cdaf2f1
 AUX ffmpeg5.patch 745 BLAKE2B f353faf80b4fdfb26b2d8a135ab0415ac3f6780a2b5894e18b12e137fb109b1b89b4c8500f8dc1e809d763f851ce186f199f32c680a80c816f40ece997639d0f SHA512 8eeeac40bbf4e1faf7a99d2cbfe4a7b3bc85b5b5927c7bf69ef774ad06fcedcb0a84296dce7300f4907b2ca16525e6db854acad371d788c7f5fb7bd4a94efc86
 DIST aubio-0.4.9.tar.bz2 397604 BLAKE2B b849d92678ea8fb20e17921b1a61fdc85a84d4a528acfefa3278169ab5f7fe935217ec37dd9f931202f0f0a1fd3a9518372afbce34cc2dd3ca30c6b4e5d9a301 SHA512 0cb81bb4b15051db3f3f4d160d500af56fdfb237e0a74e3f366f53c2870030aa0a7cee8469a611a9694c36b8866d3d42ffb48241c999de08f3fee43e6d903130
+DIST waf-2.0.27.tar.bz2 693624 BLAKE2B 34dcb84df2f42d7c92988226ae0208a9407a091f79e47b8abe1d3b33105d58df06072bfb3c22a7bb6dfa8f083224642c55fa2c9fc0110a2d49d3d10ea754c928 SHA512 a62dbb1ee89d88969c31d3f634577d80b8a595460d445cae9b42ca423cfcbbb96347b5b67697165833f3dd496b4bc7e312e166af86cb3b97ed57ffe59f46b98a
 EBUILD aubio-0.4.9-r2.ebuild 3188 BLAKE2B ead6dd22007fe53e2f9a4ce33d1fe0ee1e9ff4b898eb2ff5c9cb4609360c20f187c9feca1530f42dfc04bb6a2f86d9fec1406c9065aa2f92b779cb2c218bf09c SHA512 542e18d674c33b54718cdcf11700c5476356071534db7b0986e32c10a706a2fa35295d7af5a2a5c147a3e22182817c9900aea7c0c830d51cd62526eb8c759200
+EBUILD aubio-0.4.9-r3.ebuild 3531 BLAKE2B df93ac0477da16296c2861b0b7b716801dc3359b5423ce9289f424f7f62ca4122ea2c4c3370f33a0a1eb8a1c28a9f27082ca2a1da54a4619596b25ed820381a8 SHA512 4dfff6c9ce1a46422f3707791de1037c88855a5655482f62c8dbcc5b00a156f331be91c4269336c37197221e67a6f45d107fbbf73a1dd8ec4874b651e6814991
 MISC metadata.xml 424 BLAKE2B 427627520c0e31649dc3bfa4011cb80b48cac5bc2ba6bea55812b033b1a92e2a07477729f83057ae0c213c82ed20899e05978e6968db3d3ff166e153c4b1c1ea SHA512 a9cb14aef216e074f21616493f1a9276c43f05709b14492de8cbd90d4f19878bc9f905545327985639f05ee75234d11689eba519f88c6bafaa8b848bd887178d
diff --git a/media-libs/aubio/aubio-0.4.9-r3.ebuild b/media-libs/aubio/aubio-0.4.9-r3.ebuild
new file mode 100644
index 000000000000..4a910ed12d2e
--- /dev/null
+++ b/media-libs/aubio/aubio-0.4.9-r3.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE='threads(+)'
+inherit distutils-r1 waf-utils
+
+DESCRIPTION="Library for audio labelling"
+HOMEPAGE="https://aubio.org/"
+WAFVERSION=2.0.27
+WAFTARBALL=waf-${WAFVERSION}.tar.bz2
+SRC_URI="
+	https://aubio.org/pub/${P}.tar.bz2
+	https://waf.io/${WAFTARBALL}
+"
+
+LICENSE="GPL-3"
+SLOT="0/5"
+KEYWORDS="~amd64 ~loong ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( double-precision libsamplerate )
+	doc? ( python )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	ffmpeg? ( >=media-video/ffmpeg-2.6:0= )
+	fftw? ( sci-libs/fftw:3.0= )
+	jack? ( virtual/jack )
+	libsamplerate? ( media-libs/libsamplerate )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	sndfile? ( media-libs/libsndfile )
+"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-text/txt2man
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="${DISTUTILS_DEPS}"
+
+DOCS=( AUTHORS ChangeLog README.md )
+PYTHON_SRC_DIR="${S}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-docdir.patch
+	"${FILESDIR}"/ffmpeg5.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e "s:doxygen:doxygen_disabled:" -i wscript || die
+
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
+
+	# ERROR: "Skipped: no test sounds, add some in 'python/tests/sounds/'!"
+	rm python/tests/test_source.py || die
+
+	if ! use test; then
+		sed -e "/bld.*tests/d" -i wscript || die
+	fi
+
+	# update waf to fix Python 3.12 compatibility
+	sed -r \
+		-e "s:(WAFVERSION=).*:\1${WAFVERSION}:" \
+		-e "s:(WAFURL=).*:\1'${DISTDIR}/${WAFTARBALL}':" \
+		-e 's:^fetchwaf$:cp "${WAFURL}" "${WAFTARBALL}":' \
+		-i scripts/get_waf.sh || die
+	emake expandwaf
+}
+
+src_configure() {
+	python_setup
+
+	local mywafconfargs=(
+		--enable-complex
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable doc docs)
+		$(use_enable double-precision double)
+		$(use_enable fftw fftw3)
+		$(use_enable ffmpeg avcodec)
+		$(use_enable jack)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable sndfile)
+	)
+
+	use double-precision || mywafconfargs+=( $(use_enable fftw fftw3f) )
+
+	waf-utils_src_configure "${mywafconfargs[@]}"
+
+	if use python ; then
+		cd "${PYTHON_SRC_DIR}" || die
+		distutils-r1_src_configure
+	fi
+}
+
+src_compile() {
+	waf-utils_src_compile --notests
+
+	if use python ; then
+		cd "${PYTHON_SRC_DIR}" || die
+		distutils-r1_src_compile
+
+		if use doc ; then
+			# No API function available for this use case
+			pushd "${S}"/doc &>/dev/null || die
+			python_setup
+			LD_LIBRARY_PATH="${S}/build/src:${LD_LIBRARY_PATH}" \
+			PYTHONPATH="${S%%/}-${EPYTHON/./_}/lib${PYTHONPATH:+:${PYTHONPATH}}" \
+			emake dirhtml
+		fi
+
+		cd "${S}" || die
+	fi
+}
+
+src_test() {
+	waf-utils_src_compile --alltests
+
+	if use python ; then
+		cd "${PYTHON_SRC_DIR}" || die
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	 LD_LIBRARY_PATH="${S}/build/src:${LD_LIBRARY_PATH}" eunittest python/tests
+}
+
+src_install() {
+	waf-utils_src_install
+
+	if use examples; then
+		# install dist_noinst_SCRIPTS from Makefile.am
+		dodoc -r examples
+	fi
+
+	if use python ; then
+		cd "${PYTHON_SRC_DIR}" || die
+		DOCS="" distutils-r1_src_install
+		newdoc python/README.md README.python
+	fi
+
+	if use doc; then
+		dodoc doc/*.txt
+		docinto html
+		dodoc -r doc/_build/dirhtml/.
+	fi
+
+	find "${ED}" -name "*.a" -delete || die
+}
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 760772bc30b1..b647f20656a7 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -10,10 +10,12 @@ DIST openexr-3.1.12.tar.gz 20540857 BLAKE2B 94a78e4e45f892b56f9a05cabad5cea999ff
 DIST openexr-3.1.5.tar.gz 20327926 BLAKE2B 77ece3c62b34292d4714873149a5a54a47fe811e96f992f1082e7dca99ad7717649f937c2dd7b18011c4201f15056526fc4b706c4d2f1b7fa593b9f1ed6314bd SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c
 DIST openexr-3.1.7.tar.gz 20494812 BLAKE2B 2cc03ed8da77f4a9523b7a0f55c78e78ab55f8f6de67cb68f1b2b4ad4b512448d80f39d60a0cc9eab451da35539027a573a0c6d6900e7f81b39f90703909b5af SHA512 f72f5e728f10c06fca0172c9b4c1df752225c3aed7384b4eaa502f92f8547bb1df93fe96d4d132a81eb32b729cb9fd615be825aa6c5de78481d3038c0d47c4d5
 DIST openexr-3.2.3.tar.gz 18855303 BLAKE2B 4f5dbd9033031e988e973ef039b67632ac92e1272cc1d3e4540992f09f6b275c3ecb4c8f690cd98620519993099d132b43bb4bb40bb0d11caa06db868404015a SHA512 6e0a6fdcfae57c6e8b060d9aeed57140d96d39bffe5e40edd6ea5beb06e569323833d07906316ffca05f48e8409d0ea4174e2cd84d554404a4ee432e07d7b5e6
+DIST openexr-3.2.4.tar.gz 18856440 BLAKE2B f29910b2e36808b741860bf603571f607ca929672b3c5b9de7c7c16242f2a38d02627614c10e7b01a8cfd8804923636eb0dfe2c798ec3ff63252dd20e3f8e535 SHA512 ecc3d8b206bda5e5897ac9cd797a8432b76981de10d49cbb107af2b4108c22186de0dda25a9a43b07e18d641ef71508445d95f659a4ca932e029d48ee029a492
 DIST openexr-images-1.0.tar.gz 252222962 BLAKE2B d57c458dfbd1b08c964429022b6e08a3309bf11cbd43c64e271ebc620dae6dbe70636e5221f47dabd7fe2aa0806f2cf3f3c9b3f55fd7f45b0a34f3e62b6029e7 SHA512 c1c83a26cd326d0fcda824daccb0044abad46f29e1bd2ceb1c38bc62b3e71f0aeef126dddc4517eb1cb9f7c9d0fe234276a48a754bdb7c7823e9aee459d8670a
-EBUILD openexr-3.1.11.ebuild 1880 BLAKE2B dd7d09c4fd911b7f7a2738636e507f3cec991b6dc1f8484b6be081f25eb4dbac92c2ef5a8de957172d43e732a9e1ad0fa6ab3e751d822178c20d3073c927f152 SHA512 fa177bdc3a9550420927dd9e6002df468520e76cbd0ce07c9038b7336e40067c1b699def09f05ccc12a7c0e24484c809ec6e3ac7dcff6b53cefb65346de73334
-EBUILD openexr-3.1.12.ebuild 1882 BLAKE2B 2f3cdb3ab5d11f88bb9d761e1b7c76bfb2466549679ee42fd7d0581f303dc01a7d014b39626677aaa2882feb01340845db9b3e1e7971baee62b028d4c5133c03 SHA512 aa1ff62a47fc6a6119d9f3d39fa122b7c3753a0f07384eba6c969ebd67e423b50716add203390a27c00af237c0407aa22b73bc36ab734a48265b26a5c7fae0d4
+EBUILD openexr-3.1.11.ebuild 2065 BLAKE2B e0c0fdcdd04715324b708c5096fa9e5a6d71a9c72d2fe95b776981d2be9eaa2c438d26ca0ba45a436a662ddb37810f752c44560407a00effa99526462295fa3d SHA512 4b3fbdcc7fd97167f855d66def172129ccea5b73935c8f1ab378c7b05fa18fed35d0f06905e182215c9c1a9e60ee2fc6a9daf5b507c444fc6809cc34aa7a371a
+EBUILD openexr-3.1.12.ebuild 2068 BLAKE2B 152d93c66f05c1ec9b83f9631e9984f0a5a4f39abcd7063b19756d4f0f8e9aef1d91301cd95018feca57c763558faedfe78ba07bec5f7517cf3c8c07925fbc19 SHA512 a24d130a7dd6207ae1da95cf2a04fbfbeb1188179a2f9e1c838d2a58ea502a4b0398bdbb2d9666f25926c424f24e6b940c7ec1daeabe2c7439398ce4571fcec2
 EBUILD openexr-3.1.5-r1.ebuild 2067 BLAKE2B 5def6ac36362ea8d8810bd2056df16ca57e658e83eb2a0ae6846cc322ae0be41f8c76dad1498947ed8b44fad9fac46a598e1cf173395c1a9946719f2359743b2 SHA512 9b7f62c74c723fe18766db36e4f75623818c8d2697d23f24c742061280a373fef973cc5478bd8a27492aa82249f189bdcc4c395854199d910e54d91033755174
 EBUILD openexr-3.1.7.ebuild 1924 BLAKE2B 1ae6aeb5a4693d21d798b6260fb2b485044dcfa33820f328f81993f7d3fa6a7ba98c12f183dda3b58fc8d99c3785c5e5d15acdab03d6fe2c9b19bbe76905e5cc SHA512 df60600d657768a811a5b62cb3f77c0fca177ea595b2895c7e62d797fc147f8ef0551512b67ef80d0b0ece156de143bf36e7dd20dbc88f276f879d95fb8e58e8
-EBUILD openexr-3.2.3.ebuild 3472 BLAKE2B 498639ebf04775c31aa5fb7f00eb65e5b53ce4e38a3f27f536206e6905f79818f5aa68ae75fe706a015bf771968f9af7601d9274a6cbdd4018c40aa2b8eb1d45 SHA512 5dc0e7dac940f9a50d903c2743439e472f48a8e5a301cf664d6bc6c3829f8d6839ed5046b4f8a5cbf7a88a0f4ff8a4020ad69c906154a4e9769c234512bfa79f
+EBUILD openexr-3.2.3.ebuild 3578 BLAKE2B 0c0c031a5d51ffc6779a6a37c6fb55778023c094df2af374c672d67a807d5291e9b49e87285b0a020ae600c138a8ec4210cd93f2729d57a8f4acd19f999f2e01 SHA512 d40057a90a5c44b1bb6dffbaac88f182e65d3b8ff137017f356c1fe4f7150c21a47c091555ec183bcb868827dc6a183f43d38086f10d6aa9b978e7bed6f26d3a
+EBUILD openexr-3.2.4.ebuild 3581 BLAKE2B add5ee44ca12bac0c81fde17fe61c9999b735a140c5e810ea435a473465a6a8a95c099e0d4ac2c190cf5ed527d450855e66147dcc46c72f08803ad951bf33d83 SHA512 f45267a61b2b6a68943b64cc99867730c51935c9f272859fdec028696556d3cd0c5b375727bad4973b643965f948b2c9571e52763861ea39dba2007da1ff4717
 MISC metadata.xml 798 BLAKE2B d780a0ead28144e6031fedeed720d1cd79bfa8ab54a1f9d2a99324ac6db4948cf25ebf73abd630d7e697b8578ef5b6442679ce05d1949784fb8a17ed2a6fb9a1 SHA512 5c9d837a72b41c0d8463ffadd639fde0c9dc620abf4b51ef7718efed5d94a12a336d85f10d65e2fbffd3d4c59fe12a09e71f42f68d081917f4d7f1aba24de893
diff --git a/media-libs/openexr/openexr-3.1.11.ebuild b/media-libs/openexr/openexr-3.1.11.ebuild
index 71969a113652..4b0af468a73a 100644
--- a/media-libs/openexr/openexr-3.1.11.ebuild
+++ b/media-libs/openexr/openexr-3.1.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/
 LICENSE="BSD"
 SLOT="0/30" # based on SONAME
 # -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="amd64 ~arm ~arm64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="cpu_flags_x86_avx examples large-stack utils test threads"
 RESTRICT="!test? ( test )"
 
@@ -62,6 +62,18 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_test() {
+	local CMAKE_SKIP_TESTS=()
+
+	use arm64 && CMAKE_SKIP_TESTS+=(
+		# bug #922247
+		'OpenEXRCore.testDWAACompression'
+		'OpenEXRCore.testDWABCompression'
+	)
+
+	cmake_src_test
+}
+
 src_install() {
 	use examples && docompress -x /usr/share/doc/${PF}/examples
 
diff --git a/media-libs/openexr/openexr-3.1.12.ebuild b/media-libs/openexr/openexr-3.1.12.ebuild
index bc37e4bd424e..de6cba52a4ee 100644
--- a/media-libs/openexr/openexr-3.1.12.ebuild
+++ b/media-libs/openexr/openexr-3.1.12.ebuild
@@ -62,6 +62,18 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_test() {
+	local CMAKE_SKIP_TESTS=()
+
+	use arm64 && CMAKE_SKIP_TESTS+=(
+		# bug #922247
+		'OpenEXRCore.testDWAACompression'
+		'OpenEXRCore.testDWABCompression'
+	)
+
+	cmake_src_test
+}
+
 src_install() {
 	use examples && docompress -x /usr/share/doc/${PF}/examples
 
diff --git a/media-libs/openexr/openexr-3.2.3.ebuild b/media-libs/openexr/openexr-3.2.3.ebuild
index 94f5c11c87d6..146862dea6dd 100644
--- a/media-libs/openexr/openexr-3.2.3.ebuild
+++ b/media-libs/openexr/openexr-3.2.3.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 LICENSE="BSD"
 SLOT="0/31" # based on SONAME
 # -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="amd64 ~arm ~arm64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads"
 REQUIRED_USE="doc? ( utils )"
@@ -125,13 +125,18 @@ src_configure() {
 }
 
 src_test() {
-    local CMAKE_SKIP_TESTS=()
+	local CMAKE_SKIP_TESTS=()
 
-    use x86 && CMAKE_SKIP_TESTS+=(
-        '^OpenEXR.testDwaLookups$'
-    )
+	use arm64 && CMAKE_SKIP_TESTS+=(
+		# bug #922247
+		'OpenEXRCore.testDWAACompression'
+		'OpenEXRCore.testDWABCompression'
+	)
+	use x86 && CMAKE_SKIP_TESTS+=(
+		'^OpenEXR.testDwaLookups$'
+	)
 
-    cmake_src_test
+	cmake_src_test
 }
 
 src_install() {
diff --git a/media-libs/openexr/openexr-3.2.4.ebuild b/media-libs/openexr/openexr-3.2.4.ebuild
new file mode 100644
index 000000000000..915a3cbda2ae
--- /dev/null
+++ b/media-libs/openexr/openexr-3.2.4.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+MY_PN=OpenEXR
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="https://openexr.com/"
+SRC_URI="
+	https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	test? (
+		utils? (
+			https://github.com/AcademySoftwareFoundation/openexr-images/archive/refs/tags/v1.0.tar.gz
+			  -> openexr-images-1.0.tar.gz
+		)
+	)
+"
+
+LICENSE="BSD"
+SLOT="0/31" # based on SONAME
+# -ppc -sparc because broken on big endian, bug #818424
+KEYWORDS="~amd64 ~arm ~arm64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads"
+REQUIRED_USE="doc? ( utils )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/libdeflate[zlib]
+	>=dev-libs/imath-3.1.6:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( sys-apps/help2man )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-bintests-iff-utils.patch"
+)
+
+DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md )
+
+src_prepare() {
+	# Fix path for testsuite
+	sed -e "s:/var/tmp/:${T}:" \
+		-i "${S}"/src/test/${MY_PN}Test/tmpDir.h || die "failed to set temp path for tests"
+
+	sed -e "s:if(INSTALL_DOCS):if(OPENEXR_INSTALL_DOCS):" \
+		-i docs/CMakeLists.txt || die
+
+	cmake_src_prepare
+
+	if use test && use utils; then
+		IMAGES=(
+			Beachball/multipart.0001.exr
+			Beachball/singlepart.0001.exr
+			Chromaticities/Rec709.exr
+			Chromaticities/Rec709_YC.exr
+			Chromaticities/XYZ.exr
+			Chromaticities/XYZ_YC.exr
+			LuminanceChroma/Flowers.exr
+			LuminanceChroma/Garden.exr
+			MultiResolution/ColorCodedLevels.exr
+			MultiResolution/WavyLinesCube.exr
+			MultiResolution/WavyLinesLatLong.exr
+			MultiView/Adjuster.exr
+			TestImages/GammaChart.exr
+			TestImages/GrayRampsHorizontal.exr
+			v2/LeftView/Balls.exr
+			v2/Stereo/Trunks.exr
+		)
+
+		mkdir -p "${BUILD_DIR}/src/test/bin" || die
+
+		for image in "${IMAGES[@]}"; do
+			mkdir -p "${BUILD_DIR}/src/test/bin/$(dirname "${image}")" || die
+			cp -a "${WORKDIR}/openexr-images-1.0/${image}" "${BUILD_DIR}/src/test/bin/${image}" || die
+		done
+	fi
+
+}
+
+src_configure() {
+	if use x86; then
+		replace-cpu-flags native i686
+	fi
+
+	local mycmakeargs=(
+		-DOPENEXR_CXX_STANDARD="17"
+
+		-DBUILD_SHARED_LIBS="yes"
+		-DBUILD_TESTING="$(usex test)"
+		-DBUILD_WEBSITE="no"
+
+		-DOPENEXR_BUILD_EXAMPLES="$(usex examples)"
+		-DOPENEXR_BUILD_PYTHON="no"
+		-DOPENEXR_BUILD_TOOLS="$(usex utils)"
+		-DOPENEXR_ENABLE_LARGE_STACK="$(usex large-stack)"
+		-DOPENEXR_ENABLE_THREADING="$(usex threads)"
+
+		-DOPENEXR_INSTALL="yes"
+		-DOPENEXR_INSTALL_DOCS="$(usex doc)"
+		-DOPENEXR_INSTALL_PKG_CONFIG="yes"
+		-DOPENEXR_INSTALL_TOOLS="$(usex utils)"
+
+		-DOPENEXR_USE_CLANG_TIDY="no" # don't look for clang-tidy
+
+		-DOPENEXR_FORCE_INTERNAL_DEFLATE="no"
+		-DOPENEXR_FORCE_INTERNAL_IMATH="no"
+	)
+	if use test; then
+		# OPENEXR_RUN_FUZZ_TESTS depends on BUILD_TESTING, see
+		#   - https://bugs.gentoo.org/925128
+		#   - https://openexr.com/en/latest/install.html#component-options
+
+		# NOTE: the fuzz tests are very slow
+		mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS="ON" )
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	local CMAKE_SKIP_TESTS=()
+
+	use arm64 && CMAKE_SKIP_TESTS+=(
+		# bug #922247
+		'OpenEXRCore.testDWAACompression'
+		'OpenEXRCore.testDWABCompression'
+	)
+	use x86 && CMAKE_SKIP_TESTS+=(
+		'^OpenEXR.testDwaLookups$'
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	use examples && docompress -x "/usr/share/doc/${PF}/examples"
+
+	cmake_src_install
+}
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 6de42affff1e..1ab2190ead23 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -35,5 +35,5 @@ EBUILD openimageio-2.4.16.0.ebuild 6279 BLAKE2B 82ad95094099201dbeedfd58a198e9b7
 EBUILD openimageio-2.4.6.0-r1.ebuild 5655 BLAKE2B 1347ac2ce140d8e0bbbb090735d503b301ec77ce5e889f84a924a0420a193c03f16016f9b86230a90b051a18234d4af75a00da14fc1da3caa58d7120d134066a SHA512 e980fc817a226973f7f362d9b22c0ba2d3390ab1b5a672b3bd06c6de446dc7a8c2015ee6d1d720fdcfeae6191b233d1fb48dc31ddd9ed3fac427bfbae9e44505
 EBUILD openimageio-2.5.4.0.ebuild 6241 BLAKE2B 247558a823639e6b7a1b75320c6997404a1c68f6edde9796fec05344edfcc485e11dff9d0d27fcd948283df7ecf0d453d7df2adaf26658ba6ebea11e89f4c901 SHA512 7ff883324ec33247e25e53e457fbb4601978bc5409b37dfbf7b3aa2c20eb7065b8b81665f732e4b03c384e7ce79617b3c2e63bbd249eed5f67b0d8d7baea4692
 EBUILD openimageio-2.5.5.0.ebuild 6308 BLAKE2B 51fe9d0fd9456ece2dc7eca8c98ca45a84ddb50eb509dbe70e8942360a10dcd15669c9c4413f86a42662fc25955d60de47665eff223736cc889af643d3fd4629 SHA512 471a0bdee8f84182a6404b9fa1f57ebd5335c3e7933e3f28c79ea69c8697fd9f2e65adecae3355c5c99d74d2f34f6c88d431fc558afce0c62b95029e37270e69
-EBUILD openimageio-2.5.9.0.ebuild 7113 BLAKE2B d5ff01d4ae133160b48cf31f85183c15dabd7193375f6e6e638f132a942ec1be4817bc2dc4d68bc3dac80dc625e4b0808fdee762a561c4411f93b6cc138614f6 SHA512 b2409a7b691b84cf7555f21a70ca208bcf1c4515bddc43444d6f80414eb02793f2a6ae3485a3b6921cb86f5406bba901a656bfa172b153194c624396f2bc6839
+EBUILD openimageio-2.5.9.0.ebuild 7112 BLAKE2B b7f47974a996bc81e5439f4a7ab84496c06dffe01ee96a33a85415f6b4341d2281b853123b7a4b116d83715ddf21481dd592ca4689426ae84f332e95d3ebac41 SHA512 c0119d58d7a34f0511c3fd7e4a941acd98b271719460b12c6ccbefa9f49ea10b18003f005553a6cc86e6425b57399452cd1b6e52c113c37bb0c63d22ae583885
 MISC metadata.xml 1025 BLAKE2B 0fb315d25d5627709d9fe41c2e1d87320a42d9db3093ddfff742ccc32a37efb965536bf9fe64c5ce5be00bf3960cdd08d676bd2a47efe6d4739aa22e29efbc48 SHA512 68797e28b75e8334924ae96b1872e8ab61b59de9f5220e54656a41f6b4401a385fc1de4028285c2bb292b35e8a059c856ef67eedb3957f1cb9eda6ac7720ac21
diff --git a/media-libs/openimageio/openimageio-2.5.9.0.ebuild b/media-libs/openimageio/openimageio-2.5.9.0.ebuild
index f0f6accc867e..091b7d122581 100644
--- a/media-libs/openimageio/openimageio-2.5.9.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.5.9.0.ebuild
@@ -40,7 +40,7 @@ S="${WORKDIR}/OpenImageIO-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv"
 
 X86_CPU_FEATURES=(
 	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 12a80853bb85..eb1238c3b83d 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -8,6 +8,6 @@ EBUILD osl-1.12.13.0.ebuild 2937 BLAKE2B d0cc000f15b02c06109d3bfeec16423da744b8b
 EBUILD osl-1.12.14.0-r1.ebuild 9769 BLAKE2B d1f775a39538c35f1c71f48cf3632829909267aea2c4fa4ffc3f08b64fe75c90d8c71e44f00271c295e1918b2028c90523c599e74ddae22de576034e5268ad35 SHA512 bfc4af1faec258234b46f914941b068731fadfea032d3dba81e942471d020742612e1e8a892d31f840bab586723c47e75c480559e2dcda455cf92ab0ab5e88c5
 EBUILD osl-1.12.14.0.ebuild 3851 BLAKE2B 18ce77a6deb606691bd3d6f6ba1b5cd58601adfb113f5acc8e62a53f718b19cb9765092f1039ce81ac5f85a90d453e5b4412e304c69700a47dc18a21bfef4259 SHA512 efae1c24a25cf8b67df5ac3281103b37b6ec9694d6bb33aab78a44382f4e51079debfd16e6677091b2dfdb768937ad17be8948aaa2e1d0d7299e37adcad28924
 EBUILD osl-1.12.7.0.ebuild 2761 BLAKE2B b70f2c5c5d7a8cd3d5031f35562e3266d21e5212a53ca5ea2ea4c8d2476651095e6140c6490648ab0fcc2c629e81d4ec628155bbea8d78899446e906596d065d SHA512 daede9ce4d5d366bcba462adfad893fe19d9d41b05adc807632b9d67422b452170a2cb453fefba826877f4bbafc4639311aab457f16ffc324b66f8688c0e517c
-EBUILD osl-1.13.7.0.ebuild 11689 BLAKE2B 05428db2b6abd3729d8830623486800079f01fe8707e9d9dd8885f512f4d112ca374f2191f430dfaf1c41002794eb5fbdf86ca5c243ee3a1371b58c39d861c09 SHA512 786adef60d92287e3dcc2070f3bda8252b7a3da838d5cfed035e8a90679a73a2a371a5bc7db44ba606eb265972517aea38632ca1d9e2f4fa1bc96fb10163b3af
+EBUILD osl-1.13.7.0.ebuild 11688 BLAKE2B 3b01aebbe3554756e20a42e1c2bc077ca143450b5f4465007451b48a7d075319a4e033bc6b6ce3ea2622d96d82af8098ba59b15a87327b2bd5a2c286cc034c39 SHA512 0e6a1f57c24176f62b5e37940641a0df55ad5cf316beacd0399d25bf1377039ae1bf1f773e7a8d0341e390ee29876de3352c14fe007ef0c649cf990cb73ff4f3
 EBUILD osl-9999.ebuild 11412 BLAKE2B 8eba646ab0607806e4ddd027d42474c100f7236dde0e80835cffdbd9f7f195880e07d0da5ea29c81e8f4045dbe5210b9bb166c02f52f9ac5f6746c9e99b39a06 SHA512 8439688fab91350530eae23181cf148289681258cf9383abd9c0203ba0d89179c33947c389ffed71c3a9a5a2c4ccc75fb39f6967962a807e6b99d2efcc67ca2c
 MISC metadata.xml 1162 BLAKE2B 56fc654915ef7d354844d8b9d99cbe1e2fa8ece1bf3ee2028847d8add16c663cab3110598ae78b7da05c6f3b06bc0926ff1797827c5b2750c03ec02d4c5effe2 SHA512 6e391782385aca530fb9526dd4675845aefd42d760555a7633b0daec2d2890e5d2ce93f39b4c297c1f1056e2c4607c228baba4a1875f05c47362abeb50455dba
diff --git a/media-libs/osl/osl-1.13.7.0.ebuild b/media-libs/osl/osl-1.13.7.0.ebuild
index b43492c6caca..404090f7e9f3 100644
--- a/media-libs/osl/osl-1.13.7.0.ebuild
+++ b/media-libs/osl/osl-1.13.7.0.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]] ; then
 else
 	# If a development release, please don't keyword!
 	SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
 	S="${WORKDIR}/OpenShadingLanguage-${PV}"
 fi
 
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 19883e26d2fb..231da5abbd11 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index fa75957eaab4..6ae98033ed9b 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,5 +1,3 @@
-DIST abcMIDI-2024.03.21.zip 633558 BLAKE2B 7ef0dc301b7584164a4c761d9f232c15269f39d0b23ddf980f2bfede1beb6bff571cc5a38758fbf69c909357ec35fa603490f1a87a6edf1c92715f69668d43f3 SHA512 0b156621839947fc158f813bed87c09198358b7bf29161ca7a08a4fef76b9f3786bf78780170c4fd3580d82818a8379d22dc9fd2604cce8ad138df73d1f21497
 DIST abcMIDI-2024.04.30.zip 633484 BLAKE2B 39935e46647556e2de2f920bb2ae4eebc8497827f22f950f7f6473cec4145009e5f6d31649c9e560424102bbd926684b338539076d157974c16abae978673d27 SHA512 95f78bb6d88f285ce74febb8937921a6c4740902caf1dc67cfca0c1a934636035792a0c5426ead46c85745e5900905e5530d9ab7feaa6107e7c6b10eeeb36aef
-EBUILD abcmidi-2024.03.21.ebuild 842 BLAKE2B 55bd4449eefe4c0860ae462842dd378a99a09af0b65d48947eae1d32053f93260e35e02e03455422cd62657c966723e42243bb291f9a2719daa83bf41988e7fe SHA512 434499075ba0ddbf9f75291dd229dcada503b62aaa7b7c6e408d15412302f7d4a6a22fb3302daf53c8ef06bb139988d6806a559d8aae8b154308fb5b480edc9b
 EBUILD abcmidi-2024.04.30.ebuild 842 BLAKE2B 55bd4449eefe4c0860ae462842dd378a99a09af0b65d48947eae1d32053f93260e35e02e03455422cd62657c966723e42243bb291f9a2719daa83bf41988e7fe SHA512 434499075ba0ddbf9f75291dd229dcada503b62aaa7b7c6e408d15412302f7d4a6a22fb3302daf53c8ef06bb139988d6806a559d8aae8b154308fb5b480edc9b
 MISC metadata.xml 382 BLAKE2B c115548ee2b0caa47535aeeda6dfac2666bdd08aa444d1a39f2ba829ccbfaabfefc0c94a1fc0d59a72c17d6cea045531c13b66c449c40351432ad4830ced6c1d SHA512 ba8f57a005267fda3d71bf26cbaffb4cd16bcdd6811a4b618140d6d56dd0b16477d02d66ebd86b93bebd52a22cd554d9bb4ca8e9c2bf865e4c95a8c1205922af
diff --git a/media-sound/abcmidi/abcmidi-2024.03.21.ebuild b/media-sound/abcmidi/abcmidi-2024.03.21.ebuild
deleted file mode 100644
index 45b003914d76..000000000000
--- a/media-sound/abcmidi/abcmidi-2024.03.21.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic
-
-MY_P="abcMIDI-${PV}"
-DESCRIPTION="Programs for processing ABC music notation files"
-HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
-SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
-S="${WORKDIR}"/${PN}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-BDEPEND="app-arch/unzip"
-
-src_prepare() {
-	default
-	sed -i "s:-O2::" configure.ac || die
-	sed -i "s:@datarootdir@/doc/abcmidi:@docdir@:" Makefile.in || die
-	eautoreconf
-}
-
-src_configure() {
-	# -Werror=lto-type-mismatch
-	# https://bugs.gentoo.org/876421
-	# https://github.com/sshlien/abcmidi/issues/9
-	filter-lto
-
-	default
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.abc
-	fi
-}
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 57865de4a582..94405926df7e 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,4 +1,3 @@
 DIST grip-4.2.4.tar.gz 1212479 BLAKE2B 58203a4faca90e8662347a5f67b7e026c2235ed53c5dbfe351faf4027608eb9e9c7b106907f2abb0dfffd4d01da33eeb334d2500c7f359314c003dc881e1a863 SHA512 fdc2808b91df617f4d2447114037c31bd5fa0657aa4ea2453e644b155468971c65a364bb0a3c6ed8ff2ba0e44e7117a51bec3081c7defd590f9fbc802a216bf5
 EBUILD grip-4.2.4-r1.ebuild 966 BLAKE2B 04f19db3eef52126b861daf40ec5baeffcc7ef54285258cf7523996e8eff7c421cf8f845e755b9edfc31ca367d83289f46e3f8edd527e3f41e6e5ea830cb5e08 SHA512 686ce1bf3f07e5a08bebb8791c998c89dd344fe712a609321f3f285f38708f504b6de8218812ed94dc435a117f785690c968fc5418110106631ba34c7427e6a5
-EBUILD grip-4.2.4.ebuild 1090 BLAKE2B 458816fcbedc50247873472dd121563f25ef040b8bcea3e8fc9b0610729c6319b250b07f293143506af86187550befec8a397b7fed4d27d964378e74baee16fb SHA512 d17dcdd31730d6b48b98a6a44bbccaab9527d0e40ae39e79501c5d1c93484ce0c4ae6788faa600fdf691b07cfcff3ec62a28369ed0cde22a338f98d1ab426b3b
 MISC metadata.xml 328 BLAKE2B 069257071d00003496464c8990afebb2d35428231b1b787ff65237c6ddf69c40c6f402939696915d781d21c13fd823183e0c2266b26176f9e58ce47324f07bfc SHA512 e6d401ccb1682cf890600714a33d51650901e9c4724b0b08bad99c2c85a17571fb877489e8f4ae33b1db760c5de5f9150ebf4fb6ab50303186402fad624b6d86
diff --git a/media-sound/grip/grip-4.2.4.ebuild b/media-sound/grip/grip-4.2.4.ebuild
deleted file mode 100644
index 44af0358ab3a..000000000000
--- a/media-sound/grip/grip-4.2.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit flag-o-matic toolchain-funcs xdg strip-linguas
-
-DESCRIPTION="GTK+ based Audio CD Player/Ripper"
-HOMEPAGE="https://sourceforge.net/projects/grip/"
-SRC_URI="https://downloads.sourceforge.net/grip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="vorbis"
-
-# lame and vorbis-tools are no real RDEPENDs. But without them
-# grip cannot convert ripped files to any format. So use them as
-# a sane default.
-RDEPEND="
-	!app-text/grip
-	dev-libs/glib:2
-	media-libs/id3lib
-	media-sound/cdparanoia
-	media-sound/lame
-	net-misc/curl
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/pango
-	vorbis? ( media-sound/vorbis-tools )
-"
-# gnome-extra/yelp, see bug 416843
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# Bug #69536
-	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
-
-	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
-
-	econf
-}
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 0868d6afa3b2..bfb94cba833c 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,9 +1,5 @@
 AUX qjackctl-0.9.13-disable-git.patch 503 BLAKE2B d46a307dd6fcf62b51b4172a7e88ff71cf632646e28fd26857cb0bc4b9cdcd5c11260a197b10ffc4362d77bd319524bac2985bef2faf03e97d0c899dd24fcd16 SHA512 0bdc675bd9c82a45f3633342a1669bfa4d545e31122c915ff21256e7653bb1b5f33fc77341c1a9ca568912327e7f5380b27278f63914e123484d80935a27f3d9
-DIST qjackctl-0.9.13.tar.gz 1305333 BLAKE2B 940241df829a573ab33a950319debf5123538151853723141369b9ac47048bae84c58f3a70fe53ec7f98109914e78c49203410e241db22842c4f41f79ab6aba9 SHA512 89b9d5212654267030f30020085ad3dfe674a041e200796144d1441ba12630e963a06e405de5ab7c27d9ebc42fd8fa0a970bf59b91837dbc7580147db6adc9bc
-DIST qjackctl-0.9.90.tar.gz 1306770 BLAKE2B 213d66848640271a2dfc8e00b490c722311ee47653a23fc0f6c82267cebbe869a6546de523a3d6d0b81111559879f87f91f146828620264eacbddab23992aff9 SHA512 8e4840278576476b1ad8c36147773cb8ef38e1cf4959dd883d965a97897b53dea9166086969355b6b1b1776f5331e30aff6c109d2aa0cfc2d60ad622df9b8436
 DIST qjackctl-0.9.91.tar.gz 1312312 BLAKE2B db7dbffd55bb94b5bbd43fb68e9ffc00d47cab90773b8e4e9d386d84a365be71dee8d6ff480fb888fd70024a1467317554745bbc2ff433931a87cf4e7923e9fe SHA512 b4b7ef5619fde94b9b6e840477339972aa97906b0e1eceb2918de3d19dbf96bbea6b119bce7881143a533666967c646328ff887bdae7a5c21f0300951abd2afe
-EBUILD qjackctl-0.9.13.ebuild 1008 BLAKE2B 1ec2ffb41f8547db96bb48b4d76b852d1113f1412a6da07f97caf2dce6087999ad51e4b369716362c98cbcb506e5c16b5c9853b06d0df8cacfdd48fa83739ead SHA512 462f339e40a8302f9838e51d8f1241ca6d8d82185d8f0f2171fb73d87822b852f25dafd3f26deaff618ae2d5682565ee274d0d158552eff44f46b39304200d2e
-EBUILD qjackctl-0.9.90.ebuild 1010 BLAKE2B 48dcbd5d6e79b3515afb7ff0d45f2d1e91d403440b7c58a7515a6764658ea84466c2c3449195ac28793715de78e98047b05d67305160e02fa33ade6bd3d0cb83 SHA512 071f43972f2991ca0a371e1e56e8d77c0ecdc61c90a99b5a7380b69eb70ce27dbfbcdb1eb5c3ca6c01be6014635f6c1d96ef72a781172c259ee184fe29b1eeec
 EBUILD qjackctl-0.9.91.ebuild 1008 BLAKE2B 1ec2ffb41f8547db96bb48b4d76b852d1113f1412a6da07f97caf2dce6087999ad51e4b369716362c98cbcb506e5c16b5c9853b06d0df8cacfdd48fa83739ead SHA512 462f339e40a8302f9838e51d8f1241ca6d8d82185d8f0f2171fb73d87822b852f25dafd3f26deaff618ae2d5682565ee274d0d158552eff44f46b39304200d2e
 EBUILD qjackctl-9999.ebuild 926 BLAKE2B e7d605b036d205a43319d6559c0a918e347436e3e932d8002f3dffe6e56ef8563ca32efb6bd731802e8c1c066716f3e21a0896ac8b107f6c9361656f7ac3b556 SHA512 eceec774ffc46b565ad7398844febfee6c6c3ba65bc523072d81de91f84065f9507c93b4b18f9e63abc794a2814aa0f2bfab2a70f48afbaec07484d9530892e9
 MISC metadata.xml 338 BLAKE2B 74efc1853779388695ea14b6ccbe8e22d88941b8fcb845f553c02bd9e052f5638b2f4629dd238272a20b76db17f0d1f30a454a4b9a27333eb1e80b8d826c0dfd SHA512 bf18f336710191bc34b33b34f3f39435a9f3c9d7c45cef4e5b0ad39c19f4a9b27ee032dd2dbf6c57daaa90ad5f9adce40c49230850b6c1d746d0691eaf5ebb10
diff --git a/media-sound/qjackctl/qjackctl-0.9.13.ebuild b/media-sound/qjackctl/qjackctl-0.9.13.ebuild
deleted file mode 100644
index 8b1ca524e452..000000000000
--- a/media-sound/qjackctl/qjackctl-0.9.13.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg cmake
-
-DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="https://qjackctl.sourceforge.io/"
-SRC_URI="https://downloads.sourceforge.net/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa dbus debug portaudio"
-
-BDEPEND="dev-qt/linguist-tools:5"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	virtual/jack
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
-	portaudio? ( media-libs/portaudio )
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.13-disable-git.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_ALSA_SEQ=$(usex alsa 1 0)
-		-DCONFIG_DBUS=$(usex dbus 1 0)
-		-DCONFIG_DEBUG=$(usex debug 1 0)
-		-DCONFIG_PORTAUDIO=$(usex portaudio 1 0)
-		-DCONFIG_QT6=no
-	)
-	cmake_src_configure
-}
diff --git a/media-sound/qjackctl/qjackctl-0.9.90.ebuild b/media-sound/qjackctl/qjackctl-0.9.90.ebuild
deleted file mode 100644
index 29b887562b75..000000000000
--- a/media-sound/qjackctl/qjackctl-0.9.90.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg cmake
-
-DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="https://qjackctl.sourceforge.io/"
-SRC_URI="https://downloads.sourceforge.net/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa dbus debug portaudio"
-
-BDEPEND="dev-qt/linguist-tools:5"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	virtual/jack
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
-	portaudio? ( media-libs/portaudio )
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.13-disable-git.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_ALSA_SEQ=$(usex alsa 1 0)
-		-DCONFIG_DBUS=$(usex dbus 1 0)
-		-DCONFIG_DEBUG=$(usex debug 1 0)
-		-DCONFIG_PORTAUDIO=$(usex portaudio 1 0)
-		-DCONFIG_QT6=no
-	)
-	cmake_src_configure
-}
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index 5e6555e91965..03d6ee217e11 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,7 +1,5 @@
-DIST qsampler-0.9.12.tar.gz 219168 BLAKE2B c68fad51b37f4b471e1ffdcb4168487ef0069877ed2c13fd06f320c1a353c146ab493d94522d7ed86a8541646429550a4d02a89d5b37ae44847687acb5400fd1 SHA512 089a177e2d6350880c96e17f7833ef80b94add3535b9cf0418453080c294c51a98b909a4072054c5f0b8ecdf014914966ac7d2e90add984225ec3c9a35a0ca0c
 DIST qsampler-0.9.90.tar.gz 219790 BLAKE2B ccbb9b94eedd200f0f79d22adf8541c49f334249f7b5eeca59a200a70ba9fd633c288a78f486394df3c33983c2be0d313ba0c8ad5e4151b83b9d630c0e7a9d94 SHA512 4ff7663e5ea7cbea34127e242debdf0ac8da1a06e3d8de071fbf9543841819b94c9addb1e368d2bda692269f31503bc52cd47ac7590d96e31866611349ff3aae
 DIST qsampler-0.9.91.tar.gz 219798 BLAKE2B c947e865a62f4e14f701635d434ec6624a81fbcd471929b7ea1d9d841460afa931914937b6f9d863d4bd0759bcfd32da40765bc1d51e8950103f03f8e63a0078 SHA512 8ef9eefa7624d5e4b45a462fdb1fceded51e350ea75aafd5d9939be1d10f0d582d05244f3f73f1aeb9743a630d7a6f06a05ebf602a1e2a54bf542626c386db06
-EBUILD qsampler-0.9.12.ebuild 1122 BLAKE2B 36831ef7d7e6e5aa8163061656a2b356414e54080403426ecf7bec3c78c7b558e41ce5b1bdf8be117ab550a82efcaf2451a9b81959971275704b72f4e8adb274 SHA512 5332411dcb1c1738c3ccb66797cfcc55ffbfa0a90b2557e38213701e9a312087c566edb22f4f203987f045fcf01e303ef13fe2851b3296a915b340cfff41b2a0
 EBUILD qsampler-0.9.90.ebuild 1139 BLAKE2B f5228ee61fe4946a0f116db47237151eb697135fc52b52105f7ac123fc3306c2f37e936860d0c310895e3f362259755dba497bf33bffcfa48a7c767adf888ed9 SHA512 486623f328d732f9d8cf1f21bed737212b7b17ce277715be10441a6d775a1456eb7e6d72489746c18af816b33bf81179438cb52872fa2da3ffd3e1333d591935
 EBUILD qsampler-0.9.91.ebuild 1140 BLAKE2B cbcc56ea839a1c69cd32179146b50be84ae49dc4ab3013416a3e8eb2575fa55a07eff45caa82249432c166e4fb04b1c1108625edb172e8a4ad515f5a39a934e7 SHA512 473c5f4189110b028222f9dcd728c3d391af1516c0bf55ffb5c6f22f504f71e464686989013b12cb7b67bbbb10f455c5ac6594d6f143656b5699589c311d6905
 EBUILD qsampler-9999.ebuild 1140 BLAKE2B cbcc56ea839a1c69cd32179146b50be84ae49dc4ab3013416a3e8eb2575fa55a07eff45caa82249432c166e4fb04b1c1108625edb172e8a4ad515f5a39a934e7 SHA512 473c5f4189110b028222f9dcd728c3d391af1516c0bf55ffb5c6f22f504f71e464686989013b12cb7b67bbbb10f455c5ac6594d6f143656b5699589c311d6905
diff --git a/media-sound/qsampler/qsampler-0.9.12.ebuild b/media-sound/qsampler/qsampler-0.9.12.ebuild
deleted file mode 100644
index eeea4826b161..000000000000
--- a/media-sound/qsampler/qsampler-0.9.12.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code"
-	inherit git-r3
-else
-	SRC_URI="https://downloads.sourceforge.net/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-fi
-
-DESCRIPTION="Graphical frontend to the LinuxSampler engine"
-HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug +libgig qt6"
-
-DEPEND="
-	media-libs/alsa-lib
-	media-libs/liblscp:=
-	x11-libs/libX11
-	libgig? ( media-libs/libgig:= )
-	qt6? (
-		dev-qt/qtbase:6[gui,network,widgets]
-		dev-qt/qtsvg:6
-	)
-	!qt6? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-	)
-"
-RDEPEND="${DEPEND}
-	media-sound/linuxsampler
-"
-BDEPEND="
-	qt6? ( dev-qt/qttools:6[linguist] )
-	!qt6? ( dev-qt/linguist-tools:5 )
-"
-
-DOCS=( ChangeLog README TRANSLATORS )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_DEBUG=$(usex debug 1 0)
-		-DCONFIG_LIBGIG=$(usex libgig 1 0)
-		-DCONFIG_QT6=$(usex qt6 1 0)
-	)
-	cmake_src_configure
-}
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 769d38593380..5c7619e3d3b8 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,7 +1,5 @@
-DIST qtractor-0.9.39.tar.gz 2619142 BLAKE2B 062b363c2db748da731a2b5ee375e1a820bae9ea2d312a2f9f313fc2df11049e86452308c725fff58d7ffd05e916c3d3bbe42e8fd07f10012a34005edf874967 SHA512 3b2a4dde182147d73c773cff0ee6e3d086dd8b598b884a7ca564f10a1fdb56c3e86b3d135739f2629476a587e13b11d4a42abe7c498b76a0321151d9c0ff2852
 DIST qtractor-0.9.90.tar.gz 2647835 BLAKE2B a9bf283f062f946e630e4e878c194326d1cc7028c27dc91dbcb8f8567612d88c4005b73ca9a8270e837b27ea20f419bad4d54d85441338863bf6b7558c07ba50 SHA512 caed9a454e84fd2701c7d37f33bfcff32383127e891af5c2823045f710f953bf2e2040b7261ce5b24b1fc330a06ffb47132fe4b9a378c9cfe3e40f6b4e6f01cb
 DIST qtractor-0.9.91.tar.gz 2633018 BLAKE2B 7ae2ba467ce87e0df6a95e694dbfebbc4cad5551bccdf723ded4f26aa02ade31e666a294eb5c82762fc2918938d96ecd55d9cf062cf4ebc0ec138010e98ce03b SHA512 6628b61b46c18f69a30cd183e7d166581e64b00a117201a60064ce98926908576c8f7c677c39f8f1601ea42b72a04056a85cd915579f96575c080414dc75e011
-EBUILD qtractor-0.9.39.ebuild 2763 BLAKE2B 2018403358298510607ef8d3582fe662523d7cb4e332e1dcac48f277d23f5b1169fd61f2eadf9bbb16370397d7858dec852547a9aa881a30da056a9440389a68 SHA512 1107a45cce944247522bf5504dc649ec71e623133f77005f5901a27bff3fd0dea8f15e8386757339b46ef7d4df974b49489ba6291eb513b31c92182894880389
 EBUILD qtractor-0.9.90.ebuild 2763 BLAKE2B 2018403358298510607ef8d3582fe662523d7cb4e332e1dcac48f277d23f5b1169fd61f2eadf9bbb16370397d7858dec852547a9aa881a30da056a9440389a68 SHA512 1107a45cce944247522bf5504dc649ec71e623133f77005f5901a27bff3fd0dea8f15e8386757339b46ef7d4df974b49489ba6291eb513b31c92182894880389
 EBUILD qtractor-0.9.91.ebuild 2765 BLAKE2B 408b41432b1c81522837c4452df2e4a7754bdf66e259b4ca3db8874ddb1f7ed08cf963388efe0ca61019a598de23933f6e671cb0bec84d574b0fd6250395c210 SHA512 febc34744d896a10f148f088859e467b57e9bbb8564255306a592acba8ddff3a5a3218ddb0459f01b91d5e1a0607254bea3d8b107dd854474e54c4088cf47467
 MISC metadata.xml 945 BLAKE2B 4f88a28c83ce8b2874664ad8bf6a08d5a575a609fab948c47471ed226e284453f87da5b1ae034678295e30e5e1dce357ced317ef5d3ab793e04fb17120ce55b4 SHA512 5ab11543fa297253f5cb15515c16caf967fc69e9cccccb9ac6a6ba26fffce1f8539414edf3b065a61ddce0ff8ce3f04b90a68fd5bb79e0a498ca14c275753947
diff --git a/media-sound/qtractor/qtractor-0.9.39.ebuild b/media-sound/qtractor/qtractor-0.9.39.ebuild
deleted file mode 100644
index f5b5ca1aa5d5..000000000000
--- a/media-sound/qtractor/qtractor-0.9.39.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
-HOMEPAGE="https://qtractor.sourceforge.io https://github.com/rncbc/qtractor"
-SRC_URI="https://downloads.sourceforge.net/qtractor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
-REQUIRED_USE="dssi? ( ladspa )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	media-libs/libsndfile
-	media-libs/lilv
-	media-libs/lv2
-	media-libs/suil
-	virtual/jack
-	x11-libs/libxcb:=
-	aubio? ( media-libs/aubio:= )
-	dssi? ( media-libs/dssi )
-	ladspa? ( media-libs/ladspa-sdk )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	osc? ( media-libs/liblo )
-	rubberband? ( media-libs/rubberband )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/927061
-	# https://github.com/rncbc/qtractor/commit/83ed590eed798f24b6aa1a792b38c2fc61051356
-	#
-	# Remove on next version bump.
-	filter-lto
-
-	local mycmakeargs=(
-		-DCONFIG_DSSI=$(usex dssi 1 0)
-		-DCONFIG_GRADIENT=1
-		-DCONFIG_JACK_LATENCY=1
-		-DCONFIG_JACK_METADATA=1
-		-DCONFIG_JACK_SESSION=1
-		-DCONFIG_LADSPA=$(usex ladspa 1 0)
-		-DCONFIG_LIBAUBIO=$(usex aubio 1 0)
-		-DCONFIG_LIBLILV=1
-		-DCONFIG_LIBLO=$(usex osc 1 0)
-		-DCONFIG_LIBMAD=$(usex mad 1 0)
-		-DCONFIG_LIBRUBBERBAND=$(usex rubberband 1 0)
-		-DCONFIG_LIBSAMPLERATE=$(usex libsamplerate 1 0)
-		-DCONFIG_LIBVORBIS=$(usex vorbis 1 0)
-		-DCONFIG_LIBZ=$(usex zlib 1 0)
-		-DCONFIG_LV2=1
-		-DCONFIG_LV2_UI_GTK2=0
-		-DCONFIG_NSM=0
-		-DCONFIG_QT6=0
-		-DCONFIG_SSE=$(usex cpu_flags_x86_sse 1 0)
-		-DCONFIG_STACKTRACE=$(usex debug 1 0)
-		-DCONFIG_VESTIGE=1
-		-DCONFIG_VST2=1
-		-DCONFIG_VST3=0
-		-DCONFIG_XUNIQUE=0
-	)
-	# Following options are left to the default
-	# CONFIG_LV2_ATOM
-	# CONFIG_LV2_BUF_SIZE
-	# CONFIG_LV2_CVPORT
-	# CONFIG_LV2_EVENT
-	# CONFIG_LV2_EXTERNAL_UI
-	# CONFIG_LV2_MIDNAM
-	# CONFIG_LV2_OPTIONS
-	# CONFIG_LV2_PARAMETERS
-	# CONFIG_LV2_PATCH
-	# CONFIG_LV2_PORT_EVENT
-	# CONFIG_LV2_PRESETS
-	# CONFIG_LV2_PROGRAMS
-	# CONFIG_LV2_STATE
-	# CONFIG_LV2_STATE_FILES
-	# CONFIG_LV2_STATE_MAKE_PATH
-	# CONFIG_LV2_TIME
-	# CONFIG_LV2_TIME_POSITION
-	# CONFIG_LV2_UI
-	# CONFIG_LV2_UI_IDLE
-	# CONFIG_LV2_UI_REQ_VALUE
-	# CONFIG_LV2_UI_SHOW
-	# CONFIG_LV2_UI_TOUCH
-	# CONFIG_LV2_WORKER
-	# CONFIG_LV2_UI_X11
-	cmake_src_configure
-}
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 0eb0cd0097c8..626756efa2a6 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index ee790b452b6b..489363d5cc0e 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -5,6 +5,7 @@ AUX kodi-19.5-flatbuffers.patch 1172 BLAKE2B 35434d6d71296bc4377ccb762d1dc1d73d1
 AUX kodi-19.5-gcc-13.patch 1849 BLAKE2B 1d3183305557b260bad52dbe0bb5828118013c08274861b902c6fa23e86422cc2d49936f125a00d57c29ba0ec7a9001cac53ac499e2ef4345d3a81f143d48c80 SHA512 e2f66f6a0ff4fa1a49a15a185cfbc9a76af8ff4630241a8c01e3de4d1e09f12d2724dc1fa7bb71c1c15e563810babcbb4217635a4e5460b33bbb0a4f81f2e5db
 AUX kodi-20.2-binutils-2.41.patch 3399 BLAKE2B 5608adfb32777371a71091de237e6173c72c272a5911e999c3e4bde6f0c0f788db644ccf1098ddabbbba7e6d2a0d65fbfa7570f6acf83cd351a6e779dd8b7f5f SHA512 aec2995737c78cf4ae3e9a4e9212f0481664fd91eb83e07d0bd354cede014015929628833e8b5a87fb19dda20d30abc5585d676a69bff3ee0111fb1f21bb87e7
 AUX kodi-20.3-gcc-14.patch 2048 BLAKE2B 8b34f1717c8c79c37ec6ccd51fbdbdc3495bb50166a22e1f3494a2d97c104055b187fe1fd84a4d35c125ba3975f4537372deae09666135117419ff02b10f0d42 SHA512 cd9210a573fe59cd822fb564c0aa32e6b3faad87bc79c02ae53740dba87e85f1a2a6429032f3393006e16ac6fb7a81ae18155c87ddd62bdd54680e09a90fa322
+AUX kodi-21-fix-dvd-playing.patch 1706 BLAKE2B d74af009e12eeb00d9402e58620c41c4da842830713fd0f9319d1e884e089a27432eccfc08d583a5d1eaa8fa9bcf4b00ea495e76f93b159a790ef1af3016d7e3 SHA512 b2badfe1fb5ffee0b2119670d205e0ba49005791be879f8d946c018e8f6af58174c1ffc0e85b89914c7858373b03ee5a3703f47af9d5aca11015aa701d149c16
 AUX kodi-21-fix-gcc14.patch 1374 BLAKE2B 5438405a2862328e1207787fad0d153bbfd7f94c5287e825bf0ef7e6a20cbc51185b626f8aba61b0747fb672418fdf5f44e715295a983107ca2ef018e1ad19e3 SHA512 60df712f47b0abc3b7a7247425b4ce4f273bfbadf8b4147883aa3e2432c02724d03c644785748bc3ac6bdf7fb19744ffea40c551420a02865dd83bfdac19f585
 DIST apache-groovy-binary-4.0.16.zip 29793704 BLAKE2B 30f77c6400c85821cf78f6ba1070da1e68644531f85f71cf7695443b13b81393cc89d4103eb869d1523f0a22a6e1c3428dcabf4f79c8a2c6eb2a6dea74e84e8f SHA512 743698979c801f3cfb36545888b5303e1e25dae5692bb45cab7ebbe102a6eda31f09abc6978349ad90ecaf630416fc87eacba7781244855e7e771a3c44041fa0
 DIST commons-lang3-3.14.0-bin.tar.gz 9442785 BLAKE2B 2ecdd06f97ac2688220055a08f67da9b859bed3ab00ff41800d5d9a1cebda599db2e816425c10c265dd6827a0ef79fc3dd094a8b3c9b9ae4ceae8f5750a59cf2 SHA512 8e7e62418a49ba810512c13a640a8bf35f878fcd54af32fdaab1111e37817f58b21b475980ba663fba4887e45ef8d88af8ff17796f20d202e929e8e2574546dc
@@ -13,7 +14,6 @@ DIST ffmpeg-6.0.1.tar.gz 15437409 BLAKE2B 6424e30c6d354abbbea8a807822ae615894131
 DIST ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz 13490949 BLAKE2B 90007f2c4bac0e0a52b419d9333cf75b00e291f1ea7447cbdc579ee2f860de7c436c924253600f3fbd6e3faaabe97aaf46db083a5bbd2f5f03badcca5d643e89 SHA512 d3719253d674b16638b873545583b82fba3176803c81ba8bcb37e90456dd956f1c2ee8996493840cff2d61c6399f06ed0524a759f46e4ce174bce23e9c6eda4a
 DIST ffmpeg-kodi-4.4.1-Nexus-Alpha1.tar.gz 13725564 BLAKE2B 51d310e7000aeba657d55341c5fdb540474e197b85062228ab4b314c8309ec11985aa7f105193333fc6106529e8e58c86eafe268190894be8532d0e0b9065fa6 SHA512 8beb04d577b5251e74b0d52f4d130997a8ba94bbd488c7c8309e6b45095c27807e150212888ce3a384b23dff52f8df1a7bde5407bae924ddc363f8125c0616c5
 DIST kodi-19.5-Matrix.tar.gz 53496968 BLAKE2B 89855e4d59faa5734e945e50267c2ec8d8e8bef91ecfa49ae49dd99f749a59609b55c57821042939082a8f98ea95f7edc3de0fa0494e218d454c67b79807ef87 SHA512 b560c068491a7f62894167da99be082f0e6a8a840cbfe1fb0cef5c844cda959bd3b5479a435b58616bb2a8454083ad393a4d49de05fbbdb0817a0fad9726e52f
-DIST kodi-20.3-Nexus.tar.gz 54567232 BLAKE2B 956be2d1bef16910d88f244331bdff60cce309d9596ec7939a459489b7fa7ab3ca7b29e2aca0de542f48f95321d86c9d7a606ac311a7a3c69e0e6f901511982e SHA512 cdec1383d33f421828f0249ac2929980c6eaa39e345a8a364d9f3479f873029a15f3f6e6d40707fd2df2067a71bdaa3c6a1e26277074c31c631c71afe7465cb4
 DIST kodi-20.5-Nexus.tar.gz 54568445 BLAKE2B 15eb409918fa3768528d9abd24c52fd8b94c82699ef2ce10a529278fe25544dc335b66d137ae8ae304511cd92c1c0be34881937ec705ba936f5a4b0d737903f7 SHA512 a47a54ca11e1d3daeddea8c1ae716cd4461e3441de43a026a920c709b2ff5c7e0acc2a5fd4ac8c15f0da1940bd7f21a65eff32203ad8e167603c1576b21d4dcc
 DIST kodi-21.0-Omega.tar.gz 40987733 BLAKE2B 33adaf588b3362dc9d184bfb66c36ad5fa2e442255da47db4813f926e73f5a607dd7de809ecf8a4982f985bc8dac53cba17fb9db6a009bb0cdb6284db3b1edb4 SHA512 9c2ca6b6e72197d2b1c26a47cf4ddc209318fcaa5a30ea20475ecc5518c7d1395c2e9cf3e3a75a13334b0505e7b417acdb0d76a20567a0c86841b3e69232625b
 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
@@ -23,9 +23,9 @@ DIST libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz 128547 BLAKE2B db4d05836d8fbb363
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
 DIST libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz 110513 BLAKE2B c94feb5a03a12efa5b7767965118d2500a088299ea36f3b82e46d157e45893e6b04503cb50f179ca681bac914457607fab26acfa6e304752b355c407578572d1 SHA512 629a41157d07b8ec0ea1fe89ae5ec48f63047472a862782b805c531ae31a0376fc4dc15175f8280c3ef91d7fa977bacebb1b51232640034a34bab2293210fc5e
 EBUILD kodi-19.5-r2.ebuild 11404 BLAKE2B 0a49eaeeda4e3bacc05b85df0d97a7bca3d29263f5a73493024d3b50d96d164a318acc8d1810a8ad970504cc1efb54caa721caf7825cfea7ff78b5fe4a2518aa SHA512 8af7746280eeefdbe6fa6eabbfa39a653cc3a859d4e1eab20b21fd1a01b2a0f1d6b193c21a24e0e49ab9fa8eb8e00807d2d7ce874327d7fccf4724fca43114b7
-EBUILD kodi-20.3-r1.ebuild 12413 BLAKE2B 0e18e2c0bb31332cae6d24f96d4cf97c7e94e822304538d9a377b757ad3a976b57d0c7a373bc96a1dbbb58f3d988b2f2a8c42dabde7f27b1d51eea8f822a506b SHA512 52a30929d8cc833cc378abca2a4b370b22e074277e8e8aa7f5803ca80e3398eac166f42f85346a312630045a0bd434f43bec69496c7dea287edfd2ca9cac3758
 EBUILD kodi-20.5-r1.ebuild 12413 BLAKE2B 0e18e2c0bb31332cae6d24f96d4cf97c7e94e822304538d9a377b757ad3a976b57d0c7a373bc96a1dbbb58f3d988b2f2a8c42dabde7f27b1d51eea8f822a506b SHA512 52a30929d8cc833cc378abca2a4b370b22e074277e8e8aa7f5803ca80e3398eac166f42f85346a312630045a0bd434f43bec69496c7dea287edfd2ca9cac3758
 EBUILD kodi-21.0-r1.ebuild 13663 BLAKE2B ad00b5aa92c669d534aca6fef5008fbdd60875d1698d751d236f05237565ced7a37b717ea7979f67398476e76033d3817f20ce16bf3be9ed223abc014a791a30 SHA512 0810e05a7808e5d0f369c94662e3894a340ab1528f2d93475f1bf19080c7c410b58ab6a03ef3f857a540db674d6feb9f3f98f10c331c0a825bc8701a937687ba
+EBUILD kodi-21.0-r2.ebuild 13710 BLAKE2B e8864f27a607504257fab3fdc55757ebf39bae55830a633263e60a67d8835be5479b77da09cb1d60f36212db4e2a524dac2af196c76045d52127517627b56c0a SHA512 a89ef2de81b4e19b0e6bdf5738bc9952f38b70e05ae1161add82ecb001643e27fea1134c92a4e4b724f8c0870f8e8475c65523a57d2a6c8071e9e38115a4882a
 EBUILD kodi-21.9999.ebuild 13611 BLAKE2B f35bf1aaf54db47f122de7b1ea651e6ff36ccfc0401f3998d3548e08e4d09f4be6930771c30b09f044fa1d03c64464311ee8190c38c79416b80026187f06c387 SHA512 df1d31caf1657158e1ae38d622c9992b09489e53f14f4d445bf3625247ade3e696c5b5acdcf1aeedd27d32e58747000b3529f33cb3f05c3fa38c012c1ee6dece
 EBUILD kodi-9999.ebuild 13055 BLAKE2B 3e35b71bfc005b87a766ff3c025a9563e14649e073222d8dedce9c1b4e48034c24f0cbf8ac1989e8a7d60a3aa09e6452bf2497502830b46068350af0f79a450a SHA512 569757489bf42acfcbfe6ec89317cf40a8dae7041aa5311529ef4f3f5dec677f721d92390f73d57e3382d9b4895450eb641c665abf94940b76bd7fe09f0c9555
 MISC metadata.xml 2908 BLAKE2B 4b085bc5826f080224eadb489137f02741114afa1e424e5e61aa0cbe925a9f4fa9676ca45166d040f569ae99e94aa083533c5d3f0c9271c92286087cdb9f0dae SHA512 cf59967cf1631b3588fae307084ac7c48f03f1dffc5909ddafa9f6b126202391df0553d924a72a75e24302adc27e0f18d9c919084c7803d7dda15009d3731936
diff --git a/media-tv/kodi/files/kodi-21-fix-dvd-playing.patch b/media-tv/kodi/files/kodi-21-fix-dvd-playing.patch
new file mode 100644
index 000000000000..febcdc2197e4
--- /dev/null
+++ b/media-tv/kodi/files/kodi-21-fix-dvd-playing.patch
@@ -0,0 +1,50 @@
+https://bugs.gentoo.org/933370
+https://github.com/xbmc/xbmc/issues/24955
+https://github.com/xbmc/xbmc/pull/24968
+
+From e8493d3ac390bac4ca74fa5435bb258d6764dae5 Mon Sep 17 00:00:00 2001
+From: Jose Luis Marti <joseluis.marti@gmail.com>
+Date: Tue, 9 Apr 2024 23:06:10 +0200
+Subject: [PATCH] [DllLoader] Remove fstatvfs64 wrapper
+
+Co-authored-by: fuzzard <fuzzard@users.noreply.github.com>
+--- a/xbmc/cores/DllLoader/exports/wrapper.c
++++ b/xbmc/cores/DllLoader/exports/wrapper.c
+@@ -36,7 +36,6 @@ typedef fpos_t    fpos64_t;
+ #endif
+ 
+ struct mntent;
+-struct statvfs64;
+ 
+ void* dllmalloc(size_t );
+ void* dllcalloc( size_t , size_t );
+@@ -92,7 +91,6 @@ int dll_ftrylockfile(FILE *file);
+ void dll_funlockfile(FILE *file);
+ int dll_fstat64(int fd, struct stat64 *buf);
+ int dll_fstat(int fd, struct _stat *buf);
+-int dll_fstatvfs64(int fildes, struct statvfs64 *buf);
+ FILE* dll_popen(const char *command, const char *mode);
+ void* dll_dlopen(const char *filename, int flag);
+ int dll_setvbuf(FILE *stream, char *buf, int type, size_t size);
+@@ -445,11 +443,6 @@ int __wrap_fstat64(int fd, struct stat64* buf)
+   return dll_fstat64(fd, buf);
+ }
+ 
+-int __wrap_fstatvfs64(int fd, struct statvfs64* buf)
+-{
+-  return dll_fstatvfs64(fd, buf);
+-}
+-
+ int __wrap_setvbuf(FILE *stream, char *buf, int type, size_t size)
+ {
+    return dll_setvbuf(stream, buf, type, size);
+--- a/xbmc/cores/DllLoader/exports/wrapper_mach_alias
++++ b/xbmc/cores/DllLoader/exports/wrapper_mach_alias
+@@ -20,7 +20,6 @@ ___wrap_fread _fread
+ ___wrap_freopen _freopen
+ ___wrap_fseek _fseek
+ ___wrap_fsetpos _fsetpos
+-___wrap_fstatvfs64 _fstatvfs64
+ ___wrap_ftell _ftell
+ ___wrap_ftrylockfile _ftrylockfile
+ ___wrap_funlockfile _funlockfile
diff --git a/media-tv/kodi/kodi-20.3-r1.ebuild b/media-tv/kodi/kodi-21.0-r2.ebuild
index a518af43864c..f975ad26a22a 100644
--- a/media-tv/kodi/kodi-20.3-r1.ebuild
+++ b/media-tv/kodi/kodi-21.0-r2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-# FFmpeg can be unbundled, but is currently stuck at a very old version.
+CODENAME="Omega"
+
 # libdvd{css,read,nav} are not unbundlable without patching the buildsystem.
 
 # Versions for the forked projects that are bundled
@@ -11,9 +12,12 @@ EAPI=8
 LIBDVDCSS_VERSION="1.4.3-Next-Nexus-Alpha2-2"
 LIBDVDREAD_VERSION="6.1.3-Next-Nexus-Alpha2-2"
 LIBDVDNAV_VERSION="6.1.1-Next-Nexus-Alpha2-2"
-FFMPEG_VERSION="4.4.1"
-CODENAME="Nexus"
-FFMPEG_KODI_VERSION="Alpha1"
+FFMPEG_VERSION="6.0.1"
+
+# Java bundles from xbmc/interfaces/swig/CMakeLists.txt
+GROOVY_VERSION="4.0.16"
+APACHE_COMMON_LANG_VERSION="3.14.0"
+APACHE_COMMON_TEXT_VERSION="1.11.0"
 
 # Doesn't build with jdk-21
 _JAVA_PKG_WANT_BUILD_VM=( {openjdk{,-jre},icedtea}{,-bin}-{8,11,17} )
@@ -23,11 +27,12 @@ JAVA_PKG_WANT_SOURCE="17"
 JAVA_PKG_WANT_TARGET="17"
 
 PYTHON_REQ_USE="sqlite,ssl"
-PYTHON_COMPAT=( python3_{10..11} ) # python3.12 support added in 21
+PYTHON_COMPAT=( python3_{10..12} )
 
 CPU_FLAGS="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon"
 
-inherit cmake desktop flag-o-matic java-pkg-2 linux-info optfeature pax-utils python-single-r1 xdg
+inherit autotools cmake desktop flag-o-matic java-pkg-2 libtool linux-info optfeature pax-utils python-single-r1 \
+	toolchain-funcs xdg
 
 DESCRIPTION="A free and open source media-player and entertainment hub"
 HOMEPAGE="https://kodi.tv/"
@@ -37,13 +42,15 @@ SRC_URI="
 		-> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz
 		-> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
+	https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-${GROOVY_VERSION}.zip
+	https://mirrors.kodi.tv/build-deps/sources/commons-lang3-${APACHE_COMMON_LANG_VERSION}-bin.tar.gz
+	https://mirrors.kodi.tv/build-deps/sources/commons-text-${APACHE_COMMON_TEXT_VERSION}-bin.tar.gz
 	css? (
 		https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz
 			-> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
 	)
 	!system-ffmpeg? (
-		https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz
-			-> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz
+		https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz
 	)
 "
 if [[ ${PV} == *9999 ]] ; then
@@ -56,11 +63,11 @@ else
 	MY_PV=${PV/_p/_r}
 	MY_PV=${MY_PV/_alpha/a}
 	MY_PV=${MY_PV/_beta/b}
-	MY_PV=${MY_PV/_rc/RC}
+	MY_PV=${MY_PV/_rc/rc}
 	MY_PV="${MY_PV}-${CODENAME}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 	S=${WORKDIR}/xbmc-${MY_PV}
 fi
 
@@ -69,13 +76,14 @@ SLOT="0"
 # use flag is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
 # that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus doc eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire pulseaudio raspberry-pi samba system-ffmpeg test udf udev upnp vaapi vdpau wayland webserver X +xslt zeroconf ${CPU_FLAGS}"
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus doc eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire pulseaudio samba soc +system-ffmpeg test udf udev upnp vaapi vdpau wayland webserver X +xslt zeroconf ${CPU_FLAGS}"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	^^ ( gbm wayland X )
 	?? ( mariadb mysql )
 	bluray? ( udf )
 	gbm? ( udev )
+	soc? ( system-ffmpeg )
 	udev? ( !libusb )
 	vdpau? ( X !gles !gbm )
 	zeroconf? ( dbus )
@@ -84,7 +92,7 @@ RESTRICT="!test? ( test )"
 
 # dev-libs/libcec[-cubox] bug #818262
 COMMON_DEPEND="
-	>=dev-libs/flatbuffers-1.12.0:=
+	>=dev-libs/flatbuffers-23.3.3:=
 	>=dev-libs/lzo-2.04:2
 	media-libs/giflib:=
 	>=media-libs/libjpeg-turbo-2.0.4:=
@@ -106,13 +114,15 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/openssl-1.1.1k:0=
 	>=dev-libs/spdlog-1.5.0:=
 	dev-libs/tinyxml[stl]
+	dev-libs/tinyxml2:=
 	media-fonts/roboto
 	media-libs/libglvnd[X?]
 	>=media-libs/freetype-2.10.1
 	media-libs/harfbuzz:=
-	>=media-libs/libass-0.13.4:=
+	>=media-libs/libass-0.15.0:=
 	media-libs/mesa[egl(+),gbm(+)?,wayland?,X?]
 	>=media-libs/taglib-1.9.0
+	=media-video/ffmpeg-6*:=[encode,soc(-)?,postproc,vaapi?,vdpau?,X?]
 	sci-libs/kissfft
 	virtual/libiconv
 	virtual/ttf-fonts
@@ -145,14 +155,13 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	)
 	gbm? (
 		>=dev-libs/libinput-1.10.5:=
+		media-libs/libdisplay-info
 		x11-libs/libxkbcommon
 	)
 	gles? (
-		!raspberry-pi? (
-			|| (
-				>=media-libs/mesa-24.1.0_rc1[opengl]
-				<media-libs/mesa-24.1.0_rc1[gles2]
-			)
+		|| (
+			>=media-libs/mesa-24.1.0_rc1[opengl]
+			<media-libs/mesa-24.1.0_rc1[gles2]
 		)
 	)
 	!gles? (
@@ -177,30 +186,14 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 		>=net-fs/libnfs-2.0.0:=
 	)
 	pipewire? (
-		>=media-video/pipewire-0.3.24:=
+		>=media-video/pipewire-0.3.50:=
 	)
 	pulseaudio? (
 		media-libs/libpulse
 	)
-	raspberry-pi? (
-		|| (
-			media-libs/raspberrypi-userland
-			media-libs/raspberrypi-userland-bin
-			>=media-libs/mesa-24.1.0_rc1[opengl,video_cards_vc4]
-			<media-libs/mesa-24.1.0_rc1[egl(+),gles2,video_cards_vc4]
-		)
-	)
 	samba? (
 		>=net-fs/samba-3.4.6[smbclient(+)]
 	)
-	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc,vaapi?,vdpau?,X?]
-		=media-video/ffmpeg-4*[openssl]
-	)
-	!system-ffmpeg? (
-		app-arch/bzip2
-		media-libs/dav1d:=
-	)
 	udf? (
 		>=dev-libs/libudfread-1.0.0
 	)
@@ -220,7 +213,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 		>=x11-libs/libxkbcommon-0.4.1[wayland]
 	)
 	webserver? (
-		>=net-libs/libmicrohttpd-0.9.55:=[messages(+)]
+		>=net-libs/libmicrohttpd-0.9.77:=[messages(+)]
 	)
 	X? (
 		x11-libs/libX11
@@ -242,7 +235,7 @@ RDEPEND="
 DEPEND="
 	${COMMON_DEPEND}
 	${COMMON_TARGET_DEPEND}
-	dev-libs/rapidjson
+	>=dev-libs/rapidjson-1.0.2
 	test? (
 		>=dev-cpp/gtest-1.10.0
 	)
@@ -254,11 +247,11 @@ DEPEND="
 		x11-libs/libXrender
 	)
 "
-# <dev-lang/swig-4.2.0 https://github.com/xbmc/xbmc/issues/24385
 BDEPEND="
 	${COMMON_DEPEND}
+	app-arch/unzip
 	dev-build/cmake
-	<dev-lang/swig-4.2.0
+	dev-lang/swig
 	virtual/pkgconfig
 	<=virtual/jre-17:*
 	doc? (
@@ -266,6 +259,11 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/kodi-21-fix-gcc14.patch
+	"${FILESDIR}"/kodi-21-fix-dvd-playing.patch
+)
+
 # bug #544020
 CONFIG_CHECK="~IP_MULTICAST"
 ERROR_IP_MULTICAST="
@@ -273,11 +271,6 @@ In some cases Kodi needs to access multicast addresses.
 Please consider enabling IP_MULTICAST under Networking options.
 "
 
-PATCHES=(
-	"${FILESDIR}"/kodi-20.2-binutils-2.41.patch
-	"${FILESDIR}"/kodi-20.3-gcc-14.patch
-)
-
 pkg_setup() {
 	check_extra_config
 	java-pkg-2_pkg_setup
@@ -290,6 +283,10 @@ src_unpack() {
 	else
 		unpack ${MY_P}.tar.gz
 	fi
+
+	unpack apache-groovy-binary-${GROOVY_VERSION}.zip
+	unpack commons-lang3-${APACHE_COMMON_LANG_VERSION}-bin.tar.gz
+	unpack commons-text-${APACHE_COMMON_TEXT_VERSION}-bin.tar.gz
 }
 
 src_prepare() {
@@ -306,6 +303,23 @@ src_prepare() {
 			-e "s/\(find_library(KISSFFT_LIBRARY NAMES .*\)/\1 kissfft-${datatype} kissfft-${datatype}-openmp/" \
 			cmake/modules/FindKissFFT.cmake || die
 	done
+
+	if tc-is-cross-compiler; then
+		# These tools are automatically built with CMake during a native build
+		# but need to be built in advance using Autotools for a cross build.
+		NATIVE_TOOLS=(
+			TexturePacker
+			JsonSchemaBuilder
+		)
+
+		local t
+		for t in "${NATIVE_TOOLS[@]}" ; do
+			pushd "${S}/tools/depends/native/$t/src" >/dev/null || die
+			AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+			popd >/dev/null || die
+		done
+		elibtoolize
+	fi
 }
 
 src_configure() {
@@ -368,6 +382,8 @@ src_configure() {
 		-DENABLE_VDPAU=$(usex vdpau)
 		-DENABLE_XSLT=$(usex xslt)
 
+		-DWITH_FFMPEG=$(usex system-ffmpeg)
+
 		#To bundle or not
 		-DENABLE_INTERNAL_CROSSGUID=OFF
 		-DENABLE_INTERNAL_DAV1D=OFF
@@ -383,18 +399,21 @@ src_configure() {
 		-DENABLE_INTERNAL_TAGLIB=OFF
 		-DENABLE_INTERNAL_UDFREAD=OFF
 
-		-DWITH_FFMPEG=$(usex system-ffmpeg)
-
+		-DTARBALL_DIR="${DISTDIR}"
 		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
 		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
+		-Dgroovy_SOURCE_DIR="${WORKDIR}/groovy-${GROOVY_VERSION}"
+		-Dapache-commons-lang_SOURCE_DIR="${WORKDIR}/commons-lang3-${APACHE_COMMON_LANG_VERSION}"
+		-Dapache-commons-text_SOURCE_DIR="${WORKDIR}/commons-text-${APACHE_COMMON_TEXT_VERSION}"
 	)
 
 	# Separated to avoid "Manually-specified variables were not used by the project:"
+	use cec && mycmakeargs+=( -DENABLE_INTERNAL_CEC=OFF )
 	use css && mycmakeargs+=( -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz" )
+	use nfs && mycmakeargs+=( -DENABLE_INTERNAL_NFS=OFF )
 	use !system-ffmpeg && mycmakeargs+=(
-		-DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz"
+		-DFFMPEG_URL="${DISTDIR}/ffmpeg-${FFMPEG_VERSION}.tar.gz"
 	)
-	use nfs && mycmakeargs+=( -DENABLE_INTERNAL_NFS=OFF )
 	use !udev && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
 	use X && use !gles && mycmakeargs+=( -DENABLE_GLX=ON )
 
@@ -413,10 +432,26 @@ src_configure() {
 	# https://github.com/xbmc/xbmc/commit/cb72a22d54a91845b1092c295f84eeb48328921e
 	filter-lto
 
+	if tc-is-cross-compiler; then
+		for t in "${NATIVE_TOOLS[@]}" ; do
+			pushd "${S}/tools/depends/native/$t/src" >/dev/null || die
+			econf_build
+			install -m0755 /dev/null "$t" || die # Actually build later.
+			mycmakeargs+=( -DWITH_${t^^}="${PWD}/$t" )
+			popd >/dev/null || die
+		done
+	fi
+
 	cmake_src_configure
 }
 
 src_compile() {
+	if tc-is-cross-compiler; then
+		for t in "${NATIVE_TOOLS[@]}" ; do
+			emake -C "${S}/tools/depends/native/$t/src"
+		done
+	fi
+
 	cmake_src_compile all
 	use doc && cmake_build doc
 	use test && cmake_build kodi-test
@@ -434,6 +469,8 @@ src_test() {
 		# bug #779184
 		# https://github.com/xbmc/xbmc/issues/18594
 		$(usev x86 TestDateTime.SetFromDBTime)
+		# Tries to ping localhost, naturally breaking network-sandbox
+		TestNetwork.PingHost
 	)
 
 	# see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 0c07fed545da..d8ab890d4c8b 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1,18 +1,11 @@
 AUX tvheadend-4.0.9-use_system_queue.patch 296 BLAKE2B 0986117969d9bb3463123e984aba7a73c8caf89b16f0c10e870a9b49857f8c946958a31900d99c5d332f5635cbd49ae544c2cc97f1e8a211c352bcaba965fe76 SHA512 56180b9c2fbb092530963229213805ec63e3d941c67d967e38b46f778db85db981234fe5727b5a8dcf64ab3a9e24c9d10b681abf275249e0d6f0ad63e391ecc4
-AUX tvheadend-4.2.1-hdhomerun.patch 1045 BLAKE2B cad3922efbdd20c457c9570ecc75a786a997cafbe698226e31e4175394c38b79071ed7a165194ddc31e318ed015a0253dfb1f978695db35721749077154534f4 SHA512 416af870e5070001fbd0e09ec8c14160ff7c54b716564f708c6a983ca529cdf5963678c05551ad676a23c3347b4932bd7ae65e8eeea47a5f9f3955b46292c3f9
 AUX tvheadend-4.2.2-dtv_scan_tables.patch 463 BLAKE2B 4e52d89d75c05d8a3cc645280794dd4570953bb5452d1067442177d7eb4c85779a8bcb96f1f8d3fbbcb6a34e770ff014bb262103eae5a92556ac4586038cdd9e SHA512 9bdecbac57ee1f30be91f9145e32f89949b5631090edc85cd5383915b09949ec9211f62474bd06afb4600e431093ce2ee5550d204b08c64b5b2e1a1cd38a517d
 AUX tvheadend-4.2.7-python3.patch 2952 BLAKE2B c6eee8aea74abd9a6eaacd3206a4b0191a45ce63e9e18bb213f1f6c85702a3836c44c55dd7131df4d739fb1f689c8bd97e24f4924e113649b7b0c9d349d471c7 SHA512 f031a06e5d4db4ea265a3e99bb07bee983ab40e5b028d9e69457971090e538b2057d49258cadda75db7816c2e4e9609819e59ab8a30d3ce848444774bfa1a02f
-AUX tvheadend-4.2.8-fno-common.patch 1771 BLAKE2B a9c52afedc3c145fdd3bb3b67abf6890228b3083c56ba29abd86288fbf6b71d2960e6b4ed7aec383830f45db1cd637e8ef6124aa305166e301c49f52b3e65cbf SHA512 c2378d2f76dea88f2e987d9c62ca67f40cefd467c050dc30ab5d7127bc530642e78ccca9f36371373f2bd2101e451148310db41770e932f592484a119cae16fb
-AUX tvheadend-4.2.8-gcc9.patch 1772 BLAKE2B dc0033d7f61b8099d3f352cf8f05ff9073f3d6196c10ecac97c1cb1e7af7e01712478b2ef78b991336127ffbfcc9faf49b30b92f9af5e3c500783bc580a8908a SHA512 9b9d74a7d88187dd7895302b3c6142a14a136823fda5840fa464a5d3f3f97c8b59d4f839d10da14bd13bb6b346b75cac07069dab8ae626f68bc3000a70484834
-AUX tvheadend-4.2.8-hdhomerun.patch 1067 BLAKE2B bbbac3dfc8e533770d096bf726c40429358307d5134186693fca5bb69ea7a291afc0f2aa24fb2744d330e72bdfb78ec44ed96f2f2c9a625d9ac63ed2bc913a5c SHA512 118d9086f52c727dd64c0a10471857b12f8c0798887bcd712383823ffcaa0a12a3b487b7941871f8120bc00672608eca596d6ca09cfd47abb9684deef4611faa
-AUX tvheadend-4.2.8-no-dvb-fix.patch 817 BLAKE2B d07b38662175f64c29c166c16aa0fc76240aa86d325a1b715dee3de4733287a615566d9cb53fce9da37cc69ff66992eb228c45e8b7dce77cc125a8dfc303ece8 SHA512 37fe828b3a878913468bd06e115dfd9eec29df840455872019414187bb4a904c50d2476fc0508c465a92029f28068a6e6da54d9089ca2c5957f34a94835dc04a
 AUX tvheadend-4.3-hdhomerun.patch 1435 BLAKE2B 3250c5d1ce2a757a2fdee646cb64136661e171c5ae5b30199560e2e74fbfbfefb6d8284e5c2cb92d179751f5fa814148240e08e132761d4d3e2b66844ccd53b9 SHA512 a013ecb61cf05ff5d976f88be58a4ba5471034ab02d34778a8c472746355f2630a88b90951ba98513c787e616119183087d7560be6a9c89c5ea9c26285fe2d5d
 AUX tvheadend.confd 359 BLAKE2B 3b44e47b9216daaa2defa69254700693015619e8b0196060e102b801337fd5a1e3f1376f4e5de59a8da0ae5bfb9a2335c1205504d28a3582ac6f7c095b0623d0 SHA512 11448507059ed12bef972dfd898771ab2a63078927e55a356b44be04c738e461535ba2a621a9aba4b621cb316dfd66e74b3c25c22c45ccf73a28f6dd0ad3cb23
 AUX tvheadend.initd 375 BLAKE2B 6fbf53a0a67957ee5756b56189d42b741adb7603b5590aa5fa0fd6b2a1d1ba930af05de8ebedba343302aa861f7fb42d3eb25b67acf6b43aa7c956d4965ab944 SHA512 6f17fa6bee502f586b4500c5f5541c9c6ce095deed7ddb3c1d1ad129a2e22fa66de0e72b712866659f7080753c73f67154d6dcdbf8539d6c8a942bea29bb1aa7
 AUX tvheadend.service 573 BLAKE2B e99853082623ca0522bf83aec4be33f2cdc62ba3e3e09bd22246f93c93d5342180be409ba9ad8f862830aca68ca0dbfafd3da0ecb9033e43d6a7e50a523c0bd8 SHA512 8f8e8f9feed45c20919bca402ef9179208a305cd7b06b47dfbbc368fc85d739c3dca2b53e6964bff10f8581cc4c8091660ac2be3b975d80941dc7a16cbb3fb49
-DIST tvheadend-4.2.8.tar.gz 21875281 BLAKE2B fdd99ca6aff56f8daa073394f9c58e9cba4ea988a2884e24c2288fd4870dd0460624fb700838ba92867a57473cc4133fed5fbd56f0e40f02a0878ffcd0642c00 SHA512 e629ffe1802e76b5121d5c22d11be86640f17816a5e902ed4842b2fd21df506d00d9caebafd931d71995e9d9049cb675c032478c9bed4f1ce82fc3f255f6166f
 DIST tvheadend-4.3_p20240322.tar.gz 22572932 BLAKE2B b3c09c170a13765194885854ca162a2a55e8b10fca2f6c24eb7b03b9670adb0c88f082986ac974a174abc52db3c49704735b371de28050d12d4aad6cb4a8dfc0 SHA512 068e8f6c1d3b3da9af8babd25705c754b2d72173751d65086663a64a45c332c1e1b478f65b86665a531a1f3b9b2168df23f93583b82d96c08e80c475406986da
-EBUILD tvheadend-4.2.8-r2.ebuild 3611 BLAKE2B 80411facff811cbff41124e5a68cdb80f6a5b4e4ad44e182bcb9358ef7ced1bfb25dface222d16599f4b401c90a65adb0b9e7e7538b0fb7e5be2fd906a0088b6 SHA512 37932ec32c4cc7dda757c13246954e60a1d9ebf33f401f7ac54e580db753f8aff19ab89ffbd45469a050bd654bbdfd24845e8fbcbafcff22b7bd86bf9b6cc31c
 EBUILD tvheadend-4.3_p20240322.ebuild 4417 BLAKE2B a59ffe6dbf89d7be88d156102e973d10344194ffffd8e6f5e71b6600a0bf55e440242975148b433cbcf68f8a5c485d32f31dcc45d463d4e74a615235d9a8cd7a SHA512 63e00ec5ce6bac7b8c9492dc25947a234c6416387b7dcbefc636a1d7224beaaf3bc253ba90b6bd385c4be455015f806e68822cd68bb3a2d9d830ad43bfaab22c
 EBUILD tvheadend-9999.ebuild 4273 BLAKE2B df25cdcc7f9bebcb423711cebac099e355d514ca2816ad99f358e5f18efd8e450f68f66bb1541dfa257c83eb6d482899e5dc6eb2f247d44cd549cec3f0002847 SHA512 32496bc56999d7ba908e6b3b1aa175365a18f4cacd331a8e4e7eecd82d66681615ccd24928ec7b45ac936e593803188af88030dc6c9e2f57d91a42e7586e8c43
-MISC metadata.xml 1446 BLAKE2B 622295d497db162d2a214c94187f0e15a9c23b8cc7d484255618f2bb3d10c5de9ecd9aaacbceeb05c27e5d53ffa2338fcd2678cdfdc386104033c1c57aa51c96 SHA512 5e34e61e7ecec9a997ece8b50f6a45f1158e203df0759e08e8d3735a4973baa795a556f9bcac1aaf8069cd25974655adc3f393c0f1670cf6e6a3762903d84759
+MISC metadata.xml 1168 BLAKE2B dc42b9e7a3cc221a875b758f838fe3e4aac5fe6af865459b3e866e735905f8a3245496019d5924bc5cc6ee77410a03e0977dd425141c66ca52fcb8d83d410d99 SHA512 242b625a50dcadc5d6af611cdabce021cf09e3e13f626930532e725f9cac8d80bfeed87f0dd6e420c9c9a5c0ac521508440ec85f649581e5cb214b6cfc11c935
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.1-hdhomerun.patch b/media-tv/tvheadend/files/tvheadend-4.2.1-hdhomerun.patch
deleted file mode 100644
index 64f6f691b976..000000000000
--- a/media-tv/tvheadend/files/tvheadend-4.2.1-hdhomerun.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up ./configure.orig ./configure
---- ./configure.orig	2017-04-21 10:32:22.000000000 +0200
-+++ ./configure	2017-04-23 13:31:08.717237211 +0200
-@@ -357,7 +357,7 @@ if enabled hdhomerun_static; then
- else
- 
-   if enabled_or_auto hdhomerun_client; then
--    if check_cc_header 'libhdhomerun/hdhomerun' libhdhomerun; then
-+    if check_cc_header 'hdhomerun/hdhomerun' libhdhomerun; then
-       enable  hdhomerun_client
-       LDFLAGS="$LDFLAGS -lhdhomerun"
-     fi
-diff -up ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h.orig ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h
---- ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h.orig	2017-04-21 10:32:22.000000000 +0200
-+++ ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h	2017-04-23 13:31:08.717237211 +0200
-@@ -24,7 +24,7 @@
- #include "htsbuf.h"
- #include "tvhdhomerun.h"
- 
--#include "libhdhomerun/hdhomerun.h"
-+#include <hdhomerun/hdhomerun.h>
- 
- typedef struct tvhdhomerun_device_info tvhdhomerun_device_info_t;
- typedef struct tvhdhomerun_device      tvhdhomerun_device_t;
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch
deleted file mode 100644
index 23f48652f9de..000000000000
--- a/media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 1f2a0a59e3acaef88509d3ac899b905c73b7b8f8 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Fri, 15 May 2020 17:45:30 +0100
-Subject: [PATCH] Fix building with -fno-common (default from GCC 10)
-
----
- src/input.h        | 4 ++--
- src/input/mpegts.c | 2 ++
- src/input/mpegts.h | 2 +-
- 3 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/input.h b/src/input.h
-index a9c96df04..3dce355c6 100644
---- a/src/input.h
-+++ b/src/input.h
-@@ -133,8 +133,8 @@ void tvh_hardware_delete ( tvh_hardware_t *th );
- extern const idclass_t tvh_input_class;
- extern const idclass_t tvh_input_instance_class;
- 
--tvh_input_list_t    tvh_inputs;
--tvh_hardware_list_t tvh_hardware;
-+extern tvh_input_list_t    tvh_inputs;
-+extern tvh_hardware_list_t tvh_hardware;
- 
- #define TVH_INPUT_FOREACH(x) LIST_FOREACH(x, &tvh_inputs, ti_link)
- #define TVH_HARDWARE_FOREACH(x) LIST_FOREACH(x, &tvh_hardware, th_link)
-diff --git a/src/input/mpegts.c b/src/input/mpegts.c
-index e02d491f1..fca4f3429 100644
---- a/src/input/mpegts.c
-+++ b/src/input/mpegts.c
-@@ -20,6 +20,8 @@
- #include "mpegts/fastscan.h"
- #include "memoryinfo.h"
- 
-+struct mpegts_listeners mpegts_listeners;
-+
- extern memoryinfo_t mpegts_input_queue_memoryinfo;
- extern memoryinfo_t mpegts_input_table_memoryinfo;
- 
-diff --git a/src/input/mpegts.h b/src/input/mpegts.h
-index 9dda3baca..9c4c57b73 100644
---- a/src/input/mpegts.h
-+++ b/src/input/mpegts.h
-@@ -1149,7 +1149,7 @@ typedef struct mpegts_listener
-   void (*ml_mux_delete) (mpegts_mux_t *mm, void *p);
- } mpegts_listener_t;
- 
--LIST_HEAD(,mpegts_listener) mpegts_listeners;
-+extern LIST_HEAD(mpegts_listeners, mpegts_listener) mpegts_listeners;
- 
- #define mpegts_add_listener(ml)\
-   LIST_INSERT_HEAD(&mpegts_listeners, ml, ml_link)
--- 
-2.26.2
-
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-gcc9.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-gcc9.patch
deleted file mode 100644
index 9ccadb44c42c..000000000000
--- a/media-tv/tvheadend/files/tvheadend-4.2.8-gcc9.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up ./src/plumbing/transcoding.c.orig ./src/plumbing/transcoding.c
---- ./src/plumbing/transcoding.c.orig	2019-01-12 09:58:47.000000000 +0100
-+++ ./src/plumbing/transcoding.c	2019-03-12 15:49:24.922314869 +0100
-@@ -1804,7 +1804,7 @@ transcoder_init_video(transcoder_t *t, s
-   char *str, *token, *saveptr, codec_list[sizeof(tp->tp_src_vcodec)];
-   int codec_match=0;
- 
--  strncpy(codec_list, tp->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1);
-+  memcpy(codec_list, tp->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1);
- 
-   tvhtrace(LS_TRANSCODE, "src_vcodec=\"%s\" ssc_type=%d (%s)\n",
- 		  tp->tp_src_vcodec,
-@@ -2130,10 +2130,10 @@ transcoder_set_properties(streaming_targ
-   transcoder_t *t = (transcoder_t *)st;
-   transcoder_props_t *tp = &t->t_props;
- 
--  strncpy(tp->tp_vcodec, props->tp_vcodec, sizeof(tp->tp_vcodec)-1);
--  strncpy(tp->tp_vcodec_preset, props->tp_vcodec_preset, sizeof(tp->tp_vcodec_preset)-1);
--  strncpy(tp->tp_acodec, props->tp_acodec, sizeof(tp->tp_acodec)-1);
--  strncpy(tp->tp_scodec, props->tp_scodec, sizeof(tp->tp_scodec)-1);
-+  memcpy(tp->tp_vcodec, props->tp_vcodec, sizeof(tp->tp_vcodec)-1);
-+  memcpy(tp->tp_vcodec_preset, props->tp_vcodec_preset, sizeof(tp->tp_vcodec_preset)-1);
-+  memcpy(tp->tp_acodec, props->tp_acodec, sizeof(tp->tp_acodec)-1);
-+  memcpy(tp->tp_scodec, props->tp_scodec, sizeof(tp->tp_scodec)-1);
-   tp->tp_channels   = props->tp_channels;
-   tp->tp_vbitrate   = props->tp_vbitrate;
-   tp->tp_abitrate   = props->tp_abitrate;
-@@ -2141,7 +2141,7 @@ transcoder_set_properties(streaming_targ
- 
-   memcpy(tp->tp_language, props->tp_language, 4);
- 
--  strncpy(tp->tp_src_vcodec, props->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1);
-+  memcpy(tp->tp_src_vcodec, props->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1);
- }
- 
- 
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch
deleted file mode 100644
index c30af8aba2a1..000000000000
--- a/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 13cd23c371e3377973502f8dc65654b6a0ff372b Mon Sep 17 00:00:00 2001
-From: Michael Marley <michael@michaelmarley.com>
-Date: Wed, 26 Jun 2019 19:35:50 -0400
-Subject: [PATCH] Fix compilation with libhdhomerun 20190621
-
-They renamed the symbol that was used to determine whether the
-"hdhomerun_discover_find_devices_custom" needed to be aliased,
-causing an FTBFS.  Instead, recognize both the old and new symbols.
----
- src/input/mpegts/tvhdhomerun/tvhdhomerun.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/input/mpegts/tvhdhomerun/tvhdhomerun.c b/src/input/mpegts/tvhdhomerun/tvhdhomerun.c
-index 58dec51ab..18068faf5 100644
---- a/src/input/mpegts/tvhdhomerun/tvhdhomerun.c
-+++ b/src/input/mpegts/tvhdhomerun/tvhdhomerun.c
-@@ -32,7 +32,8 @@
- 
- #include "config.h"
- 
--#ifdef HDHOMERUN_TAG_DEVICE_AUTH_BIN
-+#if defined(HDHOMERUN_TAG_DEVICE_AUTH_BIN) \
-+           || defined(HDHOMERUN_TAG_DEVICE_AUTH_BIN_DEPRECATED)
- #define hdhomerun_discover_find_devices_custom \
-            hdhomerun_discover_find_devices_custom_v2
- #endif
--- 
-2.23.0
-
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-no-dvb-fix.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-no-dvb-fix.patch
deleted file mode 100644
index b398064292e5..000000000000
--- a/media-tv/tvheadend/files/tvheadend-4.2.8-no-dvb-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 27ec1008df054072fac6b58ffb8d820423522442 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 10 May 2020 23:02:14 +0100
-Subject: [PATCH] dvbpsi: Fix build when DVB is not enabled at all
-
----
- src/input/mpegts/dvb_psi.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/input/mpegts/dvb_psi.c b/src/input/mpegts/dvb_psi.c
-index 15203d98c..96b1689fb 100644
---- a/src/input/mpegts/dvb_psi.c
-+++ b/src/input/mpegts/dvb_psi.c
-@@ -2331,9 +2331,11 @@ psi_tables_install ( mpegts_input_t *mi, mpegts_mux_t *mm,
-     psi_tables_atsc_t(mm);
-     break;
-   case DVB_SYS_DVBC_ANNEX_B:
-+#if ENABLE_MPEGTS_DVB
-     if (idnode_is_instance(&mm->mm_id, &dvb_mux_dvbc_class))
-       psi_tables_dvb(mm);
-     else
-+#endif
-       psi_tables_atsc_c(mm);
-     break;
-   case DVB_SYS_NONE:
--- 
-2.26.2
-
diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
index 7dfa9e2d079e..8c2259f17cf7 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/metadata.xml
@@ -6,12 +6,8 @@
 		<name>James Le Cuirot</name>
 	</maintainer>
 	<use>
-		<flag name="capmt">Enable support for capmt (dvbapi) protocol</flag>
-		<flag name="constcw">Enable support for the constcw protocol</flag>
-		<flag name="cwc">Enable support for the cwc (newcamd) protocol</flag>
 		<flag name="ddci">Enable support for DDCI hardware</flag>
 		<flag name="dvbcsa">Enable decryption of the DVB Common Scrambling Algorithm</flag>
-		<flag name="dvben50221">Enable support for hardware CAM</flag>
 		<flag name="hdhomerun">Enable support for the HDHomeRun device</flag>
 		<flag name="imagecache">Enable support for image caching</flag>
 		<flag name="iptv">Enable support for Internet Protocol TV</flag>
diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
deleted file mode 100644
index 11b918469163..000000000000
--- a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit linux-info python-any-r1 systemd toolchain-funcs
-
-DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
-HOMEPAGE="https://tvheadend.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-
-IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun +imagecache +inotify iptv satip systemd +timeshift uriparser xmltv zeroconf zlib"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# <ffmpeg-5 dep for bug #834399, https://github.com/tvheadend/tvheadend/pull/1460
-RDEPEND="
-	acct-user/tvheadend
-	virtual/libiconv
-	dbus? ( sys-apps/dbus )
-	dvbcsa? ( media-libs/libdvbcsa )
-	dvben50221? ( media-tv/linuxtv-dvb-apps )
-	ffmpeg? ( <media-video/ffmpeg-5:= )
-	hdhomerun? ( media-libs/libhdhomerun )
-	dev-libs/openssl:0=
-	uriparser? ( dev-libs/uriparser )
-	zeroconf? ( net-dns/avahi )
-	zlib? ( sys-libs/zlib )
-"
-
-DEPEND="
-	${RDEPEND}
-	dvb? ( sys-kernel/linux-headers )
-"
-
-RDEPEND+="
-	dvb? ( media-tv/dtv-scan-tables )
-	xmltv? ( media-tv/xmltv )
-"
-
-REQUIRED_USE="dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )"
-
-# Some patches from:
-# https://github.com/rpmfusion/tvheadend
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.9-use_system_queue.patch
-	"${FILESDIR}"/${PN}-4.2.{1,8}-hdhomerun.patch
-	"${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
-	"${FILESDIR}"/${PN}-4.2.7-python3.patch
-	"${FILESDIR}"/${PN}-4.2.8-gcc9.patch
-	"${FILESDIR}"/${PN}-4.2.8-no-dvb-fix.patch
-	"${FILESDIR}"/${PN}-4.2.8-fno-common.patch
-)
-
-DOCS=( README.md )
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-
-	use inotify &&
-		CONFIG_CHECK="~INOTIFY_USER" linux-info_pkg_setup
-}
-
-src_configure() {
-	CC="$(tc-getCC)" \
-	PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-	econf \
-		--disable-bundle \
-		--disable-ccache \
-		--disable-dvbscan \
-		--disable-ffmpeg_static \
-		--disable-hdhomerun_static \
-		--nowerror \
-		$(use_enable capmt) \
-		$(use_enable constcw) \
-		$(use_enable cwc) \
-		$(use_enable dbus dbus_1) \
-		$(use_enable debug trace) \
-		$(use_enable dvb linuxdvb) \
-		$(use_enable dvbcsa) \
-		$(use_enable dvben50221) \
-		$(use_enable ffmpeg libav) \
-		$(use_enable hdhomerun hdhomerun_client) \
-		$(use_enable imagecache) \
-		$(use_enable inotify) \
-		$(use_enable iptv) \
-		$(use_enable satip satip_server) \
-		$(use_enable satip satip_client) \
-		$(use_enable systemd libsystemd_daemon) \
-		$(use_enable timeshift) \
-		$(use_enable uriparser) \
-		$(use_enable zeroconf avahi) \
-		$(use_enable zlib)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/tvheadend.initd tvheadend
-	newconfd "${FILESDIR}"/tvheadend.confd tvheadend
-
-	use systemd &&
-		systemd_dounit "${FILESDIR}"/tvheadend.service
-}
-
-pkg_postinst() {
-	elog "The Tvheadend web interface can be reached at:"
-	elog "http://localhost:9981/"
-	elog
-	elog "Make sure that you change the default username"
-	elog "and password via the Configuration / Access control"
-	elog "tab in the web interface."
-
-	. "${EROOT}"/etc/conf.d/tvheadend &>/dev/null
-
-	if [[ ${TVHEADEND_CONFIG} = ${EPREFIX}/etc/tvheadend ]]; then
-		echo
-		ewarn "The HOME directory for the tvheadend user has changed from"
-		ewarn "${EPREFIX}/etc/tvheadend to ${EPREFIX}/var/lib/tvheadend. The daemon will continue"
-		ewarn "to use the old location until you update TVHEADEND_CONFIG in"
-		ewarn "${EPREFIX}/etc/conf.d/tvheadend. Please manually move your existing files"
-		ewarn "before you do so."
-	fi
-}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 03e78b3df320..3e7f312726f5 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/subliminal/Manifest b/media-video/subliminal/Manifest
index c044485db911..9802838646be 100644
--- a/media-video/subliminal/Manifest
+++ b/media-video/subliminal/Manifest
@@ -2,6 +2,6 @@ AUX subliminal-2.1.0-fix-pytest-warning.patch 315 BLAKE2B e04d8f7d9dca768cb805f8
 AUX subliminal-2.1.0-rarfile-4.0-compat.patch 971 BLAKE2B a26cd6ef8e2602abdcd8f4fa2d188e7a76a5b3a18c556adfb4b4218a852f976c0e85c83ff9e953151a09ac995b48170713ac399a1f89fe6e43f2b3aa215cff57 SHA512 eae1852b7d75f77783bb11f6e77082e3317dbc4be62e1fa04ad5138125a70e100eee42726b0f23d0baed83e973b0d98ac382096c3dc64bafb8b95db2d8a33a3e
 DIST matroska_test_w1_1.zip 184550509 BLAKE2B f111725aa08267661942072c2d4ac019d3d322c4e933aad10afb3aa6f69bb3469114c4400d161e53d8a7618b818b22465177460003804a7ac3e69fa4f4db000d SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f
 DIST subliminal-2.1.0.tar.gz 5480458 BLAKE2B 249bdd027d99dfb0b81d939af2dc08f62b52dca2c8618f1006ca76eee41c2443b450076eddc1aa533997beca8cdf9016b884d7eceeebbf4e48ced91dae1a2361 SHA512 9b26ae594895470830547eed604aa5b28b75f590e5be12c2d5a478c5daf798d405f209639bd54dce0565b0e27d1b0daa5bef87dfa8590af61f2ab1e287c41060
-EBUILD subliminal-2.1.0-r2.ebuild 2586 BLAKE2B bbc6219055232c804c7eeea502f84c6b52cf3e23014b9c21dea039846f4a8f747ff916f6a395c290547849953852695aba650017ef5e52d56416e37204ea1a6c SHA512 baea1d4289f215c50ae48f034cf3e30a72f5d49b13487b965cd5ab2cba47e8cf322cda206f45d5ac9b8d357643d8c5d5ca9bfac47004c64b7eaed3256e7bab27
-EBUILD subliminal-9999.ebuild 2587 BLAKE2B 8d775b8db016a218601dfb8f0dd94df8b930233c1b4d85f58edcc64f5dd267371aee865bd4f178b53afb7287ad4fcd4a6f426c76cd63f7d355706640c827b3c5 SHA512 d67809d3f55e5dcfda470412e45110372d28d804dfec9b997fe7d750f7db174a849f48a5a03ae3b97dcea8c12e4350fec2782e83cbab2733a4502d5e21e0e198
+EBUILD subliminal-2.1.0-r2.ebuild 2745 BLAKE2B 288c4b2344576e480cff2eb3119e2ff6dfd371aee22d94d1bba9f26a65341a8b314aa68f3247095bae583fd2a1af1d2fbed6f7d0219b005a0826f7f195f91eea SHA512 67151fb4aad8038deb2b8636a00cb504c0f9262cb7caa9373b59a055757455b002c135430db32db1207a2152166288583391ecedb2f013c46ec62a003d868538
+EBUILD subliminal-9999.ebuild 2746 BLAKE2B a6c2ed19d9e8986a9992c895677c8214bee8478ad4e266a9dc47958b06ccf9d75f4d8d841dbc86f5d4a1e2292e099cf92049e0fe3688adcd04cf62f07983ac42 SHA512 823fea7ff8521831096a768c9e9c810878ad4e37dbe68e2b6e11bafd0412601b1d92ca8bfc93275132b3a10e575392fb1e16e56326ebebfb0a7265d39804ae1c
 MISC metadata.xml 447 BLAKE2B 42fac15336ea05ed85313259c5571f8e4101a39157973a2c43bc1a77bdb1e6610e9373646d485f8e5a5df1420b8fb3c780393e3191d4069a4e2ec5296733adc1 SHA512 fa0256091da7f65f41cfdd1b4ebd7e485c15c8a72cd916d553003e0d8beca479b0d0d877ad90c6c986b5c24070a89994d359f4672d2dfac513d06e9a8683d826
diff --git a/media-video/subliminal/subliminal-2.1.0-r2.ebuild b/media-video/subliminal/subliminal-2.1.0-r2.ebuild
index 5a960dea62c4..da15a8868b54 100644
--- a/media-video/subliminal/subliminal-2.1.0-r2.ebuild
+++ b/media-video/subliminal/subliminal-2.1.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE='xml(+)'
 
 inherit distutils-r1
@@ -25,6 +25,10 @@ SRC_URI+=" test? ( https://downloads.sourceforge.net/matroska/test_files/matrosk
 LICENSE="MIT"
 SLOT="0"
 
+# The cassettes have bitrotted a bit as of 2024-06-01 but there's
+# a lot of movement upstream on the 'develop' branch towards a new release.
+RESTRICT="test"
+
 BDEPEND="
 	test? (
 		app-arch/unzip
diff --git a/media-video/subliminal/subliminal-9999.ebuild b/media-video/subliminal/subliminal-9999.ebuild
index 68102948a36f..87f5bf683f90 100644
--- a/media-video/subliminal/subliminal-9999.ebuild
+++ b/media-video/subliminal/subliminal-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE='xml(+)'
 
 inherit distutils-r1
@@ -25,6 +25,10 @@ SRC_URI+=" test? ( https://downloads.sourceforge.net/matroska/test_files/matrosk
 LICENSE="MIT"
 SLOT="0"
 
+# The cassettes have bitrotted a bit as of 2024-06-01 but there's
+# a lot of movement upstream on the 'develop' branch towards a new release.
+RESTRICT="test"
+
 BDEPEND="
 	test? (
 		app-arch/unzip
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index 39e4519b9216..a3a50f194c73 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -2,7 +2,9 @@ AUX wireplumber-0.4.15-config-disable-sound-server-parts.patch 783 BLAKE2B ed172
 AUX wireplumber-0.4.81-config-disable-sound-server-parts.patch 906 BLAKE2B 9373bb9cd9234d0fd68ccfba41011083aadd2dfcfd19d7cdda235f075b5cbe02562f8719153ea4e0412614401b3c7f6b60083b3578e9d9450b0a0dfc4b6222a4 SHA512 9fb2c5b5baeebde8dac9c6b6cc192cf85a4b70db3ef7a50233a7c064dc407c763d906063958a5dd06746e1730e2110803eb328105802ea5c4d6bb6d685376a93
 DIST wireplumber-0.4.17.tar.bz2 330355 BLAKE2B fec1cf75bec687bff1cb48416cf22503a79609cf11220ab9353d3b8038cae1db63da8aa269aca034c0c0afd474e2ba89b236bb7e778da111516e3b15d5449f02 SHA512 5efb71091f262458bc912f4670249fac3ef858021785fbee9be749564a3fa452b1c4ff75634132f7d44fd06d7fc5ea2debb022b1f4a8d5c9c3afa992fab7ecf8
 DIST wireplumber-0.5.2.tar.bz2 408788 BLAKE2B 51a9c0268212b353b54099d2d57fd93dec5b42d4ec3151f93b4ebd4df3f4478a19858ec8302af58558a9387afa647a00a0872d471f0f2ea5e681978afbdcf553 SHA512 4cd2949739b8af86f73e072fe8c1d8606fa9be77b6e109aa0825d516f11953c4811ae1162da07ae245f7039f4243d01c43b8e9c083d4e0be1066b180484abbfb
+DIST wireplumber-0.5.3.tar.bz2 411081 BLAKE2B 627cb0adaddd512e2b5f2e706b622972232f76000d690837da5f03a3628669b99c4768de6590ec378684311915626de7ac3316bda1f5d1152c9df448ec41e389 SHA512 1c62f7f919242b2a9586ff6a532f214b564bcf10c838eae4a64078edf6fd461fc65f364c8af79150e33b86594331446516a1a4c926bb245a4b2ba2d9f63f7243
 EBUILD wireplumber-0.4.17-r1.ebuild 3785 BLAKE2B c6108e4a024cb00a63bcc82a215fc80b6fe106903339e892416a017bc6d607d7bfb268a305b30e82988f2dcda793ecfd8fcc4e15d2691b8a6ba248e93e72916a SHA512 4bcda3c48ba1a23f61f6678e26eb420aeb057c193cc61ba5d65cbf560e5d292fe4dbd7dddc8fa7bf1d6f190a6297d4969961b8358707707d6a067e58feb94f89
 EBUILD wireplumber-0.5.2.ebuild 3801 BLAKE2B 67265b726b3267c13a3bc1ac5f393c69a8c65c3dba98e7c647ac1099ce28d449540604c3b0ff9b053843b5adaaba0325558692fcfb15ba995aa12f61b9b66fe5 SHA512 97382f121b1e594b26a8b4fe35b01ac855b70e2c9747d18de7a6d56fc99fbe52bec34ccc315faf0dff297934f2cad7edd4b24a4a2570115c7292b1e63daba128
-EBUILD wireplumber-9999.ebuild 3801 BLAKE2B 67265b726b3267c13a3bc1ac5f393c69a8c65c3dba98e7c647ac1099ce28d449540604c3b0ff9b053843b5adaaba0325558692fcfb15ba995aa12f61b9b66fe5 SHA512 97382f121b1e594b26a8b4fe35b01ac855b70e2c9747d18de7a6d56fc99fbe52bec34ccc315faf0dff297934f2cad7edd4b24a4a2570115c7292b1e63daba128
+EBUILD wireplumber-0.5.3.ebuild 3963 BLAKE2B 8c6b2725180db9f33430d75af2872ffffffb8f5af821dc2545c3b97bf7830f82cc78832c3e348ad1cfa9ed52a06b0cefdfa1ecdeb27a49ecf0103f4ff7786b08 SHA512 45c82e2a2a47c2da3559768fdaf177e4127ef79f3c26e5e00e4f216124eb8e08615a6c4b525877fc9941ec25fb0652ecd6e68e617f7ef7c5308ea0fca94eac43
+EBUILD wireplumber-9999.ebuild 3963 BLAKE2B 8c6b2725180db9f33430d75af2872ffffffb8f5af821dc2545c3b97bf7830f82cc78832c3e348ad1cfa9ed52a06b0cefdfa1ecdeb27a49ecf0103f4ff7786b08 SHA512 45c82e2a2a47c2da3559768fdaf177e4127ef79f3c26e5e00e4f216124eb8e08615a6c4b525877fc9941ec25fb0652ecd6e68e617f7ef7c5308ea0fca94eac43
 MISC metadata.xml 719 BLAKE2B 7ad70a19cbc55cb0c399cbc1c8c56a3bab16d2dd477a285a3c142793af3704a8dd6648f6cfa0b9aa6fd8338c9cddd93cc565356a8a2e5031a6874b46ac66c2ee SHA512 a4617e6176a4dab7491103858ed5f663b8dda2a6cd97c348cc274ac959df813a811f70963487ccb670999fd51d107726762d872ce42290d02ea6ed24ea021e55
diff --git a/media-video/wireplumber/wireplumber-0.5.3.ebuild b/media-video/wireplumber/wireplumber-0.5.3.ebuild
new file mode 100644
index 000000000000..a3a02062c4c1
--- /dev/null
+++ b/media-video/wireplumber/wireplumber-0.5.3.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at https://src.fedoraproject.org/rpms/wireplumber/tree/rawhide
+#
+# 2. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to be made shortly
+# after releases.
+
+LUA_COMPAT=( lua5-{3,4} )
+
+inherit lua-single meson systemd
+
+DESCRIPTION="Replacement for pipewire-media-session"
+HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/0.5"
+IUSE="elogind system-service systemd test"
+
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	?? ( elogind systemd )
+	system-service? ( systemd )
+"
+
+RESTRICT="!test? ( test )"
+
+# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building
+BDEPEND="
+	dev-libs/glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	sys-devel/gettext
+	test? ( sys-apps/dbus )
+"
+DEPEND="
+	${LUA_DEPS}
+	>=dev-libs/glib-2.68
+	>=media-video/pipewire-1.0.5-r1:=
+	virtual/libintl
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd )
+"
+RDEPEND="
+	${DEPEND}
+	system-service? (
+		acct-user/pipewire
+		acct-group/pipewire
+	)
+"
+
+DOCS=( {NEWS,README}.rst )
+
+PATCHES=(
+	# Defer enabling sound server parts to media-video/pipewire
+	# TODO: Soon, we should be able to migrate to just a dropin at
+	# /usr/share. See https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/652#note_2399735.
+	"${FILESDIR}"/${PN}-0.4.81-config-disable-sound-server-parts.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		-Ddaemon=true
+		-Dtools=true
+		-Dmodules=true
+		# Ebuild not wired up yet (Sphinx, Doxygen?)
+		-Ddoc=disabled
+		# Only used for Sphinx doc generation
+		-Dintrospection=disabled
+		-Dsystem-lua=true
+		-Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version))
+		$(meson_feature elogind)
+		$(meson_feature systemd)
+		$(meson_use system-service systemd-system-service)
+		$(meson_use systemd systemd-user-service)
+		-Dsystemd-system-unit-dir=$(systemd_get_systemunitdir)
+		-Dsystemd-user-unit-dir=$(systemd_get_userunitdir)
+		$(meson_use test tests)
+		$(meson_use test dbus-tests)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	mv "${ED}"/usr/share/doc/wireplumber/* "${ED}"/usr/share/doc/${PF} || die
+	rmdir "${ED}"/usr/share/doc/wireplumber || die
+}
+
+pkg_postinst() {
+	if systemd_is_booted ; then
+		ewarn "pipewire-media-session.service is no longer installed. You must switch"
+		ewarn "to wireplumber.service user unit before your next logout/reboot:"
+		ewarn "systemctl --user disable pipewire-media-session.service"
+		ewarn "systemctl --user --force enable wireplumber.service"
+	else
+		ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher"
+		ewarn "is started (a replacement for directly calling pipewire binary)."
+		ewarn
+		ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist"
+		ewarn "or, if it does exist, that any reference to"
+		ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)."
+	fi
+
+	if use system-service; then
+		ewarn
+		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
+		ewarn "the system-wide systemd units that enable WirePlumber to run as a system"
+		ewarn "service. This is more than likely NOT what you want. You are strongly"
+		ewarn "advised not to enable this mode and instead stick with systemd user"
+		ewarn "units. The default configuration files will likely not work out of"
+		ewarn "box, and you are on your own with configuration."
+		ewarn
+	fi
+}
diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild
index ea1b71883dbb..a3a02062c4c1 100644
--- a/media-video/wireplumber/wireplumber-9999.ebuild
+++ b/media-video/wireplumber/wireplumber-9999.ebuild
@@ -95,6 +95,13 @@ src_configure() {
 	meson_src_configure
 }
 
+src_install() {
+	meson_src_install
+
+	mv "${ED}"/usr/share/doc/wireplumber/* "${ED}"/usr/share/doc/${PF} || die
+	rmdir "${ED}"/usr/share/doc/wireplumber || die
+}
+
 pkg_postinst() {
 	if systemd_is_booted ; then
 		ewarn "pipewire-media-session.service is no longer installed. You must switch"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index a74423c9d3e4..55bb0fc276a1 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 71a731690160..986f831690ee 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 01 Jun 2024 22:40:31 +0000
+Sun, 02 Jun 2024 22:40:38 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 488700693165..99c008d9ed3f 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 574731 BLAKE2B 89caa0807b8cb3bb8f1cc5679dbe23ca4398827dd3b841269212eea4c56cfd057c2066dfc5853236e4134ffbd1bf10272359df656c88cc2dda1c7d6317ab1970 SHA512 68081b023a298180abb3d5c6ce33bd36fece32d1d6fe7d38f87edd236b3e70d2dc5c11f8a42561ff66103806af4278e08e0282649c4d9fe95a44f29ea0bc82b8
-TIMESTAMP 2024-06-01T22:40:36Z
+TIMESTAMP 2024-06-02T22:40:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmZbo2RfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmZc9OlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBptg//eCv3u0LJ0HIIoS8o7rV6R/a2khGwqOcHWRNtc+fmFDPJsWzySxMm2tlG
-1DLmkFSAFQJAGQ478hWRfsVe2q4Ee1nifv1soU9IxsKi6qAWbauUsIRBP2MK/9Cs
-NSoywytTHe2U6u9o9X6WOK8k7RUyAUlJbQHhmqFMkfVJMo5XucGPtEdBx57csYlX
-o4D06wFnjkXIqpn6byUVKBaBvHs6M40xA2bJml3k6dLeu7YR52ZpMOG8XzAJWsnc
-eIZgupNHnCEwJb+4khyoeURwUY00gARoPoQJHqkmGrLLvrzRZODT+9bFuo8hm7bH
-JXSfhHS8nfVpPpELuclQcnAioSrUslYeDlQ1DTEmCnmtf87GjGzZ6Orqdr2meOhZ
-XNobU57tEswEzedFRg6FlAAAxth5QISsUXBSJM8ZMqDkk56GpaUbAGtf9Hdd+hJm
-UDF46ARhOHwMmcveFY76khJm7eB2j9Yp7pi/ykKgfGNhz8nmUx1x8X+IaObSH5Si
-KMHXldAlUrVtujo2MxMambN1gqbjKseM+4hpziiPG9Wsgj7/BAdpWiFeCmRorq1q
-DISPcjgeRKsSgYOj6XGa9qxuSW+iLnnisCZcOzgfGhshQClrHEBpPYamhfZ1Mf8p
-q/HLB8LYwMPdwd1/KdUu+LRCMCL4cMpZXMvgqBXTF4AsOsG1lNM=
-=26zp
+klBl9BAAsmS4jcpcHLqdQ+/O8DjXoUHTgzzQPjgwMfEydZGZDYmB9nnXgj+lIwhA
+FUTMn6RXjWbLPffwHDAZS2JRMdhVUTG+mdbRXweu8p/2mq6LQSTgn9FF3TxmWds0
+84yilt8gKHcAhqs0dKWlUnTr+UoxktY/Bml8ZHaP7SSKzUzUKmbbJYPWeOMq4om+
+DrA7Z5bn3q1dQ7yTaPXRWWwLlIPw3KRCrODDrhy5iB0F9bP5nPi8PUOHmiGMXkc1
+Izduxnl09quS4V8C4XVMnWlE939GsWKs4aLhGHt0X3rCnnGDi3EFjXOukNRNvcy2
+f05fdotpARx2bzDOeHDRo5hNMZO1e8pPsM/szChZkgWLU13t/9FeWWrnm4VUL0d5
+bDsC62NkscJz23Xd+XRVYtQ6oypEp3Sw6qdMevlbuV2Qw52pW6M3askd6RSIVodP
+NYDK0FfeKjT84ESTe78gb2SHUfj66UDraH8SGwiFZN2GXBH7xWBuHcTJT9yc3tEQ
+7z1eohzdOSEPeo8s5NDTruANg22a2IVYo8e1Fwm0n7QwIc9x7QjFT0pKH2r9bqHj
+XF7TsWP3F6r+ZWysNIZEGzwnEHmOzlBJ/bmE9ar3gUZKKHX5Sao7owes2pRL2eAh
+/3V9gtg6PmU9AWrcfmQhvRTfBDT3rFEaR50aMVoCPbNyLmJNsxU=
+=XXpr
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 71a731690160..986f831690ee 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 01 Jun 2024 22:40:31 +0000
+Sun, 02 Jun 2024 22:40:38 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index ab282ce5a0c9..40282f29cb54 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 61d17bc63538..abadc7d37fbd 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/brltty-6.6-r1 b/metadata/md5-cache/app-accessibility/brltty-6.6-r1
index e8ee58421eae..3a9e01541c57 100644
--- a/metadata/md5-cache/app-accessibility/brltty-6.6-r1
+++ b/metadata/md5-cache/app-accessibility/brltty-6.6-r1
@@ -1,16 +1,16 @@
-BDEPEND=>=dev-lang/tcl-8.6.13-r1 virtual/pkgconfig java? ( >=virtual/jdk-1.8:* ) nls? ( virtual/libintl ) python? ( dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3
+BDEPEND=>=dev-lang/tcl-8.6.13-r1 virtual/pkgconfig java? ( >=virtual/jdk-1.8:* ) nls? ( virtual/libintl ) python? ( dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=acct-group/brltty acct-user/brltty dev-libs/libpcre2[pcre32] bluetooth? ( sys-apps/dbus net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu:= ) louis? ( dev-libs/liblouis:= ) midi? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses:0= ) pcm? ( media-libs/alsa-lib ) policykit? ( sys-auth/polkit ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) speech? ( app-accessibility/espeak-ng app-accessibility/flite app-accessibility/speech-dispatcher ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8.6.13-r1:= ) usb? ( virtual/libusb:1 ) xml? ( dev-libs/expat ) X? ( app-accessibility/at-spi2-core:2 sys-apps/dbus x11-libs/libX11 x11-libs/libXaw x11-libs/libXfixes x11-libs/libXt x11-libs/libXtst ) ocaml? ( >=dev-ml/findlib-1.0.4-r1[ocamlopt?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=acct-group/brltty acct-user/brltty dev-libs/libpcre2[pcre32] bluetooth? ( sys-apps/dbus net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu:= ) louis? ( dev-libs/liblouis:= ) midi? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses:0= ) pcm? ( media-libs/alsa-lib ) policykit? ( sys-auth/polkit ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) speech? ( app-accessibility/espeak-ng app-accessibility/flite app-accessibility/speech-dispatcher ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8.6.13-r1:= ) usb? ( virtual/libusb:1 ) xml? ( dev-libs/expat ) X? ( app-accessibility/at-spi2-core:2 sys-apps/dbus x11-libs/libX11 x11-libs/libXaw x11-libs/libXfixes x11-libs/libXt x11-libs/libXtst ) ocaml? ( >=dev-ml/findlib-1.0.4-r1[ocamlopt?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Daemon that provides access to the Linux/Unix console for a blind person
 EAPI=8
 HOMEPAGE=https://brltty.app/
 INHERIT=findlib toolchain-funcs java-pkg-opt-2 autotools python-r1 tmpfiles
-IUSE=+api +beeper bluetooth doc +fm gpm iconv icu java louis +midi ncurses nls ocaml +pcm policykit python usb systemd +speech tcl xml X +ocamlopt java python_targets_python3_10 python_targets_python3_11
+IUSE=+api +beeper bluetooth doc +fm gpm iconv icu java louis +midi ncurses nls ocaml +pcm policykit python usb systemd +speech tcl xml X +ocamlopt java python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=acct-group/brltty acct-user/brltty dev-libs/libpcre2[pcre32] bluetooth? ( sys-apps/dbus net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu:= ) louis? ( dev-libs/liblouis:= ) midi? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses:0= ) pcm? ( media-libs/alsa-lib ) policykit? ( sys-auth/polkit ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) speech? ( app-accessibility/espeak-ng app-accessibility/flite app-accessibility/speech-dispatcher ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8.6.13-r1:= ) usb? ( virtual/libusb:1 ) xml? ( dev-libs/expat ) X? ( app-accessibility/at-spi2-core:2 sys-apps/dbus x11-libs/libX11 x11-libs/libXaw x11-libs/libXfixes x11-libs/libXt x11-libs/libXtst ) java? ( >=virtual/jre-1.8:* ) ocaml? ( dev-lang/ocaml:=[ocamlopt?] ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api || ( python_targets_python3_10 python_targets_python3_11 ) ) tcl? ( api )
+RDEPEND=acct-group/brltty acct-user/brltty dev-libs/libpcre2[pcre32] bluetooth? ( sys-apps/dbus net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu:= ) louis? ( dev-libs/liblouis:= ) midi? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses:0= ) pcm? ( media-libs/alsa-lib ) policykit? ( sys-auth/polkit ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) speech? ( app-accessibility/espeak-ng app-accessibility/flite app-accessibility/speech-dispatcher ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8.6.13-r1:= ) usb? ( virtual/libusb:1 ) xml? ( dev-libs/expat ) X? ( app-accessibility/at-spi2-core:2 sys-apps/dbus x11-libs/libX11 x11-libs/libXaw x11-libs/libXfixes x11-libs/libXt x11-libs/libXtst ) java? ( >=virtual/jre-1.8:* ) ocaml? ( dev-lang/ocaml:=[ocamlopt?] ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) ) tcl? ( api )
 SLOT=0
 SRC_URI=https://brltty.app/archive/brltty-6.6.tar.xz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	findlib	49d5365fca4dea46f13825b9d763c89e	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	b346c3901e71ba37137bae0b25b00221	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=ceb4521e75a3e6b7a863f8f71311ec58
+_md5_=8223ff25c921a326cdfe865c96d53095
diff --git a/metadata/md5-cache/app-accessibility/orca-45.2 b/metadata/md5-cache/app-accessibility/orca-45.2
deleted file mode 100644
index c8d7f984f303..000000000000
--- a/metadata/md5-cache/app-accessibility/orca-45.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20240116 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) >=app-accessibility/at-spi2-core-2.48:2[introspection] >=dev-libs/glib-2.28:2 media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] python_single_target_python3_10? ( dev-python/gst-python:1.0[python_targets_python3_10(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/gst-python:1.0[python_targets_python3_11(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_11(-)] ) braille? ( python_single_target_python3_10? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_10(-)] dev-libs/liblouis[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_11(-)] dev-libs/liblouis[python,python_targets_python3_11(-)] ) )
-DESCRIPTION=Extensible screen reader that provides access to the desktop
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/Orca
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2 python-single-r1
-IUSE=+braille python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=LGPL-2.1+ CC-BY-SA-3.0
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) >=app-accessibility/at-spi2-core-2.48:2[introspection] >=dev-libs/glib-2.28:2 media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] python_single_target_python3_10? ( dev-python/gst-python:1.0[python_targets_python3_10(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/gst-python:1.0[python_targets_python3_11(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_11(-)] ) braille? ( python_single_target_python3_10? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_10(-)] dev-libs/liblouis[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_11(-)] dev-libs/liblouis[python,python_targets_python3_11(-)] ) ) python_single_target_python3_10? ( >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_10(-)] >=dev-python/pyatspi-2.46[python_targets_python3_10(-)] dev-python/setproctitle[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_11(-)] >=dev-python/pyatspi-2.46[python_targets_python3_11(-)] dev-python/setproctitle[python_targets_python3_11(-)] ) x11-libs/libwnck:3[introspection] x11-libs/pango[introspection]
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/orca/45/orca-45.2.tar.xz
-_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	fc9e598eaac41c6ac9ed1a44bc004d03	gnome2-utils	30dbce54b89e77b86f366548f94419ad	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=db3c20e476aa31c1e542be2c50c03e57
diff --git a/metadata/md5-cache/app-accessibility/orca-45.2-r1 b/metadata/md5-cache/app-accessibility/orca-45.2-r1
new file mode 100644
index 000000000000..28011804c0c9
--- /dev/null
+++ b/metadata/md5-cache/app-accessibility/orca-45.2-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20240116 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) >=app-accessibility/at-spi2-core-2.48:2[introspection] >=dev-libs/glib-2.28:2 media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] python_single_target_python3_10? ( dev-python/gst-python:1.0[python_targets_python3_10(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/gst-python:1.0[python_targets_python3_11(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/gst-python:1.0[python_targets_python3_12(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_12(-)] ) braille? ( python_single_target_python3_10? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_12(-)] ) || ( >=dev-libs/liblouis-3.29.0[python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?] python_single_target_python3_10? ( <dev-libs/liblouis-3.29.0[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( <dev-libs/liblouis-3.29.0[python,python_targets_python3_11(-)] ) python_single_target_python3_12? ( <dev-libs/liblouis-3.29.0[python,python_targets_python3_12(-)] ) ) )
+DESCRIPTION=Extensible screen reader that provides access to the desktop
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/Orca
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2 python-single-r1
+IUSE=+braille python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+LICENSE=LGPL-2.1+ CC-BY-SA-3.0
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) >=app-accessibility/at-spi2-core-2.48:2[introspection] >=dev-libs/glib-2.28:2 media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] python_single_target_python3_10? ( dev-python/gst-python:1.0[python_targets_python3_10(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/gst-python:1.0[python_targets_python3_11(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/gst-python:1.0[python_targets_python3_12(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_12(-)] ) braille? ( python_single_target_python3_10? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_12(-)] ) || ( >=dev-libs/liblouis-3.29.0[python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?] python_single_target_python3_10? ( <dev-libs/liblouis-3.29.0[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( <dev-libs/liblouis-3.29.0[python,python_targets_python3_11(-)] ) python_single_target_python3_12? ( <dev-libs/liblouis-3.29.0[python,python_targets_python3_12(-)] ) ) ) python_single_target_python3_10? ( >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_10(-)] >=dev-python/pyatspi-2.46[python_targets_python3_10(-)] dev-python/setproctitle[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_11(-)] >=dev-python/pyatspi-2.46[python_targets_python3_11(-)] dev-python/setproctitle[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_12(-)] >=dev-python/pyatspi-2.46[python_targets_python3_12(-)] dev-python/setproctitle[python_targets_python3_12(-)] ) x11-libs/libwnck:3[introspection] x11-libs/pango[introspection]
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/orca/45/orca-45.2.tar.xz
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	fc9e598eaac41c6ac9ed1a44bc004d03	gnome2-utils	30dbce54b89e77b86f366548f94419ad	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=e331e6de2cc299133fa960845d3d23e1
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index e17dbb0f8f02..9b30a223aefa 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/gtkdiskfree-2.0.4_p20200224-r2 b/metadata/md5-cache/app-admin/gtkdiskfree-2.0.4_p20200224-r2
new file mode 100644
index 000000000000..01fe5c315ec0
--- /dev/null
+++ b/metadata/md5-cache/app-admin/gtkdiskfree-2.0.4_p20200224-r2
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure
+DEPEND=dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) x11-base/xorg-proto
+DESCRIPTION=Graphical tool to show free disk space like df
+EAPI=8
+HOMEPAGE=https://gitlab.com/mazes_80/gtkdiskfree
+IUSE=gtk2
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 )
+SLOT=0
+SRC_URI=https://gitlab.com/mazes_80/gtkdiskfree/-/archive/bdda379b9109a226a37801505a19da91494144a6/gtkdiskfree-bdda379b9109a226a37801505a19da91494144a6.tar.gz
+_md5_=64082e2f92c247934357ee2847fece1d
diff --git a/metadata/md5-cache/app-admin/needrestart-3.6-r1 b/metadata/md5-cache/app-admin/needrestart-3.6-r1
new file mode 100644
index 000000000000..b645d84ec283
--- /dev/null
+++ b/metadata/md5-cache/app-admin/needrestart-3.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey !systemd? ( sys-apps/init-system-helpers ) amd64? ( sys-apps/iucode_tool ) x86? ( sys-apps/iucode_tool ) sys-devel/gettext
+DESCRIPTION=Restart daemons after library updates
+EAPI=8
+HOMEPAGE=https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart
+IUSE=systemd
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey !systemd? ( sys-apps/init-system-helpers ) amd64? ( sys-apps/iucode_tool ) x86? ( sys-apps/iucode_tool )
+SLOT=0
+SRC_URI=https://github.com/liske/needrestart/archive/v3.6.tar.gz -> needrestart-3.6.tar.gz
+_md5_=dc4ba5441ad353080c58c7992f5efd19
diff --git a/metadata/md5-cache/app-admin/needrestart-9999 b/metadata/md5-cache/app-admin/needrestart-9999
index b1d857c9782a..4b5deb601957 100644
--- a/metadata/md5-cache/app-admin/needrestart-9999
+++ b/metadata/md5-cache/app-admin/needrestart-9999
@@ -1,13 +1,14 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install unpack
-DEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers amd64? ( sys-apps/iucode_tool ) x86? ( sys-apps/iucode_tool ) sys-devel/gettext
+DEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey !systemd? ( sys-apps/init-system-helpers ) amd64? ( sys-apps/iucode_tool ) x86? ( sys-apps/iucode_tool ) sys-devel/gettext
 DESCRIPTION=Restart daemons after library updates
 EAPI=8
 HOMEPAGE=https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart
 INHERIT=git-r3
+IUSE=systemd
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers amd64? ( sys-apps/iucode_tool ) x86? ( sys-apps/iucode_tool )
+RDEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey !systemd? ( sys-apps/init-system-helpers ) amd64? ( sys-apps/iucode_tool ) x86? ( sys-apps/iucode_tool )
 SLOT=0
 _eclasses_=git-r3	fbb2889c81f3a05910c1524db69425c1
-_md5_=5e5aa6ec2fc4a3b37a8e519d97b42063
+_md5_=dc4ba5441ad353080c58c7992f5efd19
diff --git a/metadata/md5-cache/app-admin/opentofu-1.7.1 b/metadata/md5-cache/app-admin/opentofu-1.7.1
new file mode 100644
index 000000000000..38b1cb74eeda
--- /dev/null
+++ b/metadata/md5-cache/app-admin/opentofu-1.7.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-go/gox >=dev-lang/go-1.20:= app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=The open source infrastructure as code tool
+EAPI=8
+HOMEPAGE=https://www.opentofu.org/
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 MPL-2.0 MIT ISC
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/opentofu/opentofu/archive/v1.7.1.tar.gz -> opentofu-1.7.1.tar.gz https://dev.gentoo.org/~williamh/dist/opentofu-1.7.1-deps.tar.xz
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=9d1997a92978124eb205c32d71ea76f9
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index ccf763da3c40..a57b1b3c911a 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/torrentzip-0.9-r1 b/metadata/md5-cache/app-arch/torrentzip-0.9-r1
deleted file mode 100644
index 8cdd8acec03e..000000000000
--- a/metadata/md5-cache/app-arch/torrentzip-0.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3
-DEFINED_PHASES=prepare
-DEPEND=sys-libs/zlib
-DESCRIPTION=Create identical zip archives over multiple systems
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/trrntzip
-INHERIT=autotools
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~monsieurp/packages/torrentzip-0.9.tar.gz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=7e60833362de09bd8a08942a9351918c
diff --git a/metadata/md5-cache/app-arch/torrentzip-1.2-r1 b/metadata/md5-cache/app-arch/torrentzip-1.2-r1
deleted file mode 100644
index f310cbf2e0ff..000000000000
--- a/metadata/md5-cache/app-arch/torrentzip-1.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib:=
-DESCRIPTION=Create identical zip archives over multiple systems
-EAPI=8
-HOMEPAGE=https://github.com/0-wiz-0/trrntzip
-INHERIT=cmake
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ ZLIB
-RDEPEND=sys-libs/zlib:=
-SLOT=0
-SRC_URI=https://github.com/0-wiz-0/trrntzip/archive/v1.2.tar.gz -> trrntzip-1.2.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a769b078e72a06266e382c2fa3fe7ee2
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.6.2 b/metadata/md5-cache/app-arch/xz-utils-5.6.2
index aa79ee753a81..4181e218b418 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.6.2
+++ b/metadata/md5-cache/app-arch/xz-utils-5.6.2
@@ -10,4 +10,4 @@ LICENSE=0BSD LGPL-2.1+ GPL-2+ doc? ( CC-BY-SA-4.0 )
 SLOT=0
 SRC_URI=https://github.com/tukaani-project/xz/releases/download/v5.6.2/xz-5.6.2.tar.gz https://downloads.sourceforge.net/lzmautils/xz-5.6.2.tar.gz https://tukaani.org/xz/xz-5.6.2.tar.gz verify-sig? ( https://github.com/tukaani-project/xz/releases/download/v5.6.2/xz-5.6.2.tar.gz.sig https://tukaani.org/xz/xz-5.6.2.tar.gz.sig )
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=c4c8df4a23c227860ca68f7719624824
+_md5_=2422b7790b99b5a53c0069efd5b029d8
diff --git a/metadata/md5-cache/app-arch/xz-utils-9999 b/metadata/md5-cache/app-arch/xz-utils-9999
index a987f3857a42..4bba6d08f7b7 100644
--- a/metadata/md5-cache/app-arch/xz-utils-9999
+++ b/metadata/md5-cache/app-arch/xz-utils-9999
@@ -9,4 +9,4 @@ LICENSE=0BSD LGPL-2.1+ GPL-2+ doc? ( CC-BY-SA-4.0 )
 PROPERTIES=live
 SLOT=0
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c4c8df4a23c227860ca68f7719624824
+_md5_=2422b7790b99b5a53c0069efd5b029d8
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index e1b6ee084db1..579ebb3854a6 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-20240501 b/metadata/md5-cache/app-dicts/myspell-en-20240501
new file mode 100644
index 000000000000..3730d9078661
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/myspell-en-20240501
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=English dictionaries for myspell/hunspell
+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
+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/1714540032/dict-en-20240501_lo.oxt
+_eclasses_=myspell-r2	d70debd5f4806077ff74738d349a5927
+_md5_=a590c6773bdf2dae97d6f1ecc095f408
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 24ff5f5ac387..c4dbb229a09a 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/vis-0.9 b/metadata/md5-cache/app-editors/vis-0.9
new file mode 100644
index 000000000000..b930f3a494e5
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vis-0.9
@@ -0,0 +1,17 @@
+BDEPEND=test? ( lua_single_target_lua5-3? ( dev-lua/lpeg[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/lpeg[lua_targets_lua5-4(-)] ) lua_single_target_lua5-3? ( dev-lua/busted[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/busted[lua_targets_lua5-4(-)] ) )
+DEFINED_PHASES=configure postinst postrm prepare setup
+DEPEND=dev-libs/libtermkey sys-apps/acl ncurses? ( sys-libs/ncurses:0= ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) tre? ( dev-libs/tre )
+DESCRIPTION=modern, legacy free, simple yet efficient vim-like editor
+EAPI=8
+HOMEPAGE=https://github.com/martanne/vis
+INHERIT=lua-single
+IUSE=+ncurses +lua selinux test tre lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=ISC MIT
+RDEPEND=dev-libs/libtermkey sys-apps/acl ncurses? ( sys-libs/ncurses:0= ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) tre? ( dev-libs/tre ) app-eselect/eselect-vi lua? ( lua_single_target_lua5-3? ( dev-lua/lpeg[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/lpeg[lua_targets_lua5-4(-)] ) )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/martanne/vis/archive/refs/tags/v0.9.tar.gz -> vis-0.9.tar.gz test? ( https://github.com/martanne/vis-test/archive/783b7ef67aa360f0b9bd44fa5ea47e644bc49d69.tar.gz -> vis-test-783b7ef67aa360f0b9bd44fa5ea47e644bc49d69.tar.gz )
+_eclasses_=lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=45c898855d288615e17fdfbd856e52ec
diff --git a/metadata/md5-cache/app-editors/vis-9999 b/metadata/md5-cache/app-editors/vis-9999
index d0024ccd1ed8..509e94fee866 100644
--- a/metadata/md5-cache/app-editors/vis-9999
+++ b/metadata/md5-cache/app-editors/vis-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	fbb2889c81f3a05910c1524db69425c1	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=d4fb76dfd7a85777f5e5d9d0070a6e14
+_md5_=50e4b9c83c87b72ab1b4238a0144a34a
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 90cd8e1054ea..69dd540a0196 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-6.0.0 b/metadata/md5-cache/app-emulation/qemu-guest-agent-6.0.0
deleted file mode 100644
index 41cd2f5dcd42..000000000000
--- a/metadata/md5-cache/app-emulation/qemu-guest-agent-6.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm setup
-DEPEND=dev-libs/glib || ( dev-lang/python:3.11 dev-lang/python:3.10 )
-DESCRIPTION=QEMU Guest Agent (qemu-ga) for use when running inside a VM
-EAPI=7
-HOMEPAGE=https://wiki.qemu.org/Features/GuestAgent
-INHERIT=systemd toolchain-funcs udev python-any-r1
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-2 BSD-2
-RDEPEND=dev-libs/glib
-SLOT=0
-SRC_URI=http://wiki.qemu.org/download/qemu-6.0.0.tar.xz
-_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=82b5224edf5125642be15ec9d4482f4c
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-7.1.0 b/metadata/md5-cache/app-emulation/qemu-guest-agent-7.1.0
deleted file mode 100644
index ec10956f2c13..000000000000
--- a/metadata/md5-cache/app-emulation/qemu-guest-agent-7.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl app-alternatives/ninja virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm setup
-DEPEND=dev-libs/glib
-DESCRIPTION=QEMU Guest Agent (qemu-ga) for use when running inside a VM
-EAPI=8
-HOMEPAGE=https://wiki.qemu.org/Features/GuestAgent
-INHERIT=edo systemd toolchain-funcs python-any-r1 udev
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-2 BSD-2
-RDEPEND=dev-libs/glib
-SLOT=0
-SRC_URI=http://wiki.qemu.org/download/qemu-7.1.0.tar.xz
-_eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=5c96f444c13c2c6bf80e8a578a13c6d3
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-8.0.0 b/metadata/md5-cache/app-emulation/qemu-guest-agent-8.0.0
deleted file mode 100644
index 07dd85003829..000000000000
--- a/metadata/md5-cache/app-emulation/qemu-guest-agent-8.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl app-alternatives/ninja virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm setup
-DEPEND=dev-libs/glib
-DESCRIPTION=QEMU Guest Agent (qemu-ga) for use when running inside a VM
-EAPI=8
-HOMEPAGE=https://wiki.qemu.org/Features/GuestAgent
-INHERIT=edo systemd toolchain-funcs python-any-r1 udev
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-2 BSD-2
-RDEPEND=dev-libs/glib
-SLOT=0
-SRC_URI=http://wiki.qemu.org/download/qemu-8.0.0.tar.xz
-_eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=790ddb7b179c11bc6a5832bed66cd0c8
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-8.0.2 b/metadata/md5-cache/app-emulation/qemu-guest-agent-8.0.2
deleted file mode 100644
index 0056fa08ce47..000000000000
--- a/metadata/md5-cache/app-emulation/qemu-guest-agent-8.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl app-alternatives/ninja virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm setup
-DEPEND=dev-libs/glib
-DESCRIPTION=QEMU Guest Agent (qemu-ga) for use when running inside a VM
-EAPI=8
-HOMEPAGE=https://wiki.qemu.org/Features/GuestAgent
-INHERIT=edo systemd toolchain-funcs python-any-r1 udev
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2 BSD-2
-RDEPEND=dev-libs/glib
-SLOT=0
-SRC_URI=http://wiki.qemu.org/download/qemu-8.0.2.tar.xz
-_eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=0c55b85c0f7e5136f835f2ecc493cd5f
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-8.0.3 b/metadata/md5-cache/app-emulation/qemu-guest-agent-8.0.3
deleted file mode 100644
index c9d4a4d7a456..000000000000
--- a/metadata/md5-cache/app-emulation/qemu-guest-agent-8.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl app-alternatives/ninja virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm setup
-DEPEND=dev-libs/glib
-DESCRIPTION=QEMU Guest Agent (qemu-ga) for use when running inside a VM
-EAPI=8
-HOMEPAGE=https://wiki.qemu.org/Features/GuestAgent
-INHERIT=edo systemd toolchain-funcs python-any-r1 udev
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-2 BSD-2
-RDEPEND=dev-libs/glib
-SLOT=0
-SRC_URI=http://wiki.qemu.org/download/qemu-8.0.3.tar.xz
-_eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=60aa271b4e36ea2ca36d14bcf228837f
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-8.2.0 b/metadata/md5-cache/app-emulation/qemu-guest-agent-8.2.0
index d538dd214ca5..2fd9b3501040 100644
--- a/metadata/md5-cache/app-emulation/qemu-guest-agent-8.2.0
+++ b/metadata/md5-cache/app-emulation/qemu-guest-agent-8.2.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl app-alternatives/ninja virtual/pkgconfig virtual/pkgconfig
+BDEPEND=|| ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl app-alternatives/ninja virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=configure install postinst postrm setup test
 DEPEND=dev-libs/glib
 DESCRIPTION=QEMU Guest Agent (qemu-ga) for use when running inside a VM
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/glib
 SLOT=0
 SRC_URI=http://wiki.qemu.org/download/qemu-8.2.0.tar.xz
 _eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=316faec51da434c4168093c75dadcc62
+_md5_=19a7af7b8ee205eeb82136ec69c79eb2
diff --git a/metadata/md5-cache/app-emulation/wine-proton-7.0.6 b/metadata/md5-cache/app-emulation/wine-proton-7.0.6
index a62412528f05..ec66aae3775f 100644
--- a/metadata/md5-cache/app-emulation/wine-proton-7.0.6
+++ b/metadata/md5-cache/app-emulation/wine-proton-7.0.6
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=7.0.6
 SRC_URI=https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-7.0-6.tar.gz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=171418cdc9ae166bf841b8af172f569f
+_md5_=e746a8906f756ebae5e5c928d4e10b85
diff --git a/metadata/md5-cache/app-emulation/wine-proton-8.0.5c b/metadata/md5-cache/app-emulation/wine-proton-8.0.5c
index e60e1cb44aa2..bf832a6e376b 100644
--- a/metadata/md5-cache/app-emulation/wine-proton-8.0.5c
+++ b/metadata/md5-cache/app-emulation/wine-proton-8.0.5c
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=8.0.5c
 SRC_URI=https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-8.0-5c.tar.gz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9bf149888701677ef26e84fe95f2dce2
+_md5_=51678faa12f156776d76ea5869547090
diff --git a/metadata/md5-cache/app-emulation/wine-proton-9.0.1 b/metadata/md5-cache/app-emulation/wine-proton-9.0.1
index f33526dcec4a..e7d68099fca3 100644
--- a/metadata/md5-cache/app-emulation/wine-proton-9.0.1
+++ b/metadata/md5-cache/app-emulation/wine-proton-9.0.1
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=9.0.1
 SRC_URI=https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-9.0-1.tar.gz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9408af62e1aaa12dbaeac63a7a656e1d
+_md5_=84f6479ff578c940cb6e9efda4375892
diff --git a/metadata/md5-cache/app-emulation/wine-proton-9.0.9999 b/metadata/md5-cache/app-emulation/wine-proton-9.0.9999
index 23dc105884ed..b669895e26da 100644
--- a/metadata/md5-cache/app-emulation/wine-proton-9.0.9999
+++ b/metadata/md5-cache/app-emulation/wine-proton-9.0.9999
@@ -14,4 +14,4 @@ REQUIRED_USE=wow64? ( abi_x86_64 !abi_x86_32 ) || ( abi_x86_32 abi_x86_64 )
 RESTRICT=test
 SLOT=9.0.9999
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=64d83fdeffe4fecacad5b9d1e130a718
+_md5_=9f4c0d12ab34171d30687035646f9cf5
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 6637823454de..3caf26d5307a 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/afflib-3.7.19-r1 b/metadata/md5-cache/app-forensics/afflib-3.7.19-r1
deleted file mode 100644
index b626ccf2d609..000000000000
--- a/metadata/md5-cache/app-forensics/afflib-3.7.19-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/expat sys-libs/zlib:= fuse? ( sys-fs/fuse:0 ) dev-libs/openssl:= ncurses? ( sys-libs/ncurses:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] ) ) readline? ( sys-libs/readline:= ) s3? ( net-misc/curl )
-DESCRIPTION=Library that implements the AFF image standard
-EAPI=8
-HOMEPAGE=https://github.com/sshock/AFFLIBv3/
-INHERIT=autotools python-single-r1
-IUSE=fuse ncurses python qemu readline s3 static-libs threads +python_single_target_python3_10
-KEYWORDS=amd64 ~arm ~hppa ppc x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=dev-libs/expat sys-libs/zlib:= fuse? ( sys-fs/fuse:0 ) dev-libs/openssl:= ncurses? ( sys-libs/ncurses:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] ) ) readline? ( sys-libs/readline:= ) s3? ( net-misc/curl )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/sshock/AFFLIBv3/archive/v3.7.19.tar.gz -> afflib-3.7.19.tar.gz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=50dd99ce8d4b1237296f96220094f8d2
diff --git a/metadata/md5-cache/app-forensics/afflib-3.7.20 b/metadata/md5-cache/app-forensics/afflib-3.7.20-r1
index 3136cde7c7b9..94e7dc58a15d 100644
--- a/metadata/md5-cache/app-forensics/afflib-3.7.20
+++ b/metadata/md5-cache/app-forensics/afflib-3.7.20-r1
@@ -1,17 +1,17 @@
 BDEPEND=>=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3
 DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/expat sys-libs/zlib:= fuse? ( sys-fs/fuse:0 ) dev-libs/openssl:= ncurses? ( sys-libs/ncurses:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cython[python_targets_python3_11(-)] ) ) readline? ( sys-libs/readline:= ) s3? ( net-misc/curl )
+DEPEND=dev-libs/expat sys-libs/zlib:= fuse? ( sys-fs/fuse:0 ) dev-libs/openssl:= ncurses? ( sys-libs/ncurses:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cython[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/cython[python_targets_python3_12(-)] ) ) readline? ( sys-libs/readline:= ) s3? ( net-misc/curl )
 DESCRIPTION=Library that implements the AFF image standard
 EAPI=8
 HOMEPAGE=https://github.com/sshock/AFFLIBv3/
 INHERIT=autotools python-single-r1
-IUSE=fuse ncurses python qemu readline s3 static-libs threads python_single_target_python3_10 python_single_target_python3_11
+IUSE=fuse ncurses python qemu readline s3 static-libs threads python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
 KEYWORDS=amd64 ~arm ~hppa ppc x86 ~x64-macos
 LICENSE=BSD
-RDEPEND=dev-libs/expat sys-libs/zlib:= fuse? ( sys-fs/fuse:0 ) dev-libs/openssl:= ncurses? ( sys-libs/ncurses:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cython[python_targets_python3_11(-)] ) ) readline? ( sys-libs/readline:= ) s3? ( net-misc/curl )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
+RDEPEND=dev-libs/expat sys-libs/zlib:= fuse? ( sys-fs/fuse:0 ) dev-libs/openssl:= ncurses? ( sys-libs/ncurses:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cython[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/cython[python_targets_python3_12(-)] ) ) readline? ( sys-libs/readline:= ) s3? ( net-misc/curl )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/sshock/AFFLIBv3/archive/v3.7.20.tar.gz -> afflib-3.7.20.tar.gz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=58d3d41f500191184eff1a040c9839ca
+_md5_=588dfb0339c89266aa4719a23b5ee551
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 6e98b18918f3..70328572020a 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/fcitx-5.1.8 b/metadata/md5-cache/app-i18n/fcitx-5.1.10
index 6e602a18a03d..ca6e14266cc6 100644
--- a/metadata/md5-cache/app-i18n/fcitx-5.1.8
+++ b/metadata/md5-cache/app-i18n/fcitx-5.1.10
@@ -1,11 +1,11 @@
 BDEPEND=virtual/pkgconfig kde-frameworks/extra-cmake-modules:0 app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
 DEPEND=!app-i18n/fcitx:4 dev-libs/libfmt sys-devel/gettext virtual/libintl x11-libs/cairo[X?] x11-libs/gdk-pixbuf:2 x11-libs/pango[X?] doc? ( app-text/doxygen dev-texlive/texlive-fontutils ) emoji? ( sys-libs/zlib ) enchant? ( app-text/enchant:2 ) keyboard? ( app-text/iso-codes dev-libs/expat dev-libs/json-c:= x11-misc/xkeyboard-config x11-libs/libxkbcommon[X?,wayland?] ) systemd? ( sys-apps/systemd ) !systemd? ( dev-libs/libuv sys-apps/dbus ) wayland? ( dev-libs/glib:2 dev-libs/wayland dev-libs/wayland-protocols dev-util/wayland-scanner ) X? ( dev-libs/glib:2 >=x11-libs/xcb-imdkit-1.0.3:5 x11-libs/libX11 x11-libs/libxkbfile x11-libs/xcb-util x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm )
 DESCRIPTION=Fcitx 5 is a generic input method framework
 EAPI=8
 HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx5
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake xdg
+INHERIT=cmake unpacker xdg
 IUSE=+autostart doc +emoji +enchant +keyboard presage +server systemd test wayland +X
 KEYWORDS=~amd64 ~arm64 ~loong ~riscv ~x86
 LICENSE=LGPL-2+ Unicode-DFS-2016
@@ -13,6 +13,6 @@ RDEPEND=!app-i18n/fcitx:4 dev-libs/libfmt sys-devel/gettext virtual/libintl x11-
 REQUIRED_USE=|| ( wayland X ) X? ( keyboard ) wayland? ( keyboard )
 RESTRICT=!test? ( test )
 SLOT=5
-SRC_URI=https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-5.1.8_dict.tar.xz -> fcitx-5.1.8.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f2c8e151daf7b68deeee318a6797bc31
+SRC_URI=https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-5.1.10_dict.tar.zst -> fcitx-5.1.10.tar.zst
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=6222a2c3f22ace5b22b78a474f8b6d4c
diff --git a/metadata/md5-cache/app-i18n/fcitx-chinese-addons-5.1.4 b/metadata/md5-cache/app-i18n/fcitx-chinese-addons-5.1.6
index f57dac49e134..1020fbd52414 100644
--- a/metadata/md5-cache/app-i18n/fcitx-chinese-addons-5.1.4
+++ b/metadata/md5-cache/app-i18n/fcitx-chinese-addons-5.1.6
@@ -1,18 +1,18 @@
 BDEPEND=kde-frameworks/extra-cmake-modules:0 virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-i18n/fcitx-5.1.6:5 >=app-i18n/libime-1.1.3:5[data?] >=dev-libs/boost-1.61:= cloudpinyin? ( net-misc/curl ) lua? ( app-i18n/fcitx-lua:5 ) opencc? ( app-i18n/opencc:= ) gui? ( qt5? ( dev-qt/qtconcurrent:5 app-i18n/fcitx-qt:5[qt5,-onlyplugin] webengine? ( dev-qt/qtwebengine:5[widgets] ) ) qt6? ( dev-qt/qtbase:6[concurrent] app-i18n/fcitx-qt:5[qt6,-onlyplugin] webengine? ( dev-qt/qtwebengine:6[widgets] ) ) )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=app-i18n/fcitx-5.1.9:5 >=app-i18n/libime-1.1.7:5[data?] >=dev-libs/boost-1.61:= cloudpinyin? ( net-misc/curl ) lua? ( app-i18n/fcitx-lua:5 ) opencc? ( app-i18n/opencc:= ) gui? ( qt5? ( dev-qt/qtconcurrent:5 app-i18n/fcitx-qt:5[qt5,-onlyplugin] webengine? ( dev-qt/qtwebengine:5[widgets] ) ) qt6? ( dev-qt/qtbase:6[concurrent] app-i18n/fcitx-qt:5[qt6,-onlyplugin] webengine? ( dev-qt/qtwebengine:6[widgets] ) ) )
 DESCRIPTION=Addons related to Chinese, including IME previous bundled inside fcitx4.
 EAPI=8
 HOMEPAGE=https://github.com/fcitx/fcitx5-chinese-addons
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake xdg
+INHERIT=cmake unpacker xdg
 IUSE=+data +gui webengine +cloudpinyin +qt5 qt6 lua +opencc test
 KEYWORDS=~amd64 ~arm64 ~loong ~riscv ~x86
 LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=app-i18n/fcitx-5.1.6:5 >=app-i18n/libime-1.1.3:5[data?] >=dev-libs/boost-1.61:= cloudpinyin? ( net-misc/curl ) lua? ( app-i18n/fcitx-lua:5 ) opencc? ( app-i18n/opencc:= ) gui? ( qt5? ( dev-qt/qtconcurrent:5 app-i18n/fcitx-qt:5[qt5,-onlyplugin] webengine? ( dev-qt/qtwebengine:5[widgets] ) ) qt6? ( dev-qt/qtbase:6[concurrent] app-i18n/fcitx-qt:5[qt6,-onlyplugin] webengine? ( dev-qt/qtwebengine:6[widgets] ) ) )
+RDEPEND=>=app-i18n/fcitx-5.1.9:5 >=app-i18n/libime-1.1.7:5[data?] >=dev-libs/boost-1.61:= cloudpinyin? ( net-misc/curl ) lua? ( app-i18n/fcitx-lua:5 ) opencc? ( app-i18n/opencc:= ) gui? ( qt5? ( dev-qt/qtconcurrent:5 app-i18n/fcitx-qt:5[qt5,-onlyplugin] webengine? ( dev-qt/qtwebengine:5[widgets] ) ) qt6? ( dev-qt/qtbase:6[concurrent] app-i18n/fcitx-qt:5[qt6,-onlyplugin] webengine? ( dev-qt/qtwebengine:6[widgets] ) ) )
 REQUIRED_USE=webengine? ( gui )
 RESTRICT=!test? ( test )
 SLOT=5
-SRC_URI=https://download.fcitx-im.org/fcitx5/fcitx5-chinese-addons/fcitx5-chinese-addons-5.1.4_dict.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ac8de3bf60efb8f741ecf5a42d39134f
+SRC_URI=https://download.fcitx-im.org/fcitx5/fcitx5-chinese-addons/fcitx5-chinese-addons-5.1.6_dict.tar.zst
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=a1c30476ac6488ea18b6ba7d0aa6f331
diff --git a/metadata/md5-cache/app-i18n/fcitx-configtool-5.1.4 b/metadata/md5-cache/app-i18n/fcitx-configtool-5.1.6
index b3f1ecc4cc7b..b849f4bcdb44 100644
--- a/metadata/md5-cache/app-i18n/fcitx-configtool-5.1.4
+++ b/metadata/md5-cache/app-i18n/fcitx-configtool-5.1.6
@@ -1,16 +1,16 @@
 BDEPEND=kde-frameworks/extra-cmake-modules:0 sys-devel/gettext virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
+DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=>=app-i18n/fcitx-5.1.6:5 >=app-i18n/fcitx-qt-5.1.4:5[qt5,-onlyplugin] app-text/iso-codes dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kwidgetsaddons:5 sys-devel/gettext virtual/libintl x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config config-qt? ( kde-frameworks/kitemviews:5 ) kcm? ( x11-libs/libxkbcommon dev-qt/qtquickcontrols2:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdeclarative:5 kde-frameworks/ki18n:5 kde-frameworks/kiconthemes:5 kde-frameworks/kirigami:5 kde-frameworks/kpackage:5 kde-plasma/libplasma:5 )
 DESCRIPTION=Configuration module for Fcitx
 EAPI=8
 HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx5-configtool
-INHERIT=cmake
+INHERIT=cmake unpacker
 IUSE=kcm +config-qt test
 KEYWORDS=~amd64 ~arm64 ~loong ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=app-i18n/fcitx-5.1.6:5 >=app-i18n/fcitx-qt-5.1.4:5[qt5,-onlyplugin] app-text/iso-codes dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kwidgetsaddons:5 sys-devel/gettext virtual/libintl x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config config-qt? ( kde-frameworks/kitemviews:5 ) kcm? ( x11-libs/libxkbcommon dev-qt/qtquickcontrols2:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdeclarative:5 kde-frameworks/ki18n:5 kde-frameworks/kiconthemes:5 kde-frameworks/kirigami:5 kde-frameworks/kpackage:5 kde-plasma/libplasma:5 )
 RESTRICT=!test? ( test )
 SLOT=5
-SRC_URI=https://download.fcitx-im.org/fcitx5/fcitx5-configtool/fcitx5-configtool-5.1.4.tar.xz -> fcitx-configtool-5.1.4.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=633dc1df00914a9fcb544f340a9a89f4
+SRC_URI=https://download.fcitx-im.org/fcitx5/fcitx5-configtool/fcitx5-configtool-5.1.6.tar.zst -> fcitx-configtool-5.1.6.tar.zst
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=0efbcf1db28833878c9a79077e7ed4f0
diff --git a/metadata/md5-cache/app-i18n/fcitx-rime-5.1.8 b/metadata/md5-cache/app-i18n/fcitx-rime-5.1.8
new file mode 100644
index 000000000000..b6df3b7040fd
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/fcitx-rime-5.1.8
@@ -0,0 +1,15 @@
+BDEPEND=kde-frameworks/extra-cmake-modules sys-devel/gettext virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=!app-i18n/fcitx-rime:4 >=app-i18n/fcitx-5.1.2:5 app-i18n/librime app-i18n/rime-data virtual/libintl
+DESCRIPTION=Chinese RIME input methods for Fcitx
+EAPI=8
+HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx5-rime
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake unpacker xdg
+KEYWORDS=~amd64 ~arm64 ~loong ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=!app-i18n/fcitx-rime:4 >=app-i18n/fcitx-5.1.2:5 app-i18n/librime app-i18n/rime-data virtual/libintl
+SLOT=5
+SRC_URI=https://download.fcitx-im.org/fcitx5/fcitx5-rime/fcitx5-rime-5.1.8.tar.zst -> fcitx-rime-5.1.8.tar.zst
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=be1517bf136f6775c33138aa255eb7f9
diff --git a/metadata/md5-cache/app-i18n/fcitx-table-extra-5.1.4 b/metadata/md5-cache/app-i18n/fcitx-table-extra-5.1.6
index 7f60bec8df25..65c240aa1c89 100644
--- a/metadata/md5-cache/app-i18n/fcitx-table-extra-5.1.4
+++ b/metadata/md5-cache/app-i18n/fcitx-table-extra-5.1.6
@@ -1,15 +1,15 @@
 BDEPEND=kde-frameworks/extra-cmake-modules:0 virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
 DEPEND=!app-i18n/fcitx-table-extra:4 app-i18n/fcitx:5 app-i18n/libime
 DESCRIPTION=Provides extra table for Fcitx, including Boshiamy, Zhengma, Cangjie, and Quick
 EAPI=8
 HOMEPAGE=https://github.com/fcitx/fcitx5-table-extra
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake xdg
+INHERIT=cmake unpacker xdg
 KEYWORDS=~amd64 ~arm64 ~loong ~riscv ~x86
 LICENSE=GPL-3+
 RDEPEND=!app-i18n/fcitx-table-extra:4 app-i18n/fcitx:5 app-i18n/libime
 SLOT=5
-SRC_URI=https://download.fcitx-im.org/fcitx5/fcitx5-table-extra/fcitx5-table-extra-5.1.4.tar.xz -> fcitx-table-extra-5.1.4.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=425d7b042adee5a3e5fa185c8ced4380
+SRC_URI=https://download.fcitx-im.org/fcitx5/fcitx5-table-extra/fcitx5-table-extra-5.1.6.tar.zst -> fcitx-table-extra-5.1.6.tar.zst
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=0c2ff8a72f0c15d21600d4344b324be8
diff --git a/metadata/md5-cache/app-i18n/fcitx-table-other-5.1.1 b/metadata/md5-cache/app-i18n/fcitx-table-other-5.1.3
index 740956181e0c..fed19af38a88 100644
--- a/metadata/md5-cache/app-i18n/fcitx-table-other-5.1.1
+++ b/metadata/md5-cache/app-i18n/fcitx-table-other-5.1.3
@@ -1,15 +1,15 @@
 BDEPEND=kde-frameworks/extra-cmake-modules:0 virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
 DEPEND=app-i18n/fcitx:5 app-i18n/libime
 DESCRIPTION=Provides some other tables for Fcitx, fork from ibus-table-others, scim-tables
 EAPI=8
 HOMEPAGE=https://github.com/fcitx/fcitx5-table-other
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake xdg
+INHERIT=cmake unpacker xdg
 KEYWORDS=~amd64 ~arm64 ~loong ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=app-i18n/fcitx:5 app-i18n/libime
 SLOT=5
-SRC_URI=https://download.fcitx-im.org/fcitx5/fcitx5-table-other/fcitx5-table-other-5.1.1.tar.xz -> fcitx-table-other-5.1.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bacd7436f5660cbdfe3be6b59cd3b4b4
+SRC_URI=https://download.fcitx-im.org/fcitx5/fcitx5-table-other/fcitx5-table-other-5.1.3.tar.zst -> fcitx-table-other-5.1.3.tar.zst
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=6c72260c9a31345425334f88f7183ab7
diff --git a/metadata/md5-cache/app-i18n/libime-1.1.6 b/metadata/md5-cache/app-i18n/libime-1.1.8
index a5efbe7854fc..d7c1301545bd 100644
--- a/metadata/md5-cache/app-i18n/libime-1.1.6
+++ b/metadata/md5-cache/app-i18n/libime-1.1.8
@@ -1,16 +1,16 @@
 BDEPEND=kde-frameworks/extra-cmake-modules:0 virtual/pkgconfig doc? ( app-text/doxygen dev-texlive/texlive-fontutils ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
+DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=>=app-i18n/fcitx-5.1.5:5 app-arch/zstd:= dev-libs/boost:=
 DESCRIPTION=Fcitx5 Next generation of fcitx
 EAPI=8
 HOMEPAGE=https://fcitx-im.org/
-INHERIT=cmake
+INHERIT=cmake unpacker
 IUSE=+data doc test
 KEYWORDS=~amd64 ~arm64 ~loong ~riscv ~x86
 LICENSE=LGPL-2+
 RDEPEND=>=app-i18n/fcitx-5.1.5:5 app-arch/zstd:= dev-libs/boost:=
 RESTRICT=!test? ( test )
 SLOT=5
-SRC_URI=https://download.fcitx-im.org/fcitx5/libime/libime-1.1.6_dict.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f9d9c4609bb72e9f56064226a257d0e9
+SRC_URI=https://download.fcitx-im.org/fcitx5/libime/libime-1.1.8_dict.tar.zst
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=2c5ce78bdf5d66f9e3ef6f9d5f2f8ae7
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index 9e8b9bc2ced4..44bb3922f6cc 100644
--- a/metadata/md5-cache/app-laptop/Manifest.gz
+++ b/metadata/md5-cache/app-laptop/Manifest.gz
diff --git a/metadata/md5-cache/app-laptop/tuxedo-control-center-bin-2.1.8 b/metadata/md5-cache/app-laptop/tuxedo-control-center-bin-2.1.8
new file mode 100644
index 000000000000..496b8b5cd285
--- /dev/null
+++ b/metadata/md5-cache/app-laptop/tuxedo-control-center-bin-2.1.8
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/xz-utils[extra-filters] app-arch/rpm2targz virtual/pkgconfig
+DEFINED_PHASES=config install postinst postrm prepare unpack
+DEPEND=>=app-laptop/tuxedo-drivers-3.2.14
+DESCRIPTION=Tool to control performance, energy, fan and comfort settings on TUXEDO laptops
+EAPI=8
+HOMEPAGE=https://github.com/tuxedocomputers/tuxedo-control-center
+INHERIT=rpm systemd xdg-utils
+KEYWORDS=-* ~amd64
+LICENSE=GPL-3
+RDEPEND=>=app-laptop/tuxedo-drivers-3.2.14 app-accessibility/at-spi2-core dev-libs/nss dev-libs/nspr media-libs/alsa-lib media-libs/mesa[X(+)] net-print/cups x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libdrm x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango
+RESTRICT=strip splitdebug
+SLOT=0
+SRC_URI=https://rpm.tuxedocomputers.com/opensuse/15.4/x86_64/tuxedo-control-center_2.1.8.rpm
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	multilib	c19072c3cd7ac5cb21de013f7e9832e0	rpm	7828cd38ff559545ca52f92064d0f8f4	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=5f9f16f7d6f23ec047269625cec40c1d
diff --git a/metadata/md5-cache/app-laptop/tuxedo-drivers-4.5.0 b/metadata/md5-cache/app-laptop/tuxedo-drivers-4.5.0
new file mode 100644
index 000000000000..267b702e4f60
--- /dev/null
+++ b/metadata/md5-cache/app-laptop/tuxedo-drivers-4.5.0
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig )
+DEFINED_PHASES=compile install postinst setup
+DEPEND=virtual/linux-sources
+DESCRIPTION=Kernel Module for Tuxedo Keyboard
+EAPI=8
+HOMEPAGE=https://gitlab.com/tuxedocomputers/development/packages/tuxedo-drivers
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=linux-mod-r1
+IUSE=dist-kernel modules-compress modules-sign +strip
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+SLOT=0
+SRC_URI=https://gitlab.com/tuxedocomputers/development/packages/tuxedo-drivers/-/archive/v4.5.0/tuxedo-drivers-v4.5.0.tar.bz2
+_eclasses_=dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	367e103a74bf77e6a8da7894d999fa3c	linux-info	e967b81f54be6f49f4219a57ce7db437	linux-mod-r1	9ccd2b29cd75bd48092f8f46b07fc935	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=044aca542ca91e352ea3d7697ea076d9
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 453ad59bb58d..d01b365b27bd 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/grc-1.13 b/metadata/md5-cache/app-misc/grc-1.13
index 883f6c94cc9f..c37b9f7be415 100644
--- a/metadata/md5-cache/app-misc/grc-1.13
+++ b/metadata/md5-cache/app-misc/grc-1.13
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Generic Colouriser beautifies your logfiles or output of commands
 EAPI=7
 HOMEPAGE=http://kassiopeia.juls.savba.sk/~garabik/software/grc.html
 INHERIT=python-r1
-IUSE=python_targets_python3_10 python_targets_python3_11
+IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 SLOT=0
 SRC_URI=https://github.com/garabik/grc/archive/v1.13.tar.gz -> grc-1.13.tar.gz
 _eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=015672f7df185ae225df168431dd85ba
+_md5_=3c187effce510b03bffbbc1f6f3b8c84
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.23-r1 b/metadata/md5-cache/app-misc/hivex-1.3.23-r1
index d9a4cce17e17..5afbfbfa9b8d 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.23-r1
+++ b/metadata/md5-cache/app-misc/hivex-1.3.23-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://libguestfs.org/download/hivex/hivex-1.3.23.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	07f7f317d867e5d5aa30fdeb6e873138	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c8c54ec98818674dea9056cbdf79404a
+_md5_=4b6cc6a2a9d9205154eb397230d4fe54
diff --git a/metadata/md5-cache/app-misc/piper-0.6 b/metadata/md5-cache/app-misc/piper-0.6
deleted file mode 100644
index 056b16034424..000000000000
--- a/metadata/md5-cache/app-misc/piper-0.6
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) virtual/pkgconfig test? ( python_single_target_python3_10? ( dev-python/flake8[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/flake8[python_targets_python3_11(-)] ) ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst setup test
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) dev-libs/gobject-introspection >=dev-libs/libratbag-0.13 gnome-base/librsvg[introspection] x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] python_single_target_python3_10? ( dev-python/evdev[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/evdev[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[cairo,python_targets_python3_11(-)] ) dev-libs/libevdev virtual/libudev
-DESCRIPTION=GTK application to configure gaming devices
-EAPI=8
-HOMEPAGE=https://github.com/libratbag/piper
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=meson python-single-r1 xdg
-IUSE=test python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) dev-libs/gobject-introspection >=dev-libs/libratbag-0.13 gnome-base/librsvg[introspection] x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] python_single_target_python3_10? ( dev-python/evdev[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/evdev[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[cairo,python_targets_python3_11(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/libratbag/piper/archive/0.6.tar.gz -> piper-0.6.tar.gz
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9b6683223dca1c3b2c480c3f75c67f89
diff --git a/metadata/md5-cache/app-misc/piper-0.7-r1 b/metadata/md5-cache/app-misc/piper-0.7-r1
index f485a12baf36..1c4464ebb37c 100644
--- a/metadata/md5-cache/app-misc/piper-0.7-r1
+++ b/metadata/md5-cache/app-misc/piper-0.7-r1
@@ -1,18 +1,18 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) virtual/pkgconfig test? ( python_single_target_python3_10? ( dev-python/flake8[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/flake8[python_targets_python3_11(-)] ) dev-libs/appstream ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/lxml[python_targets_python3_12(-)] ) virtual/pkgconfig test? ( python_single_target_python3_10? ( dev-python/flake8[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/flake8[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/flake8[python_targets_python3_12(-)] ) dev-libs/appstream ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst setup test
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) dev-libs/gobject-introspection >=dev-libs/libratbag-0.14 gnome-base/librsvg[introspection] x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] python_single_target_python3_10? ( dev-python/evdev[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/evdev[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[cairo,python_targets_python3_11(-)] ) dev-libs/libevdev virtual/libudev
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-libs/gobject-introspection >=dev-libs/libratbag-0.14 gnome-base/librsvg[introspection] x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] python_single_target_python3_10? ( dev-python/evdev[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/evdev[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[cairo,python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/evdev[python_targets_python3_12(-)] dev-python/lxml[python_targets_python3_12(-)] dev-python/pycairo[python_targets_python3_12(-)] dev-python/pygobject:3[cairo,python_targets_python3_12(-)] ) dev-libs/libevdev virtual/libudev
 DESCRIPTION=GTK application to configure gaming devices
 EAPI=8
 HOMEPAGE=https://github.com/libratbag/piper
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=meson python-single-r1 xdg
-IUSE=test python_single_target_python3_10 python_single_target_python3_11
+IUSE=test python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) dev-libs/gobject-introspection >=dev-libs/libratbag-0.14 gnome-base/librsvg[introspection] x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] python_single_target_python3_10? ( dev-python/evdev[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/evdev[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[cairo,python_targets_python3_11(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-libs/gobject-introspection >=dev-libs/libratbag-0.14 gnome-base/librsvg[introspection] x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] python_single_target_python3_10? ( dev-python/evdev[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/evdev[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[cairo,python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/evdev[python_targets_python3_12(-)] dev-python/lxml[python_targets_python3_12(-)] dev-python/pycairo[python_targets_python3_12(-)] dev-python/pygobject:3[cairo,python_targets_python3_12(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libratbag/piper/archive/0.7.tar.gz -> piper-0.7.tar.gz
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=38cb038eb9246007c44732b550bc8c7f
+_md5_=47d66d8b7973ecda7fc59020f210cbab
diff --git a/metadata/md5-cache/app-misc/piper-9999 b/metadata/md5-cache/app-misc/piper-9999
index 39654b7dba1d..6b5df36b742c 100644
--- a/metadata/md5-cache/app-misc/piper-9999
+++ b/metadata/md5-cache/app-misc/piper-9999
@@ -1,17 +1,17 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) virtual/pkgconfig test? ( python_single_target_python3_10? ( dev-python/flake8[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/flake8[python_targets_python3_11(-)] ) dev-libs/appstream ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/lxml[python_targets_python3_12(-)] ) virtual/pkgconfig test? ( python_single_target_python3_10? ( dev-python/flake8[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/flake8[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/flake8[python_targets_python3_12(-)] ) dev-libs/appstream ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst setup test unpack
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) dev-libs/gobject-introspection >=dev-libs/libratbag-0.14 gnome-base/librsvg[introspection] x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] python_single_target_python3_10? ( dev-python/evdev[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/evdev[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[cairo,python_targets_python3_11(-)] ) dev-libs/libevdev virtual/libudev
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-libs/gobject-introspection >=dev-libs/libratbag-0.14 gnome-base/librsvg[introspection] x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] python_single_target_python3_10? ( dev-python/evdev[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/evdev[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[cairo,python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/evdev[python_targets_python3_12(-)] dev-python/lxml[python_targets_python3_12(-)] dev-python/pycairo[python_targets_python3_12(-)] dev-python/pygobject:3[cairo,python_targets_python3_12(-)] ) dev-libs/libevdev virtual/libudev
 DESCRIPTION=GTK application to configure gaming devices
 EAPI=8
 HOMEPAGE=https://github.com/libratbag/piper
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=meson python-single-r1 xdg git-r3
-IUSE=test python_single_target_python3_10 python_single_target_python3_11
+IUSE=test python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) dev-libs/gobject-introspection >=dev-libs/libratbag-0.14 gnome-base/librsvg[introspection] x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] python_single_target_python3_10? ( dev-python/evdev[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/evdev[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[cairo,python_targets_python3_11(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-libs/gobject-introspection >=dev-libs/libratbag-0.14 gnome-base/librsvg[introspection] x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] python_single_target_python3_10? ( dev-python/evdev[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/evdev[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[cairo,python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/evdev[python_targets_python3_12(-)] dev-python/lxml[python_targets_python3_12(-)] dev-python/pycairo[python_targets_python3_12(-)] dev-python/pygobject:3[cairo,python_targets_python3_12(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6a2bc631f23addae07ed7948d1312f00
+_md5_=6ac70ae990263ec74506252578c61f68
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 5c331ae47cfe..b66f2ed50ea7 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.6.3-r1 b/metadata/md5-cache/app-portage/gentoolkit-0.6.3-r1
index 6d99ca467413..e55f3e4b768f 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.6.3-r1
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.6.3-r1
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.6.3.tar.bz2
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	meson	aecae905c2e0c201d7925fae52a5576d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=78d0d52ee044fa09b9bf0ef1d12998a5
+_md5_=58be6f39c70b6d462a713276a2833eea
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.6.5 b/metadata/md5-cache/app-portage/gentoolkit-0.6.5
index f3bbda8d2196..63855369f985 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.6.5
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.6.5
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.6.5.tar.bz2
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	meson	aecae905c2e0c201d7925fae52a5576d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=47daf5d3ceb9db92aabe798f1a48c798
+_md5_=c2d171ebd9139e0e1684fdf8586aec95
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.6.6 b/metadata/md5-cache/app-portage/gentoolkit-0.6.6
index 85495719158e..9c49e5fdc178 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.6.6
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.6.6
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.6.6.tar.bz2
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	meson	aecae905c2e0c201d7925fae52a5576d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=815945e6a97f0e720efa84e03890329e
+_md5_=dad6b3aef0032eea17dcbd9748d76d6a
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.6.7 b/metadata/md5-cache/app-portage/gentoolkit-0.6.7
index e3c3a5ea5ff3..97ca22686f65 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.6.7
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.6.7
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.6.7.tar.bz2
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	meson	aecae905c2e0c201d7925fae52a5576d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=815945e6a97f0e720efa84e03890329e
+_md5_=dad6b3aef0032eea17dcbd9748d76d6a
diff --git a/metadata/md5-cache/app-portage/gentoolkit-9999 b/metadata/md5-cache/app-portage/gentoolkit-9999
index 1701949597e7..1d1bece8c861 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-9999
+++ b/metadata/md5-cache/app-portage/gentoolkit-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	meson	aecae905c2e0c201d7925fae52a5576d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=815945e6a97f0e720efa84e03890329e
+_md5_=dad6b3aef0032eea17dcbd9748d76d6a
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 2f0f76b17e26..9986be1a0839 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/atril-1.28.0 b/metadata/md5-cache/app-text/atril-1.28.0-r1
index ce27a97ef984..a96514365550 100644
--- a/metadata/md5-cache/app-text/atril-1.28.0
+++ b/metadata/md5-cache/app-text/atril-1.28.0-r1
@@ -8,10 +8,10 @@ INHERIT=mate python-any-r1 virtualx
 IUSE=caja dbus debug djvu dvi epub +introspection keyring nls +postscript synctex t1lib test tiff xps test
 KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~x86
 LICENSE=FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+
-RDEPEND=app-accessibility/at-spi2-core:2 app-text/poppler[cairo] dev-libs/glib:2 dev-libs/libxml2:2 >=mate-base/mate-desktop-1.27.1 sys-libs/zlib x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[introspection?] x11-libs/libICE x11-libs/libSM:0 x11-libs/libX11 x11-libs/cairo x11-libs/pango caja? ( mate-base/caja[introspection?] ) djvu? ( app-text/djvu:0 ) dvi? ( virtual/tex-base t1lib? ( media-libs/t1lib:5 ) ) epub? ( <dev-libs/mathjax-3 net-libs/webkit-gtk:4.1 ) keyring? ( app-crypt/libsecret ) introspection? ( dev-libs/gobject-introspection:= ) postscript? ( app-text/libspectre ) synctex? ( virtual/tex-base ) tiff? ( media-libs/tiff:= ) xps? ( app-text/libgxps ) virtual/libintl
+RDEPEND=app-accessibility/at-spi2-core:2 app-text/poppler[cairo] dev-libs/glib:2 dev-libs/libxml2:2 >=mate-base/mate-desktop-1.27.1 sys-libs/zlib x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[introspection?] x11-libs/libICE x11-libs/libSM:0 x11-libs/libX11 x11-libs/cairo x11-libs/pango caja? ( mate-base/caja[introspection?] ) djvu? ( app-text/djvu:0 ) dvi? ( virtual/tex-base t1lib? ( media-libs/t1lib:5 ) ) epub? ( <dev-libs/mathjax-3 net-libs/webkit-gtk:4.1 ) keyring? ( app-crypt/libsecret ) introspection? ( dev-libs/gobject-introspection:= ) postscript? ( app-text/libspectre ) synctex? ( virtual/tex-base ) tiff? ( media-libs/tiff:= ) xps? ( app-text/libgxps ) gnome-base/gvfs virtual/libintl
 REQUIRED_USE=t1lib? ( dvi )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.28/atril-1.28.0.tar.xz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	fc9e598eaac41c6ac9ed1a44bc004d03	gnome2-utils	30dbce54b89e77b86f366548f94419ad	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	mate	0637ce2e7478ea114b5fd1ae437bcb69	mate-desktop.org	cce6a61620b2b79811e4c3c30f0e5c83	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5adaf3285637c364b357527bcad7fa97
+_md5_=ec285c97b69b0776cf7ae36ca8bd96bc
diff --git a/metadata/md5-cache/app-text/lesspipe-2.13 b/metadata/md5-cache/app-text/lesspipe-2.13
new file mode 100644
index 000000000000..6e01f7423f1e
--- /dev/null
+++ b/metadata/md5-cache/app-text/lesspipe-2.13
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-perl/Text-CSV virtual/pkgconfig test? ( app-editors/vim )
+DEFINED_PHASES=compile configure install preinst
+DESCRIPTION=Preprocessor for less
+EAPI=8
+HOMEPAGE=https://github.com/wofr06/lesspipe
+INHERIT=edo
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl dev-perl/Text-CSV
+RESTRICT=!test? ( test ) test
+SLOT=0
+SRC_URI=https://github.com/wofr06/lesspipe/archive/v2.13.tar.gz -> lesspipe-2.13.tar.gz
+_eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c
+_md5_=b7f555fedc7434bf974578c7645567ad
diff --git a/metadata/md5-cache/app-text/pastebinit-1.6.2 b/metadata/md5-cache/app-text/pastebinit-1.6.2
new file mode 100644
index 000000000000..9dc7991c51ab
--- /dev/null
+++ b/metadata/md5-cache/app-text/pastebinit-1.6.2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext man? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt )
+DEFINED_PHASES=compile install postinst prepare setup
+DESCRIPTION=A software that lets you send anything you want directly to a pastebin
+EAPI=8
+HOMEPAGE=https://github.com/pastebinit/pastebinit
+INHERIT=optfeature python-single-r1
+IUSE=man python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=^^ ( python_single_target_python3_11 python_single_target_python3_12 )
+SLOT=0
+SRC_URI=https://github.com/pastebinit/pastebinit/archive/refs/tags/1.6.2.tar.gz -> pastebinit-1.6.2.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=12b4c3528fa6e77ba604fae3a0beaaaf
diff --git a/metadata/md5-cache/app-text/pdftk-3.3.3_p20231025 b/metadata/md5-cache/app-text/pdftk-3.3.3_p20231025
new file mode 100644
index 000000000000..51d58f4b31d8
--- /dev/null
+++ b/metadata/md5-cache/app-text/pdftk-3.3.3_p20231025
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/bcprov:0 dev-java/commons-lang:3.6 test? ( app-text/poppler[cairo] dev-java/system-rules:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=A port of pdftk into java
+EAPI=8
+HOMEPAGE=https://gitlab.com/pdftk-java/pdftk
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=virtual/jre-1.8:* dev-java/bcprov:0 dev-java/commons-lang:3.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://gitlab.com/pdftk-java/pdftk/-/archive/3f1918c831c919d0a8fcf18c36cf40118398b995.tar.bz2 -> pdftk-3.3.3_p20231025.tar.bz2
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	b346c3901e71ba37137bae0b25b00221
+_md5_=00602842b0e8531beaded20f997dfd0b
diff --git a/metadata/md5-cache/app-text/pdftk-9999 b/metadata/md5-cache/app-text/pdftk-9999
index a9e137e3516d..845e62cef903 100644
--- a/metadata/md5-cache/app-text/pdftk-9999
+++ b/metadata/md5-cache/app-text/pdftk-9999
@@ -12,4 +12,4 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/bcprov:1.74 dev-java/commons-lang:3.6 >=dev
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	fbb2889c81f3a05910c1524db69425c1	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	b346c3901e71ba37137bae0b25b00221
-_md5_=341d82d381c1ff186d0ea44b93353e9e
+_md5_=648a79cc9cf1548d3baf763a0cc640b4
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 6dfc85ca16aa..5dd4f99d3259 100644
--- a/metadata/md5-cache/app-vim/Manifest.gz
+++ b/metadata/md5-cache/app-vim/Manifest.gz
diff --git a/metadata/md5-cache/app-vim/jedi-0.11.2 b/metadata/md5-cache/app-vim/jedi-0.11.2
index 2266585a6e01..46a30cd00c83 100644
--- a/metadata/md5-cache/app-vim/jedi-0.11.2
+++ b/metadata/md5-cache/app-vim/jedi-0.11.2
@@ -1,17 +1,17 @@
-BDEPEND=test? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( >=dev-python/jedi-0.19[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/jedi-0.19[python_targets_python3_11(-)] ) || ( app-editors/vim[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] app-editors/gvim[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) app-vim/vspec )
+BDEPEND=test? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( >=dev-python/jedi-0.19[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/jedi-0.19[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/jedi-0.19[python_targets_python3_12(-)] ) || ( app-editors/vim[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?] app-editors/gvim[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?] ) app-vim/vspec )
 DEFINED_PHASES=compile install postinst postrm prepare setup test
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: binding to the autocompletion library jedi
 EAPI=8
 HOMEPAGE=https://github.com/davidhalter/jedi-vim
 INHERIT=edo vim-plugin python-single-r1
-IUSE=test python_single_target_python3_10 python_single_target_python3_11
+IUSE=test python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( >=dev-python/jedi-0.19[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/jedi-0.19[python_targets_python3_11(-)] ) || ( app-editors/vim[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] app-editors/gvim[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( >=dev-python/jedi-0.19[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/jedi-0.19[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/jedi-0.19[python_targets_python3_12(-)] ) || ( app-editors/vim[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?] app-editors/gvim[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/jedi-vim/archive/v0.11.2.tar.gz -> jedi-vim-0.11.2.tar.gz
 _eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=417da00265c2aa78f8bf3c85cc5af1c3
+_md5_=be7ef97a3c3f7d9373abf12eea86d639
diff --git a/metadata/md5-cache/dev-build/Manifest.gz b/metadata/md5-cache/dev-build/Manifest.gz
index 0735b9c92be1..a4debe4461fd 100644
--- a/metadata/md5-cache/dev-build/Manifest.gz
+++ b/metadata/md5-cache/dev-build/Manifest.gz
diff --git a/metadata/md5-cache/dev-build/automake-vanilla-9999 b/metadata/md5-cache/dev-build/automake-vanilla-9999
index 999d44cef549..c3fb8db0d0f6 100644
--- a/metadata/md5-cache/dev-build/automake-vanilla-9999
+++ b/metadata/md5-cache/dev-build/automake-vanilla-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/gzip sys-apps/help2man test? ( || ( dev-lang/python:3.11 dev-lang/python:3.10 ) dev-util/dejagnu sys-devel/bison sys-devel/flex ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/gzip sys-apps/help2man test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) dev-util/dejagnu sys-devel/bison sys-devel/flex ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare setup test unpack
 DEPEND=>=dev-lang/perl-5.6 >=dev-build/automake-wrapper-11 >=dev-build/autoconf-2.69:* sys-devel/gnuconfig
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
@@ -12,4 +12,4 @@ RDEPEND=>=dev-lang/perl-5.6 >=dev-build/automake-wrapper-11 >=dev-build/autoconf
 RESTRICT=!test? ( test )
 SLOT=9999
 _eclasses_=git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=d7d7e62c55482e7e85886a53d78aae2a
+_md5_=afc412a2a01654e092aa38f8c1e3399b
diff --git a/metadata/md5-cache/dev-debug/Manifest.gz b/metadata/md5-cache/dev-debug/Manifest.gz
index 51151d760406..481a13e8fbe3 100644
--- a/metadata/md5-cache/dev-debug/Manifest.gz
+++ b/metadata/md5-cache/dev-debug/Manifest.gz
diff --git a/metadata/md5-cache/dev-debug/gdb-15.0.91 b/metadata/md5-cache/dev-debug/gdb-15.0.91
new file mode 100644
index 000000000000..21c6bfa9c457
--- /dev/null
+++ b/metadata/md5-cache/dev-debug/gdb-15.0.91
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/xz-utils sys-apps/texinfo app-alternatives/yacc nls? ( sys-devel/gettext ) source-highlight? ( virtual/pkgconfig ) test? ( dev-util/dejagnu )
+DEFINED_PHASES=configure install postinst prepare setup test
+DEPEND=dev-libs/mpfr:= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:= >=sys-libs/readline-7:= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) debuginfod? ( dev-libs/elfutils[debuginfod(-)] ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=GNU debugger
+EAPI=8
+HOMEPAGE=https://sourceware.org/gdb/
+INHERIT=flag-o-matic python-single-r1 strip-linguas toolchain-funcs
+IUSE=cet debuginfod guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+LICENSE=GPL-3+ LGPL-2.1+
+RDEPEND=dev-libs/mpfr:= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:= >=sys-libs/readline-7:= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) debuginfod? ( dev-libs/elfutils[debuginfod(-)] ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd:= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://sourceware.org/pub/gdb/snapshots/branch/gdb-15.0.91.tar.xz https://dev.gentoo.org/~sam/distfiles/dev-debug/gdb/gdb-15.0.91.tar.xz
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=5ff294945acac473752c5cadf7f10649
diff --git a/metadata/md5-cache/dev-dotnet/Manifest.gz b/metadata/md5-cache/dev-dotnet/Manifest.gz
index 641c91ebfa53..febd85e70119 100644
--- a/metadata/md5-cache/dev-dotnet/Manifest.gz
+++ b/metadata/md5-cache/dev-dotnet/Manifest.gz
diff --git a/metadata/md5-cache/dev-dotnet/fantomas-6.3.7 b/metadata/md5-cache/dev-dotnet/fantomas-6.3.7
new file mode 100644
index 000000000000..c93d094d068b
--- /dev/null
+++ b/metadata/md5-cache/dev-dotnet/fantomas-6.3.7
@@ -0,0 +1,15 @@
+BDEPEND=virtual/dotnet-sdk:8.0 dev-dotnet/csharp-gentoodotnetinfo
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DESCRIPTION=FSharp source code formatter
+EAPI=8
+HOMEPAGE=https://fsprojects.github.io/fantomas/ https://github.com/fsprojects/fantomas/
+INHERIT=check-reqs dotnet-pkg
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=virtual/dotnet-sdk:8.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/fsprojects/fantomas/archive/v6.3.7.tar.gz -> fantomas-6.3.7.tar.gz https://api.nuget.org/v3-flatcontainer/dotnet-fsharplint/0.19.2/dotnet-fsharplint.0.19.2.nupkg https://api.nuget.org/v3-flatcontainer/fantomas/6.3.0/fantomas.6.3.0.nupkg https://api.nuget.org/v3-flatcontainer/fsdocs-tool/20.0.0/fsdocs-tool.20.0.0.nupkg https://api.nuget.org/v3-flatcontainer/fsharp-analyzers/0.25.0/fsharp-analyzers.0.25.0.nupkg https://api.nuget.org/v3-flatcontainer/argu/6.2.4/argu.6.2.4.nupkg https://api.nuget.org/v3-flatcontainer/cliwrap/3.6.4/cliwrap.3.6.4.nupkg https://api.nuget.org/v3-flatcontainer/commandlineparser/2.9.1/commandlineparser.2.9.1.nupkg https://api.nuget.org/v3-flatcontainer/dotnet.reproduciblebuilds/1.1.1/dotnet.reproduciblebuilds.1.1.1.nupkg https://api.nuget.org/v3-flatcontainer/editorconfig/0.15.0/editorconfig.0.15.0.nupkg https://api.nuget.org/v3-flatcontainer/fable.core/3.0.0/fable.core.3.0.0.nupkg https://api.nuget.org/v3-flatcontainer/fparsec/1.1.1/fparsec.1.1.1.nupkg https://api.nuget.org/v3-flatcontainer/fscheck/2.16.5/fscheck.2.16.5.nupkg https://api.nuget.org/v3-flatcontainer/fsharp.analyzers.build/0.3.0/fsharp.analyzers.build.0.3.0.nupkg https://api.nuget.org/v3-flatcontainer/fsharp.core/5.0.1/fsharp.core.5.0.1.nupkg https://api.nuget.org/v3-flatcontainer/fsharp.core/6.0.7/fsharp.core.6.0.7.nupkg https://api.nuget.org/v3-flatcontainer/fsharp.core/8.0.101/fsharp.core.8.0.101.nupkg https://api.nuget.org/v3-flatcontainer/fsharp.data.csv.core/6.3.0/fsharp.data.csv.core.6.3.0.nupkg https://api.nuget.org/v3-flatcontainer/fsharp.data.html.core/6.3.0/fsharp.data.html.core.6.3.0.nupkg https://api.nuget.org/v3-flatcontainer/fsharp.data.http/6.3.0/fsharp.data.http.6.3.0.nupkg https://api.nuget.org/v3-flatcontainer/fsharp.data.json.core/6.3.0/fsharp.data.json.core.6.3.0.nupkg https://api.nuget.org/v3-flatcontainer/fsharp.data.runtime.utilities/6.3.0/fsharp.data.runtime.utilities.6.3.0.nupkg https://api.nuget.org/v3-flatcontainer/fsharp.data.worldbank.core/6.3.0/fsharp.data.worldbank.core.6.3.0.nupkg https://api.nuget.org/v3-flatcontainer/fsharp.data.xml.core/6.3.0/fsharp.data.xml.core.6.3.0.nupkg https://api.nuget.org/v3-flatcontainer/fsharp.data/6.3.0/fsharp.data.6.3.0.nupkg https://api.nuget.org/v3-flatcontainer/fslexyacc.runtime/11.2.0/fslexyacc.runtime.11.2.0.nupkg https://api.nuget.org/v3-flatcontainer/fslexyacc/11.2.0/fslexyacc.11.2.0.nupkg https://api.nuget.org/v3-flatcontainer/fsunit/6.0.0/fsunit.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/fun.build/1.0.3/fun.build.1.0.3.nupkg https://api.nuget.org/v3-flatcontainer/fun.result/2.0.9/fun.result.2.0.9.nupkg https://api.nuget.org/v3-flatcontainer/g-research.fsharp.analyzers/0.9.3/g-research.fsharp.analyzers.0.9.3.nupkg https://api.nuget.org/v3-flatcontainer/gee.external.capstone/2.3.0/gee.external.capstone.2.3.0.nupkg https://api.nuget.org/v3-flatcontainer/humanizer.core/2.14.1/humanizer.core.2.14.1.nupkg https://api.nuget.org/v3-flatcontainer/iced/1.17.0/iced.1.17.0.nupkg https://api.nuget.org/v3-flatcontainer/ignore/0.1.50/ignore.0.1.50.nupkg https://api.nuget.org/v3-flatcontainer/ionide.analyzers/0.9.0/ionide.analyzers.0.9.0.nupkg https://api.nuget.org/v3-flatcontainer/ionide.keepachangelog.tasks/0.1.8/ionide.keepachangelog.tasks.0.1.8.nupkg https://api.nuget.org/v3-flatcontainer/ionide.keepachangelog/0.1.8/ionide.keepachangelog.0.1.8.nupkg https://api.nuget.org/v3-flatcontainer/messagepack.annotations/2.2.85/messagepack.annotations.2.2.85.nupkg https://api.nuget.org/v3-flatcontainer/messagepack/2.2.85/messagepack.2.2.85.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/1.1.0/microsoft.bcl.asyncinterfaces.1.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/5.0.0/microsoft.bcl.asyncinterfaces.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.git/1.1.1/microsoft.build.tasks.git.1.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.analyzers/3.3.3/microsoft.codeanalysis.analyzers.3.3.3.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.common/4.1.0/microsoft.codeanalysis.common.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.csharp/4.1.0/microsoft.codeanalysis.csharp.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codecoverage/17.8.0/microsoft.codecoverage.17.8.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.diagnostics.netcore.client/0.2.251802/microsoft.diagnostics.netcore.client.0.2.251802.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.diagnostics.runtime/2.2.332302/microsoft.diagnostics.runtime.2.2.332302.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.diagnostics.tracing.traceevent/3.0.2/microsoft.diagnostics.tracing.traceevent.3.0.2.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.dotnet.platformabstractions/3.1.6/microsoft.dotnet.platformabstractions.3.1.6.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/2.1.1/microsoft.extensions.configuration.abstractions.2.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/2.1.1/microsoft.extensions.configuration.binder.2.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/2.1.1/microsoft.extensions.configuration.2.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/2.1.1/microsoft.extensions.dependencyinjection.abstractions.2.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/2.1.1/microsoft.extensions.logging.abstractions.2.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/2.1.1/microsoft.extensions.logging.2.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/2.1.1/microsoft.extensions.options.2.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/2.1.1/microsoft.extensions.primitives.2.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.net.test.sdk/17.8.0/microsoft.net.test.sdk.17.8.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.1.1/microsoft.netcore.platforms.1.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/2.1.2/microsoft.netcore.platforms.2.1.2.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/5.0.0/microsoft.netcore.platforms.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.1.3/microsoft.netcore.targets.1.1.3.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.sourcelink.azurerepos.git/1.1.1/microsoft.sourcelink.azurerepos.git.1.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.sourcelink.bitbucket.git/1.1.1/microsoft.sourcelink.bitbucket.git.1.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.sourcelink.common/1.1.1/microsoft.sourcelink.common.1.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.sourcelink.github/1.1.1/microsoft.sourcelink.github.1.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.sourcelink.gitlab/1.1.1/microsoft.sourcelink.gitlab.1.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/17.8.0/microsoft.testplatform.objectmodel.17.8.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.testhost/17.8.0/microsoft.testplatform.testhost.17.8.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.threading.analyzers/16.9.60/microsoft.visualstudio.threading.analyzers.16.9.60.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.threading/16.9.60/microsoft.visualstudio.threading.16.9.60.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.validation/15.5.31/microsoft.visualstudio.validation.15.5.31.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.validation/16.8.33/microsoft.visualstudio.validation.16.8.33.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.win32.registry/5.0.0/microsoft.win32.registry.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/nerdbank.streams/2.6.81/nerdbank.streams.2.6.81.nupkg https://api.nuget.org/v3-flatcontainer/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg https://api.nuget.org/v3-flatcontainer/newtonsoft.json/11.0.2/newtonsoft.json.11.0.2.nupkg https://api.nuget.org/v3-flatcontainer/newtonsoft.json/12.0.2/newtonsoft.json.12.0.2.nupkg https://api.nuget.org/v3-flatcontainer/newtonsoft.json/13.0.1/newtonsoft.json.13.0.1.nupkg https://api.nuget.org/v3-flatcontainer/nuget.frameworks/6.5.0/nuget.frameworks.6.5.0.nupkg https://api.nuget.org/v3-flatcontainer/nunit3testadapter/4.5.0/nunit3testadapter.4.5.0.nupkg https://api.nuget.org/v3-flatcontainer/nunit/4.0.1/nunit.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/perfolizer/0.2.1/perfolizer.0.2.1.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.collections/4.3.0/runtime.any.system.collections.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.diagnostics.tracing/4.3.0/runtime.any.system.diagnostics.tracing.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.globalization.calendars/4.3.0/runtime.any.system.globalization.calendars.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.globalization/4.3.0/runtime.any.system.globalization.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.io/4.3.0/runtime.any.system.io.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection.primitives/4.3.0/runtime.any.system.reflection.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection/4.3.0/runtime.any.system.reflection.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.resources.resourcemanager/4.3.0/runtime.any.system.resources.resourcemanager.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime.handles/4.3.0/runtime.any.system.runtime.handles.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime.interopservices/4.3.0/runtime.any.system.runtime.interopservices.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime/4.3.0/runtime.any.system.runtime.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.text.encoding.extensions/4.3.0/runtime.any.system.text.encoding.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.text.encoding/4.3.0/runtime.any.system.text.encoding.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.threading.tasks/4.3.0/runtime.any.system.threading.tasks.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg https://api.nuget.org/v3-flatcontainer/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg https://api.nuget.org/v3-flatcontainer/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.net.http/4.3.0/runtime.native.system.net.http.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography.apple/4.3.0/runtime.native.system.security.cryptography.apple.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography.openssl/4.3.2/runtime.native.system.security.cryptography.openssl.4.3.2.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg https://api.nuget.org/v3-flatcontainer/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg https://api.nuget.org/v3-flatcontainer/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg https://api.nuget.org/v3-flatcontainer/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.microsoft.win32.primitives/4.3.0/runtime.unix.microsoft.win32.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.diagnostics.debug/4.3.0/runtime.unix.system.diagnostics.debug.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.io.filesystem/4.3.0/runtime.unix.system.io.filesystem.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.net.primitives/4.3.0/runtime.unix.system.net.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.private.uri/4.3.0/runtime.unix.system.private.uri.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.runtime.extensions/4.3.0/runtime.unix.system.runtime.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/semanticversion/2.1.0/semanticversion.2.1.0.nupkg https://api.nuget.org/v3-flatcontainer/semanticversioning/2.0.2/semanticversioning.2.0.2.nupkg https://api.nuget.org/v3-flatcontainer/serilog.sinks.console/5.0.1/serilog.sinks.console.5.0.1.nupkg https://api.nuget.org/v3-flatcontainer/serilog/3.1.1/serilog.3.1.1.nupkg https://api.nuget.org/v3-flatcontainer/serilogtracelistener/3.2.1-dev-00011/serilogtracelistener.3.2.1-dev-00011.nupkg https://api.nuget.org/v3-flatcontainer/spectre.console/0.46.0/spectre.console.0.46.0.nupkg https://api.nuget.org/v3-flatcontainer/spectre.console/0.48.0/spectre.console.0.48.0.nupkg https://api.nuget.org/v3-flatcontainer/streamjsonrpc/2.8.28/streamjsonrpc.2.8.28.nupkg https://api.nuget.org/v3-flatcontainer/system.buffers/4.3.0/system.buffers.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.buffers/4.5.1/system.buffers.4.5.1.nupkg https://api.nuget.org/v3-flatcontainer/system.codedom/5.0.0/system.codedom.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.concurrent/4.3.0/system.collections.concurrent.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.immutable/5.0.0/system.collections.immutable.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.immutable/7.0.0/system.collections.immutable.7.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections/4.3.0/system.collections.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.configuration.configurationmanager/4.4.0/system.configuration.configurationmanager.4.4.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/5.0.1/system.diagnostics.diagnosticsource.5.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/7.0.0/system.diagnostics.diagnosticsource.7.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization.calendars/4.3.0/system.globalization.calendars.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization.extensions/4.3.0/system.globalization.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization/4.3.0/system.globalization.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.abstractions.testinghelpers/20.0.4/system.io.abstractions.testinghelpers.20.0.4.nupkg https://api.nuget.org/v3-flatcontainer/system.io.abstractions/20.0.4/system.io.abstractions.20.0.4.nupkg https://api.nuget.org/v3-flatcontainer/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.filesystem/4.3.0/system.io.filesystem.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.pipelines/5.0.1/system.io.pipelines.5.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.io/4.3.0/system.io.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.linq/4.3.0/system.linq.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.management/5.0.0/system.management.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.memory/4.5.1/system.memory.4.5.1.nupkg https://api.nuget.org/v3-flatcontainer/system.memory/4.5.3/system.memory.4.5.3.nupkg https://api.nuget.org/v3-flatcontainer/system.memory/4.5.4/system.memory.4.5.4.nupkg https://api.nuget.org/v3-flatcontainer/system.memory/4.5.5/system.memory.4.5.5.nupkg https://api.nuget.org/v3-flatcontainer/system.net.http/4.3.4/system.net.http.4.3.4.nupkg https://api.nuget.org/v3-flatcontainer/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.net.websockets/4.3.0/system.net.websockets.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg https://api.nuget.org/v3-flatcontainer/system.private.uri/4.3.0/system.private.uri.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.6.0/system.reflection.emit.ilgeneration.4.6.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.7.0/system.reflection.emit.ilgeneration.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.6.0/system.reflection.emit.lightweight.4.6.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.7.0/system.reflection.emit.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.metadata/1.6.0/system.reflection.metadata.1.6.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.metadata/5.0.0/system.reflection.metadata.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection/4.3.0/system.reflection.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.5.2/system.runtime.compilerservices.unsafe.4.5.2.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.5.3/system.runtime.compilerservices.unsafe.4.5.3.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.7.1/system.runtime.compilerservices.unsafe.4.7.1.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/5.0.0/system.runtime.compilerservices.unsafe.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/6.0.0/system.runtime.compilerservices.unsafe.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.numerics/4.3.0/system.runtime.numerics.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime/4.3.0/system.runtime.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime/4.3.1/system.runtime.4.3.1.nupkg https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/5.0.0/system.security.accesscontrol.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.algorithms/4.3.0/system.security.cryptography.algorithms.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/4.3.0/system.security.cryptography.cng.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.csp/4.3.0/system.security.cryptography.csp.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.encoding/4.3.0/system.security.cryptography.encoding.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.openssl/4.3.0/system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.primitives/4.3.0/system.security.cryptography.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/4.4.0/system.security.cryptography.protecteddata.4.4.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.x509certificates/4.3.0/system.security.cryptography.x509certificates.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/5.0.0/system.security.principal.windows.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding.codepages/4.5.1/system.text.encoding.codepages.4.5.1.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks.dataflow/5.0.0/system.threading.tasks.dataflow.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading/4.3.0/system.threading.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/testableio.system.io.abstractions.testinghelpers/20.0.4/testableio.system.io.abstractions.testinghelpers.20.0.4.nupkg https://api.nuget.org/v3-flatcontainer/testableio.system.io.abstractions.wrappers/20.0.4/testableio.system.io.abstractions.wrappers.20.0.4.nupkg https://api.nuget.org/v3-flatcontainer/testableio.system.io.abstractions/20.0.4/testableio.system.io.abstractions.20.0.4.nupkg https://api.nuget.org/v3-flatcontainer/thoth.json.net/8.0.0/thoth.json.net.8.0.0.nupkg https://github.com/dotnet/fsharp/archive/050271d631956a4e0d0484a583d38236b727a46d.tar.gz -> fsharp-050271d631956a4e0d0484a583d38236b727a46d.tar.gz
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	dotnet-pkg	9f041be16373f3b3c2ad1ae7a7559960	dotnet-pkg-base	3e91bc4d3bc423a7b9dc30a94279901c	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	nuget	e90611a22e7a711a49d37cb365b878e8
+_md5_=e87391b358caf47f2d158353e9ab349c
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index db3ca3234280..3a90ea7931a6 100644
--- a/metadata/md5-cache/dev-haskell/Manifest.gz
+++ b/metadata/md5-cache/dev-haskell/Manifest.gz
diff --git a/metadata/md5-cache/dev-haskell/hashtables-1.3.1 b/metadata/md5-cache/dev-haskell/hashtables-1.3.1
index 07b59d375b12..306d2ac682d6 100644
--- a/metadata/md5-cache/dev-haskell/hashtables-1.3.1
+++ b/metadata/md5-cache/dev-haskell/hashtables-1.3.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.3.1
 SRC_URI=https://hackage.haskell.org/package/hashtables-1.3.1/hashtables-1.3.1.tar.gz
 _eclasses_=ghc-package	8e4f6eb2d0e798049f6fcaf3b84c0d4a	haskell-cabal	7a05e05c4a785428f7c2f31e22667fea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=5308c38dccfb9fd2e235b32aeb0e68ac
+_md5_=b371a9b7807d0aa5f9415ecf678cd705
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 66f0890374bf..557b4a3a591d 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.6.7 b/metadata/md5-cache/dev-java/javatoolkit-0.6.7
index 25c341899fa8..c858da6189b9 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.6.7
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.6.7
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[xml(+)] )
+BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[xml(+)] ) python_targets_python3_13? ( dev-lang/python:3.13[xml(+)] ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Collection of Gentoo-specific tools for Java
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
 INHERIT=distutils-r1 prefix
-IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
 KEYWORDS=amd64 ~arm arm64 ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=GPL-2
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[xml(+)] )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[xml(+)] ) python_targets_python3_13? ( dev-lang/python:3.13[xml(+)] )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/javatoolkit.git/snapshot/javatoolkit-0.6.7.tar.bz2
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=bee36e2225a6ad575debdb80d7328cbf
+_md5_=e06916c9b319f2304851c3c0d3056b3f
diff --git a/metadata/md5-cache/dev-java/swt-4.10-r3 b/metadata/md5-cache/dev-java/swt-4.10-r4
index 1c1a730ca68d..02e7e27b72bc 100644
--- a/metadata/md5-cache/dev-java/swt-4.10-r3
+++ b/metadata/md5-cache/dev-java/swt-4.10-r4
@@ -8,8 +8,8 @@ INHERIT=flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs java-osgi
 IUSE=cairo opengl webkit doc source
 KEYWORDS=amd64 ppc64
 LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
-RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/glib >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/glib >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4 ) >=virtual/jre-1.8:* x11-libs/libX11 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.10
 SRC_URI=amd64? ( https://archive.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-x86_64.zip ) ppc64? ( https://archive.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-ppc64le.zip )
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-osgi	b1d0d0f01a98e464d86fd1ed8eddf07b	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=130e4d095c98eb6c7d069711d7a96b86
+_md5_=61778c8aef9c2e8af95bdf148ee23973
diff --git a/metadata/md5-cache/dev-java/swt-4.29 b/metadata/md5-cache/dev-java/swt-4.29-r1
index 46f6e19168b7..b2c13f467334 100644
--- a/metadata/md5-cache/dev-java/swt-4.29
+++ b/metadata/md5-cache/dev-java/swt-4.29-r1
@@ -8,8 +8,8 @@ INHERIT=flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs
 IUSE=cairo opengl webkit doc source
 KEYWORDS=amd64 arm64 ppc64
 LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
-RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/glib x11-libs/gtk+:3 x11-libs/libXtst cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4.1 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/glib x11-libs/gtk+:3 x11-libs/libXtst cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4.1 ) >=virtual/jre-1.8:* x11-libs/libX11 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.27
 SRC_URI=amd64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.29-202309031000/swt-4.29-gtk-linux-x86_64.zip ) arm64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.29-202309031000/swt-4.29-gtk-linux-aarch64.zip ) ppc64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.29-202309031000/swt-4.29-gtk-linux-ppc64le.zip )
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=38f1d080647052010f196f9f8f767958
+_md5_=347677291d56e584526afcf3bba8607b
diff --git a/metadata/md5-cache/dev-java/swt-4.30-r1 b/metadata/md5-cache/dev-java/swt-4.30-r2
index a9d29d5f8489..7764b1e6aa69 100644
--- a/metadata/md5-cache/dev-java/swt-4.30-r1
+++ b/metadata/md5-cache/dev-java/swt-4.30-r2
@@ -8,8 +8,8 @@ INHERIT=flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs
 IUSE=cairo opengl webkit doc source
 KEYWORDS=amd64 arm64 ppc64
 LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
-RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/glib x11-libs/gtk+:3 x11-libs/libXtst cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4.1 ) >=virtual/jre-17:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/glib x11-libs/gtk+:3 x11-libs/libXtst cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4.1 ) >=virtual/jre-17:* x11-libs/libX11 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.30
 SRC_URI=amd64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.30-202312010110/swt-4.30-gtk-linux-x86_64.zip ) arm64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.30-202312010110/swt-4.30-gtk-linux-aarch64.zip ) ppc64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.30-202312010110/swt-4.30-gtk-linux-ppc64le.zip )
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=180ff291fc73ec3c4c92610af9ff5715
+_md5_=6fb395f4f8948fd9c3ec21d5149bb534
diff --git a/metadata/md5-cache/dev-java/swt-4.31 b/metadata/md5-cache/dev-java/swt-4.31-r1
index 05c123465332..b8d668e1f890 100644
--- a/metadata/md5-cache/dev-java/swt-4.31
+++ b/metadata/md5-cache/dev-java/swt-4.31-r1
@@ -8,8 +8,8 @@ INHERIT=flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs
 IUSE=cairo opengl webkit doc source
 KEYWORDS=amd64 arm64 ppc64
 LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
-RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/glib x11-libs/gtk+:3 x11-libs/libXtst cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4.1 ) >=virtual/jre-17:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/glib x11-libs/gtk+:3 x11-libs/libXtst cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4.1 ) >=virtual/jre-17:* x11-libs/libX11 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.31
 SRC_URI=amd64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.31-202402290520/swt-4.31-gtk-linux-x86_64.zip ) arm64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.31-202402290520/swt-4.31-gtk-linux-aarch64.zip ) ppc64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.31-202402290520/swt-4.31-gtk-linux-ppc64le.zip )
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=5ecb1f05e1404836169b038a2c1a3923
+_md5_=b6f68db483d4ee567855345d4aa5e7ad
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index c3d1ddc6772d..f19ba239fb98 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.14.2 b/metadata/md5-cache/dev-lang/ocaml-4.14.2
index 627d47ae57c6..9ed603bbd6e3 100644
--- a/metadata/md5-cache/dev-lang/ocaml-4.14.2
+++ b/metadata/md5-cache/dev-lang/ocaml-4.14.2
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/binutils-libs:=
 SLOT=0/4.14.2
 SRC_URI=https://github.com/ocaml/ocaml/archive/4.14.2.tar.gz -> ocaml-4.14.2.tar.gz
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c53bec3c109895f8bf90811ecdf8f846
+_md5_=1ddaf26ea2b08b62d6cf3d7d0a59f84d
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-115.11.0 b/metadata/md5-cache/dev-lang/spidermonkey-115.11.0
index afa5f98421cd..c09078df5c9f 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-115.11.0
+++ b/metadata/md5-cache/dev-lang/spidermonkey-115.11.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.12[ncurses,ssl,xml(+)] dev-lang/python:3.11[ncurses,ssl,xml(+)] dev-lang/python:3.10[ncurses,ssl,xml(+)] ) virtual/pkgconfig || ( ( sys-devel/llvm:18 clang? ( sys-devel/lld:18 sys-devel/clang:18 virtual/rust:0/llvm-18 ) ) ( sys-devel/llvm:17 clang? ( sys-devel/lld:17 sys-devel/clang:17 virtual/rust:0/llvm-17 ) ) ( sys-devel/llvm:16 clang? ( sys-devel/lld:16 sys-devel/clang:16 virtual/rust:0/llvm-16 ) ) ( sys-devel/llvm:15 clang? ( sys-devel/lld:15 sys-devel/clang:15 virtual/rust:0/llvm-15 ) ) ) !clang? ( <virtual/rust-1.78 ) !elibc_glibc? ( || ( <dev-lang/rust-1.78 <dev-lang/rust-bin-1.73 ) ) test? ( || ( ( dev-lang/python:3.12[ncurses,ssl,xml(+)] dev-python/six[python_targets_python3_12(-)] ) ( dev-lang/python:3.11[ncurses,ssl,xml(+)] dev-python/six[python_targets_python3_11(-)] ) ( dev-lang/python:3.10[ncurses,ssl,xml(+)] dev-python/six[python_targets_python3_10(-)] ) ) ) >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) >=dev-build/autoconf-2.13-r7:2.1 >=dev-build/libtool-2.4.7-r3
+BDEPEND=|| ( dev-lang/python:3.12[ncurses,ssl,xml(+)] dev-lang/python:3.11[ncurses,ssl,xml(+)] dev-lang/python:3.10[ncurses,ssl,xml(+)] ) virtual/pkgconfig || ( ( sys-devel/llvm:18 clang? ( sys-devel/lld:18 sys-devel/clang:18 virtual/rust:0/llvm-18 ) ) ( sys-devel/llvm:17 clang? ( sys-devel/lld:17 sys-devel/clang:17 virtual/rust:0/llvm-17 ) ) ( sys-devel/llvm:16 clang? ( sys-devel/lld:16 sys-devel/clang:16 virtual/rust:0/llvm-16 ) ) ( sys-devel/llvm:15 clang? ( sys-devel/lld:15 sys-devel/clang:15 virtual/rust:0/llvm-15 ) ) ) !clang? ( virtual/rust ) !elibc_glibc? ( || ( dev-lang/rust <dev-lang/rust-bin-1.73 ) ) test? ( || ( ( dev-lang/python:3.12[ncurses,ssl,xml(+)] dev-python/six[python_targets_python3_12(-)] ) ( dev-lang/python:3.11[ncurses,ssl,xml(+)] dev-python/six[python_targets_python3_11(-)] ) ( dev-lang/python:3.10[ncurses,ssl,xml(+)] dev-python/six[python_targets_python3_10(-)] ) ) ) >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) >=dev-build/autoconf-2.13-r7:2.1 >=dev-build/libtool-2.4.7-r3
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=>=dev-libs/icu-73.1:= dev-libs/nspr sys-libs/readline:0= sys-libs/zlib !!sys-devel/llvm:0
 DESCRIPTION=SpiderMonkey is Mozilla's JavaScript engine written in C and C++
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=115
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/115.11.0esr/source/firefox-115.11.0esr.source.tar.xz -> firefox-115.11.0esr.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-115esr-patches-10.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/spidermonkey-115-patches-01.tar.xz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=acbfbafddd3bc91b2e8f7452dadb607b
+_md5_=613490ae69d1fcfa3da883180957d5e8
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 5ee5456c9c06..238a76aa5e17 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/capstone-4.0.2-r2 b/metadata/md5-cache/dev-libs/capstone-4.0.2-r2
deleted file mode 100644
index e0cf967b678b..000000000000
--- a/metadata/md5-cache/dev-libs/capstone-4.0.2-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) ) python? ( dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
-DESCRIPTION=disassembly/disassembler framework + bindings
-EAPI=8
-HOMEPAGE=https://www.capstone-engine.org/
-INHERIT=cmake distutils-r1 toolchain-funcs
-IUSE=python static-libs test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=BSD
-RDEPEND=python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
-RESTRICT=test
-SLOT=0/4
-SRC_URI=https://github.com/capstone-engine/capstone/archive/4.0.2.tar.gz -> capstone-4.0.2.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4ba79d7e302c33f9d0ce8da92bbb0eee
diff --git a/metadata/md5-cache/dev-libs/capstone-5.0.1 b/metadata/md5-cache/dev-libs/capstone-5.0.1
index 8126ded9e436..abd6dfb93317 100644
--- a/metadata/md5-cache/dev-libs/capstone-5.0.1
+++ b/metadata/md5-cache/dev-libs/capstone-5.0.1
@@ -1,11 +1,11 @@
-BDEPEND=>=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
+BDEPEND=>=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) python? ( dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] )
 DESCRIPTION=disassembly/disassembler framework + bindings
 EAPI=8
 HOMEPAGE=https://www.capstone-engine.org/
 INHERIT=cmake distutils-r1 toolchain-funcs
-IUSE=python static-libs test test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+IUSE=python static-libs test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
 KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://github.com/capstone-engine/capstone/archive/5.0.1.tar.gz -> capstone-5.0.1.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=38d6dcbbd03a6fac27e39b21ca6cafac
+_md5_=3598224a186be04822354a059744991e
diff --git a/metadata/md5-cache/dev-libs/capstone-9999 b/metadata/md5-cache/dev-libs/capstone-9999
index 9935fa9b9b14..7072bb41c8a3 100644
--- a/metadata/md5-cache/dev-libs/capstone-9999
+++ b/metadata/md5-cache/dev-libs/capstone-9999
@@ -1,11 +1,11 @@
-BDEPEND=>=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) python? ( dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] )
 DESCRIPTION=disassembly/disassembler framework + bindings
 EAPI=8
 HOMEPAGE=https://www.capstone-engine.org/
 INHERIT=cmake distutils-r1 toolchain-funcs git-r3
-IUSE=python static-libs test test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+IUSE=python static-libs test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) )
@@ -13,4 +13,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11
 RESTRICT=!test? ( test )
 SLOT=0/5
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=793bddb57ff8150f2899e1747a3ff805
+_md5_=35b1437756f629e52894199ba128843d
diff --git a/metadata/md5-cache/dev-libs/libliftoff-0.3.0 b/metadata/md5-cache/dev-libs/libliftoff-0.5.0
index 3bbf741b9f50..f576b7ffea95 100644
--- a/metadata/md5-cache/dev-libs/libliftoff-0.3.0
+++ b/metadata/md5-cache/dev-libs/libliftoff-0.5.0
@@ -5,10 +5,10 @@ DESCRIPTION=Lightweight KMS plane library
 EAPI=8
 HOMEPAGE=https://gitlab.freedesktop.org/emersion/libliftoff
 INHERIT=meson
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=x11-libs/libdrm
 SLOT=0
-SRC_URI=https://gitlab.freedesktop.org/emersion/libliftoff/-/releases/v0.3.0/downloads/libliftoff-0.3.0.tar.gz
+SRC_URI=https://gitlab.freedesktop.org/emersion/libliftoff/-/releases/v0.5.0/downloads/libliftoff-0.5.0.tar.gz
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=822265dbb13138aab91e4740ca871a33
+_md5_=21b9c51da1d540c4baac056ca4b32ea6
diff --git a/metadata/md5-cache/dev-libs/liblouis-3.29.0 b/metadata/md5-cache/dev-libs/liblouis-3.29.0
new file mode 100644
index 000000000000..b27b31f96cd4
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/liblouis-3.29.0
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_10? ( >=dev-python/gpep517-15[python_targets_python3_10(-)] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-15[python_targets_python3_11(-)] >=dev-python/setuptools-69.0.3[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/gpep517-15[python_targets_python3_12(-)] >=dev-python/setuptools-69.0.3[python_targets_python3_12(-)] ) python_single_target_python3_13? ( >=dev-python/gpep517-15[python_targets_python3_13(-)] >=dev-python/setuptools-69.0.3[python_targets_python3_13(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) sys-apps/help2man python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) python_single_target_python3_10? ( >=dev-python/gpep517-15[python_targets_python3_10(-)] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-15[python_targets_python3_11(-)] >=dev-python/setuptools-69.0.3[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/gpep517-15[python_targets_python3_12(-)] >=dev-python/setuptools-69.0.3[python_targets_python3_12(-)] ) python_single_target_python3_13? ( >=dev-python/gpep517-15[python_targets_python3_13(-)] >=dev-python/setuptools-69.0.3[python_targets_python3_13(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) app-text/texlive-core test? ( dev-libs/libyaml )
+DESCRIPTION=An open-source braille translator and back-translator
+EAPI=8
+HOMEPAGE=https://github.com/liblouis/liblouis
+INHERIT=distutils-r1
+IUSE=test python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) app-text/texlive-core test? ( dev-libs/libyaml ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13 ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0/20
+SRC_URI=https://github.com/liblouis/liblouis/releases/download/v3.29.0/liblouis-3.29.0.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=8271018bbb8082ff5f17026dc57a2112
diff --git a/metadata/md5-cache/dev-libs/libratbag-0.15 b/metadata/md5-cache/dev-libs/libratbag-0.15
deleted file mode 100644
index 3327ed21301f..000000000000
--- a/metadata/md5-cache/dev-libs/libratbag-0.15
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) dev-lang/swig virtual/pkgconfig doc? ( python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ) test? ( dev-libs/check dev-libs/gobject-introspection dev-debug/valgrind python_single_target_python3_10? ( dev-python/evdev[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) acct-group/plugdev dev-libs/glib:2 dev-libs/json-glib dev-libs/libevdev dev-libs/libunistring:= virtual/libudev:= python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/evdev[python_targets_python3_10(-)] ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) dev-libs/gobject-introspection
-DESCRIPTION=Library to configure gaming mice
-EAPI=8
-HOMEPAGE=https://github.com/libratbag/libratbag
-INHERIT=meson python-single-r1 systemd udev
-IUSE=doc elogind systemd test +python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) acct-group/plugdev dev-libs/glib:2 dev-libs/json-glib dev-libs/libevdev dev-libs/libunistring:= virtual/libudev:= python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/evdev[python_targets_python3_10(-)] ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
-REQUIRED_USE=^^ ( python_single_target_python3_10 ) ^^ ( elogind systemd )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/libratbag/libratbag/archive/v0.15.tar.gz -> libratbag-0.15.tar.gz
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=b22016528430aed5e5c4d85a0846da8e
diff --git a/metadata/md5-cache/dev-libs/libratbag-0.16 b/metadata/md5-cache/dev-libs/libratbag-0.16
deleted file mode 100644
index f766b90eb82d..000000000000
--- a/metadata/md5-cache/dev-libs/libratbag-0.16
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) dev-lang/swig virtual/pkgconfig doc? ( python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ) test? ( dev-libs/check dev-libs/gobject-introspection dev-debug/valgrind python_single_target_python3_10? ( dev-python/evdev[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) acct-group/plugdev dev-libs/glib:2 dev-libs/json-glib dev-libs/libevdev dev-libs/libunistring:= virtual/libudev:= python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/evdev[python_targets_python3_10(-)] ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) dev-libs/gobject-introspection
-DESCRIPTION=Library to configure gaming mice
-EAPI=8
-HOMEPAGE=https://github.com/libratbag/libratbag
-INHERIT=meson python-single-r1 systemd udev
-IUSE=doc elogind systemd test +python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) acct-group/plugdev dev-libs/glib:2 dev-libs/json-glib dev-libs/libevdev dev-libs/libunistring:= virtual/libudev:= python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/evdev[python_targets_python3_10(-)] ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
-REQUIRED_USE=^^ ( python_single_target_python3_10 ) ^^ ( elogind systemd )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/libratbag/libratbag/archive/v0.16.tar.gz -> libratbag-0.16.tar.gz
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=ce5c02d3597b4a5b318c31ef6fe38902
diff --git a/metadata/md5-cache/dev-libs/libratbag-0.17-r2 b/metadata/md5-cache/dev-libs/libratbag-0.17-r2
new file mode 100644
index 000000000000..89df0d3c0c53
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libratbag-0.17-r2
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-lang/swig virtual/pkgconfig doc? ( python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/sphinx[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] ) ) test? ( dev-libs/check dev-libs/gobject-introspection dev-debug/valgrind python_single_target_python3_10? ( dev-python/evdev[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/evdev[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/evdev[python_targets_python3_12(-)] dev-python/pygobject:3[python_targets_python3_12(-)] ) ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) acct-group/plugdev dev-libs/glib:2 dev-libs/json-glib dev-libs/libevdev dev-libs/libunistring:= virtual/libudev:= python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/evdev[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/evdev[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pygobject:3[python_targets_python3_12(-)] dev-python/evdev[python_targets_python3_12(-)] ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) dev-libs/gobject-introspection
+DESCRIPTION=Library to configure gaming mice
+EAPI=8
+HOMEPAGE=https://github.com/libratbag/libratbag
+INHERIT=meson python-single-r1 systemd udev
+IUSE=doc elogind systemd test python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) acct-group/plugdev dev-libs/glib:2 dev-libs/json-glib dev-libs/libevdev dev-libs/libunistring:= virtual/libudev:= python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/evdev[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/evdev[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pygobject:3[python_targets_python3_12(-)] dev-python/evdev[python_targets_python3_12(-)] ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) ^^ ( elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/libratbag/libratbag/archive/v0.17.tar.gz -> libratbag-0.17.tar.gz
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=e78ed79a0a927d73c63f9dc7ec91dd54
diff --git a/metadata/md5-cache/dev-libs/libratbag-9999 b/metadata/md5-cache/dev-libs/libratbag-9999
index 68761c36baf2..e085d1a6aed2 100644
--- a/metadata/md5-cache/dev-libs/libratbag-9999
+++ b/metadata/md5-cache/dev-libs/libratbag-9999
@@ -1,16 +1,16 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) dev-lang/swig virtual/pkgconfig doc? ( python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ) test? ( dev-libs/check dev-libs/gobject-introspection dev-debug/valgrind python_single_target_python3_10? ( dev-python/evdev[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/evdev[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-lang/swig virtual/pkgconfig doc? ( python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/sphinx[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] ) ) test? ( dev-libs/check dev-libs/gobject-introspection dev-debug/valgrind python_single_target_python3_10? ( dev-python/evdev[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/evdev[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/evdev[python_targets_python3_12(-)] dev-python/pygobject:3[python_targets_python3_12(-)] ) ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) acct-group/plugdev dev-libs/glib:2 dev-libs/json-glib dev-libs/libevdev dev-libs/libunistring:= virtual/libudev:= python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/evdev[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/evdev[python_targets_python3_11(-)] ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) dev-libs/gobject-introspection
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) acct-group/plugdev dev-libs/glib:2 dev-libs/json-glib dev-libs/libevdev dev-libs/libunistring:= virtual/libudev:= python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/evdev[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/evdev[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pygobject:3[python_targets_python3_12(-)] dev-python/evdev[python_targets_python3_12(-)] ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) dev-libs/gobject-introspection
 DESCRIPTION=Library to configure gaming mice
 EAPI=8
 HOMEPAGE=https://github.com/libratbag/libratbag
 INHERIT=meson python-single-r1 systemd udev git-r3
-IUSE=doc elogind systemd test python_single_target_python3_10 python_single_target_python3_11
+IUSE=doc elogind systemd test python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) acct-group/plugdev dev-libs/glib:2 dev-libs/json-glib dev-libs/libevdev dev-libs/libunistring:= virtual/libudev:= python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/evdev[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/evdev[python_targets_python3_11(-)] ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( elogind systemd )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) acct-group/plugdev dev-libs/glib:2 dev-libs/json-glib dev-libs/libevdev dev-libs/libunistring:= virtual/libudev:= python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/evdev[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/evdev[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pygobject:3[python_targets_python3_12(-)] dev-python/evdev[python_targets_python3_12(-)] ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) ^^ ( elogind systemd )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=d12b11151c5f08d68fc8c65961d25bf9
+_md5_=d1960a67dea454f308dbefbc8ba54aee
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.18_p20220618 b/metadata/md5-cache/dev-libs/libsodium-1.0.18_p20220618
deleted file mode 100644
index a0477739ffcf..000000000000
--- a/metadata/md5-cache/dev-libs/libsodium-1.0.18_p20220618
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/minisig-keys-libsodium ) >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3 verify-sig? ( app-crypt/minisign )
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Portable fork of NaCl, a higher-level cryptographic library
-EAPI=8
-HOMEPAGE=https://libsodium.org
-INHERIT=autotools multilib-minimal verify-sig
-IUSE=+asm minimal static-libs +urandom cpu_flags_x86_aes cpu_flags_x86_sse4_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 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos
-LICENSE=ISC
-SLOT=0/23
-SRC_URI=https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/libsodium-1.0.18-stable-20220618.tar.gz -> libsodium-1.0.18_p20220618.tar.gz verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/libsodium-1.0.18-stable-20220618.tar.gz.minisig -> libsodium-1.0.18_p20220618.tar.gz.minisig )
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=55782bb1e4ce7869d37c4833b84012a8
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.19-r1 b/metadata/md5-cache/dev-libs/libsodium-1.0.19-r1
deleted file mode 100644
index 7bf4af1d1194..000000000000
--- a/metadata/md5-cache/dev-libs/libsodium-1.0.19-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/minisig-keys-libsodium ) >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3 verify-sig? ( app-crypt/minisign )
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Portable fork of NaCl, a higher-level cryptographic library
-EAPI=8
-HOMEPAGE=https://libsodium.org
-INHERIT=autotools multilib-minimal verify-sig
-IUSE=+asm minimal static-libs +urandom cpu_flags_x86_aes cpu_flags_x86_sse4_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 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos
-LICENSE=ISC
-SLOT=0/26
-SRC_URI=https://download.libsodium.org/libsodium/releases/libsodium-1.0.19.tar.gz verify-sig? ( https://download.libsodium.org/libsodium/releases/libsodium-1.0.19.tar.gz.minisig )
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=e3dd0545112c0a3de7e056801367545c
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.19-r2 b/metadata/md5-cache/dev-libs/libsodium-1.0.20
index d36a02974eb3..19602a65c213 100644
--- a/metadata/md5-cache/dev-libs/libsodium-1.0.19-r2
+++ b/metadata/md5-cache/dev-libs/libsodium-1.0.20
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://libsodium.org
 INHERIT=autotools multilib-minimal verify-sig
 IUSE=+asm static-libs +urandom cpu_flags_x86_aes cpu_flags_x86_sse4_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 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos
 LICENSE=ISC
 SLOT=0/26
-SRC_URI=https://download.libsodium.org/libsodium/releases/libsodium-1.0.19.tar.gz verify-sig? ( https://download.libsodium.org/libsodium/releases/libsodium-1.0.19.tar.gz.minisig )
+SRC_URI=https://download.libsodium.org/libsodium/releases/libsodium-1.0.20.tar.gz verify-sig? ( https://download.libsodium.org/libsodium/releases/libsodium-1.0.20.tar.gz.minisig )
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=c9c6fbce6986d7ffa6be7ba533dd1aaf
+_md5_=3760ecfc3b05de414b0d0ac4b3a00260
diff --git a/metadata/md5-cache/dev-libs/mimalloc-2.1.7 b/metadata/md5-cache/dev-libs/mimalloc-2.1.7
new file mode 100644
index 000000000000..3da920635d8d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/mimalloc-2.1.7
@@ -0,0 +1,15 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=valgrind? ( dev-debug/valgrind )
+DESCRIPTION=A compact general purpose allocator with excellent performance
+EAPI=8
+HOMEPAGE=https://github.com/microsoft/mimalloc
+INHERIT=cmake-multilib
+IUSE=hardened test valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/microsoft/mimalloc/archive/refs/tags/v2.1.7.tar.gz -> mimalloc-2.1.7.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=7a2bac1d60f108d6f022c02c49209df9
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 3585b047fc24..7c1032ac156c 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/async_kernel-0.16.0 b/metadata/md5-cache/dev-ml/async_kernel-0.16.0
index d5575bc6317f..c4e270583a30 100644
--- a/metadata/md5-cache/dev-ml/async_kernel-0.16.0
+++ b/metadata/md5-cache/dev-ml/async_kernel-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/async_kernel
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/core:0/0.16 dev-ml/core_kernel:0/0.16 dev-ml/ppx_jane:0/0.16 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/async_kernel/archive/v0.16.0.tar.gz -> async_kernel-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=7b374dfbb2502095bb46df600431c716
+_md5_=80dece081a48ceef51ae0cc90ce92032
diff --git a/metadata/md5-cache/dev-ml/async_rpc_kernel-0.16.0 b/metadata/md5-cache/dev-ml/async_rpc_kernel-0.16.0
index 759b2098e676..5afd534702f7 100644
--- a/metadata/md5-cache/dev-ml/async_rpc_kernel-0.16.0
+++ b/metadata/md5-cache/dev-ml/async_rpc_kernel-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/async_rpc_kernel
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/async_kernel:0/0.16 dev-ml/core:0/0.16 dev-ml/protocol_version_header:0/0.16 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/async_rpc_kernel/archive/v0.16.0.tar.gz -> async_rpc_kernel-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=f348ae7405d726a3d8e5a4465e6af11b
+_md5_=82eb817a0ad9562b40176b289012c67d
diff --git a/metadata/md5-cache/dev-ml/base-0.16.3-r1 b/metadata/md5-cache/dev-ml/base-0.16.3-r1
index c6f225aea91a..4bfb9a5b0b60 100644
--- a/metadata/md5-cache/dev-ml/base-0.16.3-r1
+++ b/metadata/md5-cache/dev-ml/base-0.16.3-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/base
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14.0 =dev-ml/sexplib0-0.16*:=[ocamlopt?] dev-ml/dune-configurator:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/base/archive/v0.16.3.tar.gz -> base-0.16.3.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=d9cba11da8214d29873f8399d87efda3
+_md5_=4ca081bb0bfd8db0ca05a7a0a78b9bc2
diff --git a/metadata/md5-cache/dev-ml/base_bigstring-0.16.0 b/metadata/md5-cache/dev-ml/base_bigstring-0.16.0
index e896d87a89c9..e236878555e9 100644
--- a/metadata/md5-cache/dev-ml/base_bigstring-0.16.0
+++ b/metadata/md5-cache/dev-ml/base_bigstring-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/base_bigstring
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/base:0/0.16 dev-ml/int_repr:0/0.16 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/base_bigstring/archive/v0.16.0.tar.gz -> base_bigstring-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=bcea692b797d9fa63ee33060a383d835
+_md5_=1f53210cf7e48a5f1634852bd511813d
diff --git a/metadata/md5-cache/dev-ml/base_quickcheck-0.16.0 b/metadata/md5-cache/dev-ml/base_quickcheck-0.16.0
index 3b734865452b..4d6276e7a8db 100644
--- a/metadata/md5-cache/dev-ml/base_quickcheck-0.16.0
+++ b/metadata/md5-cache/dev-ml/base_quickcheck-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/base_quickcheck
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/base:0/0.16 dev-ml/fieldslib:= dev-ml/ppx_base:0/0.16 dev-ml/ppx_compare:= dev-ml/ppx_cold:= dev-ml/ppx_enumerate:= dev-ml/ppx_fields_conv:0/0.16 dev-ml/ppx_globalize:= dev-ml/ppx_let:0/0.16 dev-ml/ppx_hash:= dev-ml/ppx_here:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_sexp_message:0/0.16 dev-ml/ppx_sexp_value:0/0.16 dev-ml/splittable_random:0/0.16 >=dev-ml/ppxlib-0.28.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/base_quickcheck/archive/v0.16.0.tar.gz -> base_quickcheck-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=99e0339df5060e0ca09a209d762ba5ba
+_md5_=36ec70ea87bfec36d610fadcc70ee217
diff --git a/metadata/md5-cache/dev-ml/bin_prot-0.16.0 b/metadata/md5-cache/dev-ml/bin_prot-0.16.0
index f601767cecec..ee8ffc2ce38f 100644
--- a/metadata/md5-cache/dev-ml/bin_prot-0.16.0
+++ b/metadata/md5-cache/dev-ml/bin_prot-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/bin_prot
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/base:0/0.16 dev-ml/findlib:= dev-ml/ppx_compare:0/0.16 dev-ml/ppx_custom_printf:0/0.16 dev-ml/ppx_fields_conv:0/0.16 dev-ml/ppx_optcomp:0/0.16 dev-ml/ppx_sexp_conv:0/0.16 dev-ml/ppx_stable_witness:0/0.16 dev-ml/ppx_variants_conv:0/0.16 dev-ml/variantslib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/bin_prot/archive/v0.16.0.tar.gz -> bin_prot-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=90430d5ee62e7ff0f9ad1d37c1225a73
+_md5_=c378d7c04f3d902d9ffff321466c6ef8
diff --git a/metadata/md5-cache/dev-ml/core-0.14.0-r4 b/metadata/md5-cache/dev-ml/core-0.14.0-r4
deleted file mode 100644
index 694b8d84ced9..000000000000
--- a/metadata/md5-cache/dev-ml/core-0.14.0-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile install test
-DEPEND=<dev-lang/ocaml-4.12 dev-ml/base:= <dev-ml/core_kernel-0.15:= <dev-ml/jst-config-0.15:= <dev-ml/ppx_jane-0.15:= <dev-ml/sexplib-0.15:= dev-ml/spawn:= dev-ml/stdio:= dev-ml/timezone:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Jane Street's alternative to the standard library
-EAPI=7
-HOMEPAGE=https://github.com/janestreet/core
-INHERIT=dune
-IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 x86
-LICENSE=MIT
-RDEPEND=<dev-lang/ocaml-4.12 dev-ml/base:= <dev-ml/core_kernel-0.15:= <dev-ml/jst-config-0.15:= <dev-ml/ppx_jane-0.15:= <dev-ml/sexplib-0.15:= dev-ml/spawn:= dev-ml/stdio:= dev-ml/timezone:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=test
-SLOT=0/0.14.0
-SRC_URI=https://github.com/janestreet/core/archive/v0.14.0.tar.gz -> core-0.14.0.tar.gz
-_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=9a85bae1aaa5ea0db428ba0cdbedd41a
diff --git a/metadata/md5-cache/dev-ml/core-0.14.0-r6 b/metadata/md5-cache/dev-ml/core-0.14.0-r6
new file mode 100644
index 000000000000..9cf07483e3d6
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/core-0.14.0-r6
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=<dev-lang/ocaml-4.12 <dev-ml/base-0.15:= <dev-ml/core_kernel-0.15:= <dev-ml/jst-config-0.15:= <dev-ml/ppx_jane-0.15:= <dev-ml/sexplib-0.15:= dev-ml/spawn:= dev-ml/stdio:0/0.14.0 dev-ml/timezone:0/0.14.0 dev-ml/jane-street-headers:0/0.14.0 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Jane Street's alternative to the standard library
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/core
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 x86
+LICENSE=MIT
+RDEPEND=<dev-lang/ocaml-4.12 <dev-ml/base-0.15:= <dev-ml/core_kernel-0.15:= <dev-ml/jst-config-0.15:= <dev-ml/ppx_jane-0.15:= <dev-ml/sexplib-0.15:= dev-ml/spawn:= dev-ml/stdio:0/0.14.0 dev-ml/timezone:0/0.14.0 dev-ml/jane-street-headers:0/0.14.0 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/core/archive/v0.14.0.tar.gz -> core-0.14.0.tar.gz
+_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
+_md5_=885c703f0194edfd325e60a8cd1bfe32
diff --git a/metadata/md5-cache/dev-ml/core-0.16.1 b/metadata/md5-cache/dev-ml/core-0.16.1
index 4f4c23a6851c..82b5c6157cff 100644
--- a/metadata/md5-cache/dev-ml/core-0.16.1
+++ b/metadata/md5-cache/dev-ml/core-0.16.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/core
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/base:0/0.16 dev-ml/base_bigstring:0/0.16 dev-ml/base_quickcheck:0/0.16 dev-ml/bin_prot:0/0.16 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.16 dev-ml/ppx_module_timer:= dev-ml/ppx_optional:= dev-ml/ppx_pipebang:= dev-ml/ppx_sexp_message:0/0.16 dev-ml/ppx_sexp_value:= dev-ml/ppx_stable:= dev-ml/ppx_string:= dev-ml/ppx_ignore_instrumentation:= dev-ml/typerep:0/0.16 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/core/archive/v0.16.1.tar.gz -> core-0.16.1.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=804222b7b99c35ba804f940dcd48133a
+_md5_=9daec1aaee01b5a27ea3490e6a70f971
diff --git a/metadata/md5-cache/dev-ml/core_kernel-0.14.1-r3 b/metadata/md5-cache/dev-ml/core_kernel-0.14.1-r3
deleted file mode 100644
index 5fe6073d6c51..000000000000
--- a/metadata/md5-cache/dev-ml/core_kernel-0.14.1-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/ocaml:= <dev-ml/jst-config-0.15.0 dev-ml/base:= =dev-ml/base_bigstring-0.14*:= dev-ml/base_quickcheck:= dev-ml/bin_prot:= dev-ml/fieldslib:= dev-ml/jane-street-headers:= dev-ml/ocaml-migrate-parsetree:= =dev-ml/ppx_assert-0.14*:= =dev-ml/ppx_base-0.14*:= =dev-ml/ppx_hash-0.14*:= dev-ml/ppx_inline_test:= dev-ml/ppx_jane:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_sexp_message:= dev-ml/splittable_random:= dev-ml/sexplib:= dev-ml/stdio:= dev-ml/time_now:= dev-ml/typerep:= dev-ml/variantslib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=System-independent part of Core
-EAPI=7
-HOMEPAGE=https://github.com/janestreet/core_kernel
-INHERIT=dune
-IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-lang/ocaml:= <dev-ml/jst-config-0.15.0 dev-ml/base:= =dev-ml/base_bigstring-0.14*:= dev-ml/base_quickcheck:= dev-ml/bin_prot:= dev-ml/fieldslib:= dev-ml/jane-street-headers:= dev-ml/ocaml-migrate-parsetree:= =dev-ml/ppx_assert-0.14*:= =dev-ml/ppx_base-0.14*:= =dev-ml/ppx_hash-0.14*:= dev-ml/ppx_inline_test:= dev-ml/ppx_jane:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_sexp_message:= dev-ml/splittable_random:= dev-ml/sexplib:= dev-ml/stdio:= dev-ml/time_now:= dev-ml/typerep:= dev-ml/variantslib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=test
-SLOT=0/0.14.1
-SRC_URI=https://github.com/janestreet/core_kernel/archive/v0.14.1.tar.gz -> core_kernel-0.14.1.tar.gz
-_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=cf49be7d1a977b61cd9559382d253512
diff --git a/metadata/md5-cache/dev-ml/core_kernel-0.14.1-r4 b/metadata/md5-cache/dev-ml/core_kernel-0.14.1-r4
new file mode 100644
index 000000000000..310208ed1bab
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/core_kernel-0.14.1-r4
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=<dev-lang/ocaml-4.12:= <dev-ml/jst-config-0.15.0 <dev-ml/base-0.15:= =dev-ml/base_bigstring-0.14*:= <dev-ml/base_quickcheck-0.15:= dev-ml/bin_prot:0/0.14.0 dev-ml/fieldslib:0/0.14.0 dev-ml/jane-street-headers:0/0.14.0 dev-ml/ocaml-migrate-parsetree:= =dev-ml/ppx_assert-0.14*:= =dev-ml/ppx_base-0.14*:= =dev-ml/ppx_hash-0.14*:= dev-ml/ppx_inline_test:0/0.14.1 dev-ml/ppx_jane:0/0.14.0 <dev-ml/ppx_sexp_conv-0.15:= <dev-ml/ppx_sexp_message-0.15:= dev-ml/splittable_random:0/0.14.0 dev-ml/sexplib:0/0.14.0 dev-ml/stdio:0/0.14.0 dev-ml/time_now:0/0.14.0 dev-ml/typerep:0/0.14.0 dev-ml/variantslib:0/0.14.0 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=System-independent part of Core
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/core_kernel
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 x86
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=<dev-lang/ocaml-4.12:= <dev-ml/jst-config-0.15.0 <dev-ml/base-0.15:= =dev-ml/base_bigstring-0.14*:= <dev-ml/base_quickcheck-0.15:= dev-ml/bin_prot:0/0.14.0 dev-ml/fieldslib:0/0.14.0 dev-ml/jane-street-headers:0/0.14.0 dev-ml/ocaml-migrate-parsetree:= =dev-ml/ppx_assert-0.14*:= =dev-ml/ppx_base-0.14*:= =dev-ml/ppx_hash-0.14*:= dev-ml/ppx_inline_test:0/0.14.1 dev-ml/ppx_jane:0/0.14.0 <dev-ml/ppx_sexp_conv-0.15:= <dev-ml/ppx_sexp_message-0.15:= dev-ml/splittable_random:0/0.14.0 dev-ml/sexplib:0/0.14.0 dev-ml/stdio:0/0.14.0 dev-ml/time_now:0/0.14.0 dev-ml/typerep:0/0.14.0 dev-ml/variantslib:0/0.14.0 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/0.14.1
+SRC_URI=https://github.com/janestreet/core_kernel/archive/v0.14.1.tar.gz -> core_kernel-0.14.1.tar.gz
+_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
+_md5_=264a99861ead9a752932ccd22849919f
diff --git a/metadata/md5-cache/dev-ml/core_kernel-0.16.0 b/metadata/md5-cache/dev-ml/core_kernel-0.16.0
index efeaa553ba7f..2a8e62998377 100644
--- a/metadata/md5-cache/dev-ml/core_kernel-0.16.0
+++ b/metadata/md5-cache/dev-ml/core_kernel-0.16.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/core_kernel
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/base_quickcheck:= dev-ml/core:0/0.16 dev-ml/int_repr:0/0.16 dev-ml/ppx_assert:= dev-ml/ppx_bench:= dev-ml/ppx_bin_prot:= dev-ml/ppx_cold:= dev-ml/ppx_compare:= dev-ml/ppx_custom_printf:= dev-ml/ppx_disable_unused_warnings:= dev-ml/ppx_enumerate:= dev-ml/ppx_expect:= dev-ml/ppx_fields_conv:= dev-ml/ppx_fixed_literal:= dev-ml/ppx_globalize:= dev-ml/ppx_hash:= dev-ml/ppx_here:= dev-ml/ppx_ignore_instrumentation:= dev-ml/ppx_inline_test:= dev-ml/ppx_let:= dev-ml/ppx_log:= dev-ml/ppx_module_timer:= dev-ml/ppx_optcomp:0/0.16 dev-ml/ppx_optional:= dev-ml/ppx_pipebang:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_sexp_message:= dev-ml/ppx_sexp_value:= dev-ml/ppx_stable:= dev-ml/ppx_stable_witness:= dev-ml/ppx_string:= dev-ml/ppx_tydi:= dev-ml/ppx_typerep_conv:= dev-ml/ppx_variants_conv:= dev-ml/ppxlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/core_kernel/archive/v0.16.0.tar.gz -> core_kernel-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=782ce3ef697143cddd7affe9f930987e
+_md5_=b65fd809378d82c0d879b8f33395423c
diff --git a/metadata/md5-cache/dev-ml/fieldslib-0.16.0 b/metadata/md5-cache/dev-ml/fieldslib-0.16.0
index c1168dda10d8..df3880d5cc82 100644
--- a/metadata/md5-cache/dev-ml/fieldslib-0.16.0
+++ b/metadata/md5-cache/dev-ml/fieldslib-0.16.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/janestreet/fieldslib
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/base:0/0.16 dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/fieldslib/archive/v0.16.0.tar.gz -> fieldslib-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=e2a191d2f229fc2dfbed4ec5df027bb8
+_md5_=6e64563aa9804876014110a06c766328
diff --git a/metadata/md5-cache/dev-ml/int_repr-0.16.0 b/metadata/md5-cache/dev-ml/int_repr-0.16.0
index 79ff093a1a16..171de528cd24 100644
--- a/metadata/md5-cache/dev-ml/int_repr-0.16.0
+++ b/metadata/md5-cache/dev-ml/int_repr-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/int_repr
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/ppx_jane:0/0.16 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/int_repr/archive/refs/tags/v0.16.0.tar.gz -> int_repr-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=ddec2ba97143884559d4edbebb335e5d
+_md5_=b0d705c2ff502ad3b250eaeaf719c845
diff --git a/metadata/md5-cache/dev-ml/jane-street-headers-0.16.0 b/metadata/md5-cache/dev-ml/jane-street-headers-0.16.0
index 4b15d039d74b..33a7a231b092 100644
--- a/metadata/md5-cache/dev-ml/jane-street-headers-0.16.0
+++ b/metadata/md5-cache/dev-ml/jane-street-headers-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/jane-street-headers
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/jane-street-headers/archive/v0.16.0.tar.gz -> jane-street-headers-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=3d606a5ecedacec894ac9af92630229e
+_md5_=f3485a4fd88a35e4a0645c48e24e994f
diff --git a/metadata/md5-cache/dev-ml/jst-config-0.16.0 b/metadata/md5-cache/dev-ml/jst-config-0.16.0
index 0ef0839451db..28308215ee69 100644
--- a/metadata/md5-cache/dev-ml/jst-config-0.16.0
+++ b/metadata/md5-cache/dev-ml/jst-config-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/jst-config
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/base:= dev-ml/dune-configurator:= dev-ml/ppxlib:= dev-ml/ppx_assert:= dev-ml/ppx_compare:= dev-ml/ppx_here:= dev-ml/ppx_sexp_conv:= dev-ml/stdio:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/jst-config/archive/v0.16.0.tar.gz -> jst-config-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=9aa836d9b79d0a70aee3036d89248aca
+_md5_=56779385c02e5d9cbe05281c621029ef
diff --git a/metadata/md5-cache/dev-ml/parsexp-0.16.0 b/metadata/md5-cache/dev-ml/parsexp-0.16.0
index 31f2f27a75f3..cfae053a4c61 100644
--- a/metadata/md5-cache/dev-ml/parsexp-0.16.0
+++ b/metadata/md5-cache/dev-ml/parsexp-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/parsexp
 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/base:0/0.16 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/parsexp/archive/v0.16.0.tar.gz -> parsexp-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=99d8521c9ac0c6b4403b5ecd188c36da
+_md5_=c154e950db8aef429f39f38baba4f8f2
diff --git a/metadata/md5-cache/dev-ml/ppx_assert-0.14.0 b/metadata/md5-cache/dev-ml/ppx_assert-0.14.0
deleted file mode 100644
index 4c15c55e2597..000000000000
--- a/metadata/md5-cache/dev-ml/ppx_assert-0.14.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_cold-0.14.0:= >=dev-ml/ppx_compare-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.1:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Assert-like extension nodes that raise useful errors on failure
-EAPI=7
-HOMEPAGE=https://github.com/janestreet/ppx_assert
-INHERIT=dune
-IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_cold-0.14.0:= >=dev-ml/ppx_compare-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.1:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-SLOT=0/0.14.0
-SRC_URI=https://github.com/janestreet/ppx_assert/archive/v0.14.0.tar.gz -> ppx_assert-0.14.0.tar.gz
-_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=2527b2f4ec9e791ef78674b4c85df71b
diff --git a/metadata/md5-cache/dev-ml/ppx_assert-0.14.0-r1 b/metadata/md5-cache/dev-ml/ppx_assert-0.14.0-r1
new file mode 100644
index 000000000000..a50be098e4bc
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_assert-0.14.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=<dev-ml/base-0.15:= dev-ml/findlib:= dev-ml/ppx_cold:0/0.14.0 dev-ml/ppx_compare:0/0.14.0 dev-ml/ppx_here:0/0.14.0 <dev-ml/ppx_sexp_conv-0.15:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Assert-like extension nodes that raise useful errors on failure
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_assert
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
+LICENSE=Apache-2.0
+RDEPEND=<dev-ml/base-0.15:= dev-ml/findlib:= dev-ml/ppx_cold:0/0.14.0 dev-ml/ppx_compare:0/0.14.0 dev-ml/ppx_here:0/0.14.0 <dev-ml/ppx_sexp_conv-0.15:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/ppx_assert/archive/v0.14.0.tar.gz -> ppx_assert-0.14.0.tar.gz
+_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
+_md5_=2b931e7d2b80e6dfccb0e5d5cd83d628
diff --git a/metadata/md5-cache/dev-ml/ppx_assert-0.16.0 b/metadata/md5-cache/dev-ml/ppx_assert-0.16.0
index 344ad72f8d2a..8d152142baa3 100644
--- a/metadata/md5-cache/dev-ml/ppx_assert-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_assert-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_assert
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 >=dev-ml/ppxlib-0.28:= dev-ml/ppx_cold:0/0.16 dev-ml/ppx_compare:0/0.16 dev-ml/ppx_here:0/0.16 dev-ml/ppx_sexp_conv:0/0.16 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_assert/archive/v0.16.0.tar.gz -> ppx_assert-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=3b83abeb0caaca36651e564dd107b3c2
+_md5_=902a00d79fb0c018cd0b0ca6415d8ffc
diff --git a/metadata/md5-cache/dev-ml/ppx_base-0.16.0-r1 b/metadata/md5-cache/dev-ml/ppx_base-0.16.0-r1
index eb08cdb9e9fb..fb7097629fd3 100644
--- a/metadata/md5-cache/dev-ml/ppx_base-0.16.0-r1
+++ b/metadata/md5-cache/dev-ml/ppx_base-0.16.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_base
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/ppx_cold:0/0.16 dev-ml/ppx_globalize:0/0.16 dev-ml/ppx_enumerate:0/0.16 dev-ml/ppx_hash:0/0.16 dev-ml/ppx_sexp_conv:0/0.16 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_base/archive/v0.16.0.tar.gz -> ppx_base-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=2fe5dfb3d5363467e083ee9a82301153
+_md5_=acb62488601719cf12bd18d4a70b07d6
diff --git a/metadata/md5-cache/dev-ml/ppx_bench-0.16.0 b/metadata/md5-cache/dev-ml/ppx_bench-0.16.0
index 46987fa89d41..6066a7c4bfa5 100644
--- a/metadata/md5-cache/dev-ml/ppx_bench-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_bench-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_bench
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/ppx_inline_test:0/0.16 >=dev-ml/ppxlib-0.28.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_bench/archive/v0.16.0.tar.gz -> ppx_bench-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=b2a214ec19c0d7a53162b0186a1c2d6a
+_md5_=b59b6387a1e16c1f06f99156b429a428
diff --git a/metadata/md5-cache/dev-ml/ppx_bin_prot-0.16.0 b/metadata/md5-cache/dev-ml/ppx_bin_prot-0.16.0
index d3ffe05158c0..f05d9e732f53 100644
--- a/metadata/md5-cache/dev-ml/ppx_bin_prot-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_bin_prot-0.16.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_bin_prot
 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-lang/ocaml-4.14 dev-ml/bin_prot:0/0.16 dev-ml/ppx_here:0/0.16 >=dev-ml/ppxlib-0.28.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_bin_prot/archive/v0.16.0.tar.gz -> ppx_bin_prot-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=d05a4032ffc12408b097d0a795b4b4c9
+_md5_=bca2e8f3e9a4a6f79b859f728f7c5c63
diff --git a/metadata/md5-cache/dev-ml/ppx_cold-0.16.0 b/metadata/md5-cache/dev-ml/ppx_cold-0.16.0
index effb9ee95e18..ef6f4e7a6c0d 100644
--- a/metadata/md5-cache/dev-ml/ppx_cold-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_cold-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_cold
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/base:0/0.16 dev-ml/findlib:= >=dev-ml/ppxlib-0.28.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_cold/archive/v0.16.0.tar.gz -> ppx_cold-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=eebb5dcfe880427142db1ac4051063f7
+_md5_=51ce2023a5db086d0eb98c116ef3ac48
diff --git a/metadata/md5-cache/dev-ml/ppx_compare-0.16.0 b/metadata/md5-cache/dev-ml/ppx_compare-0.16.0
index 6c5fe6c49bfb..f9b9569314a9 100644
--- a/metadata/md5-cache/dev-ml/ppx_compare-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_compare-0.16.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_compare
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/base:0/0.16 dev-ml/findlib:= >=dev-ml/ppxlib-0.28.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_compare/archive/v0.16.0.tar.gz -> ppx_compare-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=39cc7f4a9d84532d2c9496de8aa7bb65
+_md5_=6a4a3117fb16af4f62bd901c753216ed
diff --git a/metadata/md5-cache/dev-ml/ppx_custom_printf-0.16.0 b/metadata/md5-cache/dev-ml/ppx_custom_printf-0.16.0
index 059796819b68..b4a201eb1985 100644
--- a/metadata/md5-cache/dev-ml/ppx_custom_printf-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_custom_printf-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_custom_printf
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/ppx_sexp_conv:0/0.16 >=dev-ml/ppxlib-0.28.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_custom_printf/archive/v0.16.0.tar.gz -> ppx_custom_printf-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=7be0fd95f66102c2af0c742c2a211be2
+_md5_=a9aca4de6c75482cb7c79b66e5e296c9
diff --git a/metadata/md5-cache/dev-ml/ppx_disable_unused_warnings-0.16.0 b/metadata/md5-cache/dev-ml/ppx_disable_unused_warnings-0.16.0
index 768272e966bd..c358b5f0b474 100644
--- a/metadata/md5-cache/dev-ml/ppx_disable_unused_warnings-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_disable_unused_warnings-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_disable_unused_warnings
 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/base:0/0.16 >=dev-ml/ppxlib-0.28.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_disable_unused_warnings/archive/refs/tags/v0.16.0.tar.gz -> ppx_disable_unused_warnings-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=8118cd8d209ba57a85c687d2d9c9289a
+_md5_=c328030bfeea41ee871f6451390619a5
diff --git a/metadata/md5-cache/dev-ml/ppx_enumerate-0.16.0 b/metadata/md5-cache/dev-ml/ppx_enumerate-0.16.0
index e6770d58bfd8..05b6503dc6a0 100644
--- a/metadata/md5-cache/dev-ml/ppx_enumerate-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_enumerate-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_enumerate
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/base:0/0.16 dev-ml/findlib:= >=dev-ml/ppxlib-0.28.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_enumerate/archive/v0.16.0.tar.gz -> ppx_enumerate-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=dc2024bca7dffdfb421242ef1ca7e1bb
+_md5_=ddea9ef5b043412d5bbe59c80d7b6c19
diff --git a/metadata/md5-cache/dev-ml/ppx_expect-0.16.0 b/metadata/md5-cache/dev-ml/ppx_expect-0.16.0
index e94c6def1828..91d5e3c27d3d 100644
--- a/metadata/md5-cache/dev-ml/ppx_expect-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_expect-0.16.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_expect
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/ppxlib-0.28.0:= >=dev-ml/re-1.8.0:= dev-ml/base:0/0.16 dev-ml/ppx_here:0/0.16 dev-ml/ppx_inline_test:0/0.16 dev-ml/stdio:0/0.16 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_expect/archive/v0.16.0.tar.gz -> ppx_expect-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=5317b516bf3b7961de6bb7bf24f0ad81
+_md5_=9e1ac558632e693f93ec18367474a1d3
diff --git a/metadata/md5-cache/dev-ml/ppx_fields_conv-0.16.0 b/metadata/md5-cache/dev-ml/ppx_fields_conv-0.16.0
index 887b9f12e9c1..47a9cc42ecc9 100644
--- a/metadata/md5-cache/dev-ml/ppx_fields_conv-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_fields_conv-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_fields_conv
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/base:0/0.16 dev-ml/fieldslib:0/0.16 >=dev-ml/ppxlib-0.28.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_fields_conv/archive/v0.16.0.tar.gz -> ppx_fields_conv-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=e91eeb0e8371d5ac158692b5734e2906
+_md5_=dfc7e2c25d25d28daa0484747343916c
diff --git a/metadata/md5-cache/dev-ml/ppx_fixed_literal-0.16.0 b/metadata/md5-cache/dev-ml/ppx_fixed_literal-0.16.0
index e87755feab65..09dcd04cdaf6 100644
--- a/metadata/md5-cache/dev-ml/ppx_fixed_literal-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_fixed_literal-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_fixed_literal
 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/base:0/0.16 dev-ml/findlib:= >=dev-ml/ppxlib-0.28.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_fixed_literal/archive/v0.16.0.tar.gz -> ppx_fixed_literal-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=8c44d7dc29e7ff39d0c81aa77cc3505b
+_md5_=52493e506b54bd77349b9de2762cd1f8
diff --git a/metadata/md5-cache/dev-ml/ppx_globalize-0.16.0 b/metadata/md5-cache/dev-ml/ppx_globalize-0.16.0
index 97f414364edf..e37c36c407bb 100644
--- a/metadata/md5-cache/dev-ml/ppx_globalize-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_globalize-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_globalize
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/base:0/0.16 >=dev-ml/ppxlib-0.28:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_globalize/archive/v0.16.0.tar.gz -> ppx_globalize-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=111cc69fa9ca72a8fb4eb2e5ba00d092
+_md5_=a8dcb4e0841c385cf56f84f07dce54bd
diff --git a/metadata/md5-cache/dev-ml/ppx_hash-0.16.0 b/metadata/md5-cache/dev-ml/ppx_hash-0.16.0
index 440874303f72..198d0e0f7c8a 100644
--- a/metadata/md5-cache/dev-ml/ppx_hash-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_hash-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_hash
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_sexp_conv:0/0.16 dev-ml/ppx_compare:0/0.16 >=dev-ml/ppxlib-0.28:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_hash/archive/v0.16.0.tar.gz -> ppx_hash-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=d70b8949caa0a4c63054051a988d4c8f
+_md5_=afa2ab1deb5b8f5b8f251abe21c060e0
diff --git a/metadata/md5-cache/dev-ml/ppx_here-0.16.0 b/metadata/md5-cache/dev-ml/ppx_here-0.16.0
index 1866bf9fb397..13ec77c5b110 100644
--- a/metadata/md5-cache/dev-ml/ppx_here-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_here-0.16.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_here
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/base:0/0.16 dev-ml/findlib:= >=dev-ml/ppxlib-0.28.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_here/archive/v0.16.0.tar.gz -> ppx_here-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=3688287ac966765f187fd03e078f9fb1
+_md5_=716d68c8773307b1aff6186725e32c6f
diff --git a/metadata/md5-cache/dev-ml/ppx_ignore_instrumentation-0.16.0 b/metadata/md5-cache/dev-ml/ppx_ignore_instrumentation-0.16.0
index 828c81f7f0d6..0156af684f6b 100644
--- a/metadata/md5-cache/dev-ml/ppx_ignore_instrumentation-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_ignore_instrumentation-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_ignore_instrumentation
 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/ppxlib-0.28.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_ignore_instrumentation/archive/refs/tags/v0.16.0.tar.gz -> ppx_ignore_instrumentation-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=77d03801a4ee5733642fe55be9b52217
+_md5_=f35c0dc7c52ee9faa5d06305ef3742c1
diff --git a/metadata/md5-cache/dev-ml/ppx_inline_test-0.16.0 b/metadata/md5-cache/dev-ml/ppx_inline_test-0.16.0
index c640308b5f11..9c86668d7383 100644
--- a/metadata/md5-cache/dev-ml/ppx_inline_test-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_inline_test-0.16.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_inline_test
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/base:0/0.16 >=dev-ml/ppxlib-0.28.0:= dev-ml/time_now:0/0.16 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_inline_test/archive/v0.16.0.tar.gz -> ppx_inline_test-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=9bf8bebcf41fa550a39664f621cab9c9
+_md5_=997b2b34fdfba9ffb45774c1cee864d4
diff --git a/metadata/md5-cache/dev-ml/ppx_jane-0.14.0 b/metadata/md5-cache/dev-ml/ppx_jane-0.14.0
deleted file mode 100644
index a9d38c8620bc..000000000000
--- a/metadata/md5-cache/dev-ml/ppx_jane-0.14.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/base_quickcheck-0.14.0:= >=dev-ml/ppx_assert-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_bench-0.14.1:= >=dev-ml/ppx_bin_prot-0.14.0:= >=dev-ml/ppx_custom_printf-0.14.0:= >=dev-ml/ppx_expect-0.14.0:= >=dev-ml/ppx_fail-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_fixed_literal-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_inline_test-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_module_timer-0.14.0:= >=dev-ml/ppx_optcomp-0.14.0:= >=dev-ml/ppx_optional-0.14.0:= >=dev-ml/ppx_pipebang-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= >=dev-ml/ppx_stable-0.14.1:= >=dev-ml/ppx_string-0.14.1:= >=dev-ml/ppx_typerep_conv-0.14.1:= >=dev-ml/ppx_variants_conv-0.14.1:= >=dev-ml/ppxlib-0.18.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Standard Jane Street ppx rewriters
-EAPI=7
-HOMEPAGE=https://github.com/janestreet/ppx_jane
-INHERIT=dune
-IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/base_quickcheck-0.14.0:= >=dev-ml/ppx_assert-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_bench-0.14.1:= >=dev-ml/ppx_bin_prot-0.14.0:= >=dev-ml/ppx_custom_printf-0.14.0:= >=dev-ml/ppx_expect-0.14.0:= >=dev-ml/ppx_fail-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_fixed_literal-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_inline_test-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_module_timer-0.14.0:= >=dev-ml/ppx_optcomp-0.14.0:= >=dev-ml/ppx_optional-0.14.0:= >=dev-ml/ppx_pipebang-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= >=dev-ml/ppx_stable-0.14.1:= >=dev-ml/ppx_string-0.14.1:= >=dev-ml/ppx_typerep_conv-0.14.1:= >=dev-ml/ppx_variants_conv-0.14.1:= >=dev-ml/ppxlib-0.18.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-SLOT=0/0.14.0
-SRC_URI=https://github.com/janestreet/ppx_jane/archive/v0.14.0.tar.gz -> ppx_jane-0.14.0.tar.gz
-_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=1b5b7af2441c5a0fa1e692d8583b0765
diff --git a/metadata/md5-cache/dev-ml/ppx_jane-0.14.0-r1 b/metadata/md5-cache/dev-ml/ppx_jane-0.14.0-r1
new file mode 100644
index 000000000000..0a6f8b744409
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_jane-0.14.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=<dev-ml/base_quickcheck-0.15.0:= dev-ml/ppx_assert:0/0.14.0 dev-ml/ppx_base:0/0.14.0 dev-ml/ppx_bench:0/0.14.1 dev-ml/ppx_bin_prot:0/0.14.0 <dev-ml/ppx_custom_printf-0.15:= <dev-ml/ppx_expect-0.15:= dev-ml/ppx_fail:= <dev-ml/ppx_fields_conv-0.15:= dev-ml/ppx_fixed_literal:0/0.14.0 dev-ml/ppx_here:0/0.14.0 dev-ml/ppx_inline_test:0/0.14.1 dev-ml/ppx_let:0/0.14.0 dev-ml/ppx_module_timer:0/0.14.0 <dev-ml/ppx_optcomp-0.15:= dev-ml/ppx_optional:0/0.14.0 dev-ml/ppx_pipebang:0/0.14.0 <dev-ml/ppx_sexp_message-0.15:= dev-ml/ppx_sexp_value:0/0.14.0 dev-ml/ppx_stable:0/0.14.1 dev-ml/ppx_string:0/0.14.1 <dev-ml/ppx_typerep_conv-0.15:= <dev-ml/ppx_variants_conv-0.15:= dev-ml/ppxlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Standard Jane Street ppx rewriters
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_jane
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
+LICENSE=Apache-2.0
+RDEPEND=<dev-ml/base_quickcheck-0.15.0:= dev-ml/ppx_assert:0/0.14.0 dev-ml/ppx_base:0/0.14.0 dev-ml/ppx_bench:0/0.14.1 dev-ml/ppx_bin_prot:0/0.14.0 <dev-ml/ppx_custom_printf-0.15:= <dev-ml/ppx_expect-0.15:= dev-ml/ppx_fail:= <dev-ml/ppx_fields_conv-0.15:= dev-ml/ppx_fixed_literal:0/0.14.0 dev-ml/ppx_here:0/0.14.0 dev-ml/ppx_inline_test:0/0.14.1 dev-ml/ppx_let:0/0.14.0 dev-ml/ppx_module_timer:0/0.14.0 <dev-ml/ppx_optcomp-0.15:= dev-ml/ppx_optional:0/0.14.0 dev-ml/ppx_pipebang:0/0.14.0 <dev-ml/ppx_sexp_message-0.15:= dev-ml/ppx_sexp_value:0/0.14.0 dev-ml/ppx_stable:0/0.14.1 dev-ml/ppx_string:0/0.14.1 <dev-ml/ppx_typerep_conv-0.15:= <dev-ml/ppx_variants_conv-0.15:= dev-ml/ppxlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/ppx_jane/archive/v0.14.0.tar.gz -> ppx_jane-0.14.0.tar.gz
+_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
+_md5_=9180c9b56c189ce6f3339c1a522416cd
diff --git a/metadata/md5-cache/dev-ml/ppx_jane-0.16.0-r1 b/metadata/md5-cache/dev-ml/ppx_jane-0.16.0-r1
index f8d799ee0a4b..128e2dd24db4 100644
--- a/metadata/md5-cache/dev-ml/ppx_jane-0.16.0-r1
+++ b/metadata/md5-cache/dev-ml/ppx_jane-0.16.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_jane
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/base_quickcheck:0/0.16 dev-ml/ppx_assert:0/0.16 dev-ml/ppx_base:0/0.16 dev-ml/ppx_bench:0/0.16 dev-ml/ppx_bin_prot:0/0.16 dev-ml/ppx_compare:= dev-ml/ppx_disable_unused_warnings:0/0.16 dev-ml/ppx_expect:0/0.16 dev-ml/ppx_fields_conv:0/0.16 dev-ml/ppx_fixed_literal:0/0.16 dev-ml/ppx_ignore_instrumentation:0/0.16 dev-ml/ppx_inline_test:0/0.16 dev-ml/ppx_log:0/0.16 dev-ml/ppx_module_timer:0/0.16 dev-ml/ppx_optional:0/0.16 dev-ml/ppx_pipebang:0/0.16 dev-ml/ppx_stable:0/0.16 dev-ml/ppx_string:0/0.16 dev-ml/ppx_tydi:0/0.16 dev-ml/ppx_typerep_conv:0/0.16 >=dev-ml/ppxlib-0.28.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_jane/archive/v0.16.0.tar.gz -> ppx_jane-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=cdf2dc64da788baee3e35d9822aa4c23
+_md5_=d83ac1fcb83104417d159b473374e45a
diff --git a/metadata/md5-cache/dev-ml/ppx_let-0.16.0 b/metadata/md5-cache/dev-ml/ppx_let-0.16.0
index fdbbf89ed985..6f1e55055c24 100644
--- a/metadata/md5-cache/dev-ml/ppx_let-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_let-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_let
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:0/0.16 dev-ml/findlib:= >=dev-ml/ppxlib-0.28.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= dev-ml/ppx_here:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_let/archive/v0.16.0.tar.gz -> ppx_let-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=e85b034e1e4d3515480e493e2d96aef6
+_md5_=d1992e8ebbada376a4675c0210d4a770
diff --git a/metadata/md5-cache/dev-ml/ppx_log-0.16.0 b/metadata/md5-cache/dev-ml/ppx_log-0.16.0
index 27894327d6f4..d8838534b853 100644
--- a/metadata/md5-cache/dev-ml/ppx_log-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_log-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_log
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/base:0/0.16 dev-ml/ppx_sexp_message:0/0.16 dev-ml/sexplib:0/0.16 >=dev-ml/ppxlib-0.28.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_log/archive/refs/tags/v0.16.0.tar.gz -> ppx_log-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=519cc2a08d1853440f9cbe00eebc02c9
+_md5_=e09bbff0735c41751c3b51c33bdf36c9
diff --git a/metadata/md5-cache/dev-ml/ppx_module_timer-0.16.0 b/metadata/md5-cache/dev-ml/ppx_module_timer-0.16.0
index a9b4b15269de..5320c671f358 100644
--- a/metadata/md5-cache/dev-ml/ppx_module_timer-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_module_timer-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_module_timer
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/time_now:0/0.16 >=dev-ml/ppxlib-0.28.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_module_timer/archive/v0.16.0.tar.gz -> ppx_module_timer-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=f4dcf4e575ea544da26885ff07111596
+_md5_=155937087accd34c987f73be13e73046
diff --git a/metadata/md5-cache/dev-ml/ppx_optcomp-0.16.0 b/metadata/md5-cache/dev-ml/ppx_optcomp-0.16.0
index cb99158aade9..7da4b6ba5ccb 100644
--- a/metadata/md5-cache/dev-ml/ppx_optcomp-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_optcomp-0.16.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_optcomp
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:0/0.16 dev-ml/findlib:= dev-ml/stdio:0/0.16 >=dev-ml/ppxlib-0.28.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_optcomp/archive/v0.16.0.tar.gz -> ppx_optcomp-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=e3e9169d00f5d6a53683da35f7614e64
+_md5_=de831917a5a7a363b3f8d5d8d5345361
diff --git a/metadata/md5-cache/dev-ml/ppx_optional-0.16.0 b/metadata/md5-cache/dev-ml/ppx_optional-0.16.0
index 17dc1cc91248..e45e069b4189 100644
--- a/metadata/md5-cache/dev-ml/ppx_optional-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_optional-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_optional
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/base:0/0.16 >=dev-ml/ppxlib-0.28.0:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_optional/archive/v0.16.0.tar.gz -> ppx_optional-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=77ebc493d15eaf73716e07ffd6575141
+_md5_=8c2222dc9c117824f25aae2073e0c462
diff --git a/metadata/md5-cache/dev-ml/ppx_pipebang-0.16.0 b/metadata/md5-cache/dev-ml/ppx_pipebang-0.16.0
index 247719d0293a..603a7990034e 100644
--- a/metadata/md5-cache/dev-ml/ppx_pipebang-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_pipebang-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_pipebang
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 >=dev-ml/ppxlib-0.28.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_pipebang/archive/v0.16.0.tar.gz -> ppx_pipebang-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=64ffa81a632adf904b9e36ebb82426ee
+_md5_=3568ac9b5814862ed131af727f044b93
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.16.0-r1 b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.16.0-r1
index 1616a3fad634..eb5252569fdf 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.16.0-r1
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.16.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_sexp_conv
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/base:0/0.16[ocamlopt?] dev-ml/findlib:=[ocamlopt?] >=dev-ml/ppxlib-0.28:=[ocamlopt?] dev-ml/ocaml-compiler-libs:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_sexp_conv/archive/v0.16.0.tar.gz -> ppx_sexp_conv-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=97c3782ab35895d70c9d0e62d8b44df7
+_md5_=97b528a3da48111ebdb30772619be784
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_message-0.16.0 b/metadata/md5-cache/dev-ml/ppx_sexp_message-0.16.0
index 1f4c1bb72c57..ed06b2085d3a 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_message-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_message-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_sexp_message
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/ppx_here:0/0.16 dev-ml/ppx_sexp_conv:0/0.16 >=dev-ml/ppxlib-0.28.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_sexp_message/archive/v0.16.0.tar.gz -> ppx_sexp_message-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=50feae13afa3ba5a6c61bc77f95d439e
+_md5_=9d601e7ebbf3e1d9c52347ac2f8d2faf
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_value-0.16.0 b/metadata/md5-cache/dev-ml/ppx_sexp_value-0.16.0
index b514e0fc3c90..04cf7e89f058 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_value-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_value-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_sexp_value
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/ppx_here:0/0.16 dev-ml/ppx_sexp_conv:0/0.16 >=dev-ml/ppxlib-0.28.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_sexp_value/archive/v0.16.0.tar.gz -> ppx_sexp_value-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=c263ab928cb72a0e4c722b7da9e29346
+_md5_=1be77eb9d11350f4d0c45aa94da4f365
diff --git a/metadata/md5-cache/dev-ml/ppx_stable-0.16.0 b/metadata/md5-cache/dev-ml/ppx_stable-0.16.0
index daf4bb1e9fed..2b7663104607 100644
--- a/metadata/md5-cache/dev-ml/ppx_stable-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_stable-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_stable
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/base:0/0.16 >=dev-ml/ppxlib-0.28.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_stable/archive/v0.16.0.tar.gz -> ppx_stable-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=e6b53179d7999c7a0f1bce8b7838d967
+_md5_=0ef7edaa437c3346c7f8a30da255f8c6
diff --git a/metadata/md5-cache/dev-ml/ppx_stable_witness-0.16.0 b/metadata/md5-cache/dev-ml/ppx_stable_witness-0.16.0
index e747a7986754..313736140726 100644
--- a/metadata/md5-cache/dev-ml/ppx_stable_witness-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_stable_witness-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_stable_witness
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/base:0/0.16 >=dev-ml/ppxlib-0.28:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_stable_witness/archive/v0.16.0.tar.gz -> ppx_stable_witness-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=552adf5fdc95f63e131d23c55bd3c03d
+_md5_=2b2897b1a54d8917ea3154fb8c3a636d
diff --git a/metadata/md5-cache/dev-ml/ppx_string-0.16.0 b/metadata/md5-cache/dev-ml/ppx_string-0.16.0
index b4d8c62e9098..9218e3eee7d7 100644
--- a/metadata/md5-cache/dev-ml/ppx_string-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_string-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_string
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/ppx_base:0/0.16 dev-ml/stdio:0/0.16 >=dev-ml/ppxlib-0.28.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_string/archive/v0.16.0.tar.gz -> ppx_string-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=9e269a3ecff6903e22be298e0a7cda06
+_md5_=6138c4ca7119924c0b54f29784632879
diff --git a/metadata/md5-cache/dev-ml/ppx_tydi-0.16.0 b/metadata/md5-cache/dev-ml/ppx_tydi-0.16.0
index 32f8cf2e41e6..1113a9178ad4 100644
--- a/metadata/md5-cache/dev-ml/ppx_tydi-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_tydi-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_tydi
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/base:0/0.16 >=dev-ml/ppxlib-0.28:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_tydi/archive/v0.16.0.tar.gz -> ppx_tydi-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=1ee1e582cb2ddd1667da73ee53224c9b
+_md5_=9cdbb03fbf4dfbc536a412b8d505237a
diff --git a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.16.0 b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.16.0
index 892a23112cc7..6ac5a87f23ae 100644
--- a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_typerep_conv
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/typerep:0/0.16 >=dev-ml/ppxlib-0.28.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_typerep_conv/archive/v0.16.0.tar.gz -> ppx_typerep_conv-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=44bc76f3b3d684f3e9f57a312e2d1e5d
+_md5_=f65dbdbb8ca57ab4d5dc87f73c47dead
diff --git a/metadata/md5-cache/dev-ml/ppx_variants_conv-0.16.0 b/metadata/md5-cache/dev-ml/ppx_variants_conv-0.16.0
index f444576e4bb7..8e5979116375 100644
--- a/metadata/md5-cache/dev-ml/ppx_variants_conv-0.16.0
+++ b/metadata/md5-cache/dev-ml/ppx_variants_conv-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_variants_conv
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/variantslib:0/0.16 >=dev-ml/ppxlib-0.28.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/ppx_variants_conv/archive/v0.16.0.tar.gz -> ppx_variants_conv-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=3e7b905bf9104df4c6e5ccbe72717dd0
+_md5_=9984b9f75bcad93a7f4f2ee86051c6ed
diff --git a/metadata/md5-cache/dev-ml/protocol_version_header-0.16.0 b/metadata/md5-cache/dev-ml/protocol_version_header-0.16.0
index 97b358430f6c..08049c939807 100644
--- a/metadata/md5-cache/dev-ml/protocol_version_header-0.16.0
+++ b/metadata/md5-cache/dev-ml/protocol_version_header-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/protocol_version_header
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/core:0/0.16 dev-ml/ppx_jane:0/0.16 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/protocol_version_header/archive/v0.16.0.tar.gz -> protocol_version_header-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=aae0a25d2fe5d01369d5dceb227a8b0c
+_md5_=b4c781675ac03566feb4307164744ae2
diff --git a/metadata/md5-cache/dev-ml/sexplib-0.16.0-r1 b/metadata/md5-cache/dev-ml/sexplib-0.16.0-r1
index bded93a0d971..ad5227e71e43 100644
--- a/metadata/md5-cache/dev-ml/sexplib-0.16.0-r1
+++ b/metadata/md5-cache/dev-ml/sexplib-0.16.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/sexplib
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND==dev-ml/sexplib0-0.16*:=[ocamlopt?] dev-ml/base:0/0.16[ocamlopt?] dev-ml/num:=[ocamlopt?] dev-ml/parsexp:0/0.16[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/sexplib/archive/v0.16.0.tar.gz -> sexplib-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=1278b0bb8fb5a9e1d2649e79ff68d42e
+_md5_=5f5190e2d883d5cdc8386ce729508ba8
diff --git a/metadata/md5-cache/dev-ml/sexplib0-0.16.0 b/metadata/md5-cache/dev-ml/sexplib0-0.16.0
index 333c0c03f3f1..8f21d00c2865 100644
--- a/metadata/md5-cache/dev-ml/sexplib0-0.16.0
+++ b/metadata/md5-cache/dev-ml/sexplib0-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/sexplib0
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16.0
 SRC_URI=https://github.com/janestreet/sexplib0/archive/v0.16.0.tar.gz -> sexplib0-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=4bfda9ef33d251b910f744e41815ce54
+_md5_=1fc9552dc16b393a32294e8cbe679de9
diff --git a/metadata/md5-cache/dev-ml/splittable_random-0.16.0 b/metadata/md5-cache/dev-ml/splittable_random-0.16.0
index 4e8a202668c8..52dd4eb309e9 100644
--- a/metadata/md5-cache/dev-ml/splittable_random-0.16.0
+++ b/metadata/md5-cache/dev-ml/splittable_random-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/splittable_random
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/ppx_assert:0/0.16 dev-ml/ppx_bench:0/0.16 dev-ml/ppx_compare:= dev-ml/ppx_here:= dev-ml/ppx_inline_test:0/0.16 dev-ml/ppx_sexp_message:0/0.16 dev-ml/ppx_sexp_conv:= dev-ml/ppxlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/splittable_random/archive/v0.16.0.tar.gz -> splittable_random-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=bdf0cc90dd8eae0d1a3e44940c8f4983
+_md5_=ba8720cccdec76bc67ae5f76b8f696a0
diff --git a/metadata/md5-cache/dev-ml/stdio-0.16.0 b/metadata/md5-cache/dev-ml/stdio-0.16.0
index 9b9285a108e4..8c2a1238b052 100644
--- a/metadata/md5-cache/dev-ml/stdio-0.16.0
+++ b/metadata/md5-cache/dev-ml/stdio-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/stdio
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/base:0/0.16 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/stdio/archive/v0.16.0.tar.gz -> stdio-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=cdecc4a7ea69defa04796e9c22ae4fbb
+_md5_=d1fbe87992736f941bf0ba9818479b73
diff --git a/metadata/md5-cache/dev-ml/time_now-0.16.0 b/metadata/md5-cache/dev-ml/time_now-0.16.0
index eb407d409b7e..6cbe2c03cbab 100644
--- a/metadata/md5-cache/dev-ml/time_now-0.16.0
+++ b/metadata/md5-cache/dev-ml/time_now-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/time_now
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/base:0/0.16 dev-ml/jane-street-headers:0/0.16 dev-ml/jst-config:0/0.16 dev-ml/ppx_base:0/0.16 dev-ml/ppx_enumerate:= dev-ml/ppx_hash:= dev-ml/ppx_optcomp:0/0.16 dev-ml/stdio:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/time_now/archive/v0.16.0.tar.gz -> time_now-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=111f066f7bcd6567f0f1147abaa384a9
+_md5_=f70dde28a6eaa3b7a03ea3c1535dcc7b
diff --git a/metadata/md5-cache/dev-ml/typerep-0.16.0 b/metadata/md5-cache/dev-ml/typerep-0.16.0
index 6d1f5a61535b..ef4afaab4827 100644
--- a/metadata/md5-cache/dev-ml/typerep-0.16.0
+++ b/metadata/md5-cache/dev-ml/typerep-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/typerep
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:0/0.16 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/typerep/archive/v0.16.0.tar.gz -> typerep-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=01e14532cc5f3968fa37afc3d20a4145
+_md5_=db5e9545a8fd77bbd2e100e3b5d2e83f
diff --git a/metadata/md5-cache/dev-ml/uunf-15.1.0 b/metadata/md5-cache/dev-ml/uunf-15.1.0-r1
index e75cc9a89255..c351816f6e70 100644
--- a/metadata/md5-cache/dev-ml/uunf-15.1.0
+++ b/metadata/md5-cache/dev-ml/uunf-15.1.0-r1
@@ -1,14 +1,14 @@
 BDEPEND=dev-ml/findlib dev-ml/opam-installer dev-lang/ocaml
 DEFINED_PHASES=compile install
-DEPEND=dev-ml/topkg:= dev-ml/uutf:= dev-ml/cmdliner:= >=dev-lang/ocaml-4:=
+DEPEND=dev-ml/cmdliner:= dev-ml/topkg:= dev-ml/uchar:= dev-ml/uutf:= >=dev-lang/ocaml-4:=
 DESCRIPTION=Unicode text normalization
 EAPI=8
 HOMEPAGE=https://erratique.ch/software/uunf https://github.com/dbuenzli/uunf
 INHERIT=opam
 KEYWORDS=amd64 x86
 LICENSE=ISC
-RDEPEND=dev-ml/topkg:= dev-ml/uutf:= dev-ml/cmdliner:= >=dev-lang/ocaml-4:=
+RDEPEND=dev-ml/cmdliner:= dev-ml/topkg:= dev-ml/uchar:= dev-ml/uutf:= >=dev-lang/ocaml-4:=
 SLOT=0/15.1.0
 SRC_URI=https://erratique.ch/software/uunf/releases/uunf-15.1.0.tbz
 _eclasses_=opam	2d0e114062b346818f6d0fee5e0df656
-_md5_=a9e99b01dab1dc380283da294ef7f066
+_md5_=7c286752f7c4392ad4fb4d87077b2f49
diff --git a/metadata/md5-cache/dev-ml/variantslib-0.16.0 b/metadata/md5-cache/dev-ml/variantslib-0.16.0
index 00ebe8d83f75..c9c8f0c3b313 100644
--- a/metadata/md5-cache/dev-ml/variantslib-0.16.0
+++ b/metadata/md5-cache/dev-ml/variantslib-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/variantslib
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/base:0/0.16 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.16
 SRC_URI=https://github.com/janestreet/variantslib/archive/v0.16.0.tar.gz -> variantslib-0.16.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=cb0bd1450a08b198ce355a88183d112a
+_md5_=132789cc6d6ecca2a269cbe8b17287c7
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 11af9abf0282..982ec6b78d14 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/autobox-3.0.1-r2 b/metadata/md5-cache/dev-perl/autobox-3.0.1-r2
new file mode 100644
index 000000000000..3e6fccad4857
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/autobox-3.0.1-r2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-perl/Scope-Guard-0.210.0 >=virtual/perl-version-0.770.0 virtual/perl-ExtUtils-MakeMaker test? ( >=dev-perl/IPC-System-Simple-1.250.0 >=dev-perl/Test-Fatal-0.14.0 ) || ( >=dev-lang/perl-5.38.2-r3[perl_features_debug=,perl_features_ithreads=,perl_features_quadmath=] <dev-lang/perl-5.38.2-r3 ) test? ( >=virtual/perl-Test-Simple-1 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=|| ( >=dev-lang/perl-5.38.2-r3[perl_features_debug=,perl_features_ithreads=,perl_features_quadmath=] <dev-lang/perl-5.38.2-r3 )
+DESCRIPTION=Call methods on native types
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/autobox
+INHERIT=perl-module
+IUSE=perl_features_debug perl_features_ithreads perl_features_quadmath test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Scope-Guard-0.210.0 >=virtual/perl-version-0.770.0 || ( >=dev-lang/perl-5.38.2-r3[perl_features_debug=,perl_features_ithreads=,perl_features_quadmath=] <dev-lang/perl-5.38.2-r3 ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CH/CHOCOLATE/autobox-v3.0.1.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	07f7f317d867e5d5aa30fdeb6e873138	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=40371844d05e822ef12fe23a1f45887f
diff --git a/metadata/md5-cache/dev-perl/autovivification-0.180.0-r2 b/metadata/md5-cache/dev-perl/autovivification-0.180.0-r2
new file mode 100644
index 000000000000..4ea0f80829f2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/autovivification-0.180.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/perl-XSLoader virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Exporter virtual/perl-Test-Simple ) || ( >=dev-lang/perl-5.38.2-r3[perl_features_debug=,perl_features_ithreads=,perl_features_quadmath=] <dev-lang/perl-5.38.2-r3 ) test? ( >=virtual/perl-Test-Simple-1 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=|| ( >=dev-lang/perl-5.38.2-r3[perl_features_debug=,perl_features_ithreads=,perl_features_quadmath=] <dev-lang/perl-5.38.2-r3 )
+DESCRIPTION=Lexically disable autovivification
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/autovivification
+INHERIT=perl-module
+IUSE=perl_features_debug perl_features_ithreads perl_features_quadmath test examples
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-XSLoader || ( >=dev-lang/perl-5.38.2-r3[perl_features_debug=,perl_features_ithreads=,perl_features_quadmath=] <dev-lang/perl-5.38.2-r3 ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/V/VP/VPIT/autovivification-0.18.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	07f7f317d867e5d5aa30fdeb6e873138	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=9583cd3d056bdc0adff1c2e1fece9d5a
diff --git a/metadata/md5-cache/dev-perl/bareword-filehandles-0.7.0-r2 b/metadata/md5-cache/dev-perl/bareword-filehandles-0.7.0-r2
new file mode 100644
index 000000000000..3f69679f5fd7
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/bareword-filehandles-0.7.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=dev-perl/B-Hooks-OP-Check virtual/perl-if virtual/perl-XSLoader virtual/perl-ExtUtils-MakeMaker dev-perl/ExtUtils-Depends test? ( >=virtual/perl-Test-Simple-0.880.0 ) || ( >=dev-lang/perl-5.38.2-r3[perl_features_debug=,perl_features_ithreads=,perl_features_quadmath=] <dev-lang/perl-5.38.2-r3 ) test? ( >=virtual/perl-Test-Simple-1 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=|| ( >=dev-lang/perl-5.38.2-r3[perl_features_debug=,perl_features_ithreads=,perl_features_quadmath=] <dev-lang/perl-5.38.2-r3 )
+DESCRIPTION=Disables bareword filehandles
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/bareword-filehandles
+INHERIT=perl-module
+IUSE=perl_features_debug perl_features_ithreads perl_features_quadmath test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/B-Hooks-OP-Check virtual/perl-if virtual/perl-XSLoader || ( >=dev-lang/perl-5.38.2-r3[perl_features_debug=,perl_features_ithreads=,perl_features_quadmath=] <dev-lang/perl-5.38.2-r3 ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/bareword-filehandles-0.007.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	07f7f317d867e5d5aa30fdeb6e873138	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=e872bd717ea7ce990aeaf76c2537fe94
diff --git a/metadata/md5-cache/dev-perl/forks-0.360.0-r3 b/metadata/md5-cache/dev-perl/forks-0.360.0-r3
new file mode 100644
index 000000000000..85f3547af950
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/forks-0.360.0-r3
@@ -0,0 +1,16 @@
+BDEPEND=dev-perl/Acme-Damn virtual/perl-Attribute-Handlers dev-perl/Devel-Symdump virtual/perl-File-Spec >=virtual/perl-IO-1.180.0 >=dev-perl/List-MoreUtils-0.150.0 >=virtual/perl-Scalar-List-Utils-1.110.0 virtual/perl-Storable >=dev-perl/Sys-SigAction-0.110.0 virtual/perl-Time-HiRes virtual/perl-if virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) || ( >=dev-lang/perl-5.38.2-r3[perl_features_debug=,perl_features_ithreads=,perl_features_quadmath=] <dev-lang/perl-5.38.2-r3 ) test? ( >=virtual/perl-Test-Simple-1 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=|| ( >=dev-lang/perl-5.38.2-r3[perl_features_debug=,perl_features_ithreads=,perl_features_quadmath=] <dev-lang/perl-5.38.2-r3 )
+DESCRIPTION=Emulate threads with fork
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/forks
+INHERIT=perl-module
+IUSE=perl_features_debug perl_features_ithreads perl_features_quadmath test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Acme-Damn virtual/perl-Attribute-Handlers dev-perl/Devel-Symdump virtual/perl-File-Spec >=virtual/perl-IO-1.180.0 >=dev-perl/List-MoreUtils-0.150.0 >=virtual/perl-Scalar-List-Utils-1.110.0 virtual/perl-Storable >=dev-perl/Sys-SigAction-0.110.0 virtual/perl-Time-HiRes virtual/perl-if || ( >=dev-lang/perl-5.38.2-r3[perl_features_debug=,perl_features_ithreads=,perl_features_quadmath=] <dev-lang/perl-5.38.2-r3 ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RY/RYBSKEJ/forks-0.36.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	07f7f317d867e5d5aa30fdeb6e873138	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=f041127dcb3d00507847522e014bdd77
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index bca9cb7e88f4..7ddd0044b3e3 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/nagiosplugin-1.3.3 b/metadata/md5-cache/dev-python/nagiosplugin-1.3.3
index bc873795811e..d05925178420 100644
--- a/metadata/md5-cache/dev-python/nagiosplugin-1.3.3
+++ b/metadata/md5-cache/dev-python/nagiosplugin-1.3.3
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( dev-python/pypy3 >=dev-python/sphinx-7.2.6[python_targets_pypy3(-)] dev-python/sphinx-rtd-theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=test? ( >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) doc? ( || ( ( dev-lang/python:3.13 >=dev-python/sphinx-7.2.6[python_targets_python3_13(-)] dev-python/sphinx-rtd-theme[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( dev-python/pypy3 >=dev-python/sphinx-7.2.6[python_targets_pypy3(-)] dev-python/sphinx-rtd-theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A class library for writing nagios-compatible plugins
 EAPI=8
 HOMEPAGE=https://github.com/mpounsett/nagiosplugin/ https://nagiosplugin.readthedocs.io/ https://pypi.org/project/nagiosplugin/
 INHERIT=distutils-r1 pypi
-IUSE=test doc python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~x86
+IUSE=test doc python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=ZPL
-RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/n/nagiosplugin/nagiosplugin-1.3.3.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=043d6007b2df521f2ecde73f3b7bb05d
+_md5_=fab3f2cb4b13b5a6b583152bb5895102
diff --git a/metadata/md5-cache/dev-python/nose2-0.15.1 b/metadata/md5-cache/dev-python/nose2-0.15.1
new file mode 100644
index 000000000000..ea126ad84a5a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nose2-0.15.1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.13 >=dev-python/sphinx-7.2.6[python_targets_python3_13(-)] dev-python/sphinx-rtd-theme[python_targets_python3_13(-)] dev-python/sphinx-issues[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] dev-python/sphinx-issues[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] dev-python/sphinx-issues[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] dev-python/sphinx-issues[python_targets_python3_10(-)] ) ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Unittest with plugins
+EAPI=8
+HOMEPAGE=https://github.com/nose-devs/nose2/ https://pypi.org/project/nose2/
+INHERIT=distutils-r1 pypi
+IUSE=doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-python/coverage-4.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/n/nose2/nose2-0.15.1.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=a8327a570eee4b87867a6bea94d3cabd
diff --git a/metadata/md5-cache/dev-python/patatt-0.6.3 b/metadata/md5-cache/dev-python/patatt-0.6.3
new file mode 100644
index 000000000000..0846ca8a42f7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/patatt-0.6.3
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A simple library to add cryptographic attestation to patches sent via email
+EAPI=8
+HOMEPAGE=https://pypi.org/project/patatt/
+INHERIT=distutils-r1 pypi
+IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-python/pynacl[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/patatt/patatt-0.6.3.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=ca4ab118362a976665469be5a9a6d95a
diff --git a/metadata/md5-cache/dev-python/poetry-1.8.3 b/metadata/md5-cache/dev-python/poetry-1.8.3
index e523bbd76cc0..b3ee892fe2e1 100644
--- a/metadata/md5-cache/dev-python/poetry-1.8.3
+++ b/metadata/md5-cache/dev-python/poetry-1.8.3
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/deepdiff-6.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpretty-1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-mock-3.9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-xdist-3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/poetry-core-1.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-plugin-export-1.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/build-1.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cachecontrol-0.14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cleo-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/crashtest-0.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dulwich-0.21.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fastjsonschema-2.18.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/installer-0.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/keyring-24.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-23.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pexpect-4.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pkginfo-1.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.26[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/shellingham-1.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomlkit-0.11.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trove-classifiers-2022.5.19[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.26.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20.23.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_python3_10(-)?] ) >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( >=dev-python/deepdiff-6.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/httpretty-1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-mock-3.9[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-xdist-3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/poetry-core-1.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/poetry-plugin-export-1.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/build-1.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cachecontrol-0.14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cleo-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/crashtest-0.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/dulwich-0.21.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/fastjsonschema-2.18.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/installer-0.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/keyring-24.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-23.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pexpect-4.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pkginfo-1.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/platformdirs-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.26[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-toolbelt-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/shellingham-1.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tomlkit-0.11.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/trove-classifiers-2022.5.19[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.26.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/virtualenv-20.23.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_python3_10(-)?] ) >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/poetry-core-1.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A frontend for poetry - a python dependency management and packaging tool
 EAPI=8
 HOMEPAGE=https://python-poetry.org/ https://github.com/python-poetry/poetry https://pypi.org/project/poetry/
 INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=>=dev-python/poetry-core-1.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-plugin-export-1.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/build-1.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cachecontrol-0.14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cleo-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/crashtest-0.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dulwich-0.21.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fastjsonschema-2.18.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/installer-0.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/keyring-24.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-23.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pexpect-4.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pkginfo-1.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.26[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/shellingham-1.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomlkit-0.11.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trove-classifiers-2022.5.19[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.26.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20.23.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=>=dev-python/poetry-core-1.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/poetry-plugin-export-1.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/build-1.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cachecontrol-0.14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cleo-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/crashtest-0.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/dulwich-0.21.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/fastjsonschema-2.18.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/installer-0.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/keyring-24.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-23.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pexpect-4.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pkginfo-1.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/platformdirs-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.26[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-toolbelt-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/shellingham-1.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tomlkit-0.11.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/trove-classifiers-2022.5.19[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.26.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/virtualenv-20.23.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/poetry/poetry-1.8.3.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=6571fbe3a21fd4c9d1e7884220281fc0
+_md5_=28e9fec5111f40bd21f7c3bb9200b807
diff --git a/metadata/md5-cache/dev-python/poetry-plugin-export-1.8.0 b/metadata/md5-cache/dev-python/poetry-plugin-export-1.8.0
index ac86ce2e3d3e..8231950dfdf0 100644
--- a/metadata/md5-cache/dev-python/poetry-plugin-export-1.8.0
+++ b/metadata/md5-cache/dev-python/poetry-plugin-export-1.8.0
@@ -1,17 +1,17 @@
-BDEPEND=test? ( >=dev-python/poetry-core-1.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( >=dev-python/poetry-core-1.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/poetry-core-1.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/poetry-1.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-mock-3.9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-xdist-3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DEPEND=test? ( >=dev-python/poetry-1.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-mock-3.9[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-xdist-3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] )
 DESCRIPTION=A plugin that allows the export of locked packages to various formats
 EAPI=8
 HOMEPAGE=https://python-poetry.org/ https://github.com/python-poetry/poetry-plugin-export https://pypi.org/project/poetry-plugin-export/
 INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=>=dev-python/poetry-core-1.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=>=dev-python/poetry-core-1.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/poetry-plugin-export/poetry_plugin_export-1.8.0.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=e3339a97f1693d22f1d718da4fe25b49
+_md5_=41199ded8d671dbfb49bd08ad7229490
diff --git a/metadata/md5-cache/dev-python/pyalsa-1.2.7-r2 b/metadata/md5-cache/dev-python/pyalsa-1.2.7-r2
new file mode 100644
index 000000000000..60824f54ab0a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyalsa-1.2.7-r2
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/alsa-lib python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+DESCRIPTION=Python bindings for ALSA library
+EAPI=8
+HOMEPAGE=https://alsa-project.org/wiki/Main_Page
+INHERIT=distutils-r1
+IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=media-libs/alsa-lib python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.alsa-project.org/files/pub/pyalsa/pyalsa-1.2.7.tar.bz2
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=6b851be482f7d0d03ddb13b2af2d62d5
diff --git a/metadata/md5-cache/dev-python/pyarrow-16.1.0 b/metadata/md5-cache/dev-python/pyarrow-16.1.0
index a353459ac08f..49016e568ebc 100644
--- a/metadata/md5-cache/dev-python/pyarrow-16.1.0
+++ b/metadata/md5-cache/dev-python/pyarrow-16.1.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://arrow.apache.org/ https://github.com/apache/arrow/ https://pypi.org/project/pyarrow/
 INHERIT=distutils-r1 multiprocessing
 IUSE=+parquet +snappy ssl test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~amd64 ~arm64 ~hppa ~loong ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~hppa ~loong ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=~dev-libs/apache-arrow-16.1.0[compute,dataset,json,parquet?,re2,snappy?,ssl?] >=dev-python/numpy-1.16.6:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/arrow/arrow-16.1.0/apache-arrow-16.1.0.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=cb1228241a380401d0a7a7a0b7aa0ca3
+_md5_=ff79875447f15d33a58260836b611440
diff --git a/metadata/md5-cache/dev-python/pycountry-22.3.5 b/metadata/md5-cache/dev-python/pycountry-22.3.5
deleted file mode 100644
index 6566d0500bf7..000000000000
--- a/metadata/md5-cache/dev-python/pycountry-22.3.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Database of countries, subdivisions, languages, currencies and script
-EAPI=8
-HOMEPAGE=https://github.com/flyingcircusio/pycountry/ https://pypi.org/project/pycountry/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/p/pycountry/pycountry-22.3.5.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=d744323632cd1fe09901cb62842826a5
diff --git a/metadata/md5-cache/dev-python/pycountry-23.12.11 b/metadata/md5-cache/dev-python/pycountry-23.12.11
index d1c0afeac6a0..1d828b934144 100644
--- a/metadata/md5-cache/dev-python/pycountry-23.12.11
+++ b/metadata/md5-cache/dev-python/pycountry-23.12.11
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pycountry/pycountry/ https://pypi.org/project/pycountry/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pycountry/pycountry-23.12.11.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=6abb43e2453d79356ba0982038d8bb30
+_md5_=7cdc3177341dcad3840cf920139bb496
diff --git a/metadata/md5-cache/dev-python/pycountry-24.6.1 b/metadata/md5-cache/dev-python/pycountry-24.6.1
new file mode 100644
index 000000000000..98bb94f1cfde
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pycountry-24.6.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/importlib-metadata[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/poetry-core-1.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Database of countries, subdivisions, languages, currencies and script
+EAPI=8
+HOMEPAGE=https://github.com/pycountry/pycountry/ https://pypi.org/project/pycountry/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pycountry/pycountry-24.6.1.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=92d3bfa4e48fac6feaf2f64c547d6159
diff --git a/metadata/md5-cache/dev-python/pygame-2.5.2-r3 b/metadata/md5-cache/dev-python/pygame-2.5.2-r3
new file mode 100644
index 000000000000..7d9d02c812de
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygame-2.5.2-r3
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( media-libs/fontconfig sys-apps/util-linux ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] media-libs/freetype media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/portmidi media-libs/sdl2-image media-libs/sdl2-mixer media-libs/sdl2-ttf X? ( media-libs/libsdl2[opengl?,threads(+),video,X] ) !X? ( media-libs/libsdl2[threads(+)] ) test? ( media-libs/sdl2-image[gif,jpeg,png,tiff,webp] media-libs/sdl2-mixer[mp3,vorbis,wav] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+DESCRIPTION=Python bindings for SDL multimedia library
+EAPI=8
+HOMEPAGE=https://www.pygame.org/ https://github.com/pygame/pygame/ https://pypi.org/project/pygame/
+INHERIT=distutils-r1
+IUSE=examples opengl test X python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-python/numpy[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] media-libs/freetype media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/portmidi media-libs/sdl2-image media-libs/sdl2-mixer media-libs/sdl2-ttf X? ( media-libs/libsdl2[opengl?,threads(+),video,X] ) !X? ( media-libs/libsdl2[threads(+)] ) media-libs/fontconfig python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pygame/pygame/archive/2.5.2.tar.gz -> pygame-2.5.2.gh.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=dec90dc1d37a57aa94de5ac34cb33f8a
diff --git a/metadata/md5-cache/dev-python/pypax-0.9.5-r2 b/metadata/md5-cache/dev-python/pypax-0.9.5-r2
index 8eedf2f2e64a..bb65300f50c4 100644
--- a/metadata/md5-cache/dev-python/pypax-0.9.5-r2
+++ b/metadata/md5-cache/dev-python/pypax-0.9.5-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~blueness/elfix/ https://wiki.gentoo.org/wiki/Project:Hardened/PaX_Quickstart
 INHERIT=distutils-r1
 IUSE=+ptpax +xtpax python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv sparc x86
 LICENSE=GPL-3
 RDEPEND=ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( ptpax xtpax ) || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/elfix/elfix-0.9.5.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=3bde39aa35d4a083c40b3c9b5afe79bb
+_md5_=815533361c89830aec5682d3772decd4
diff --git a/metadata/md5-cache/dev-python/pyscard-2.0.10 b/metadata/md5-cache/dev-python/pyscard-2.0.10
new file mode 100644
index 000000000000..c045b95f6b65
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyscard-2.0.10
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/swig test? ( sys-apps/pcsc-lite python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=sys-apps/pcsc-lite python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+DESCRIPTION=Smart card support in python
+EAPI=8
+HOMEPAGE=https://pyscard.sourceforge.io/ https://github.com/LudovicRousseau/pyscard/ https://pypi.org/project/pyscard/
+INHERIT=distutils-r1 optfeature
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=sys-apps/pcsc-lite python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://downloads.sourceforge.net/project/pyscard/pyscard/pyscard%202.0.10/pyscard-2.0.10.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=8f93fca5d1364bc3f03df1005d3ac5c3
diff --git a/metadata/md5-cache/dev-python/pyside6-6.7.1 b/metadata/md5-cache/dev-python/pyside6-6.7.1
index b35fd7f9fbaf..65a71972d84f 100644
--- a/metadata/md5-cache/dev-python/pyside6-6.7.1
+++ b/metadata/md5-cache/dev-python/pyside6-6.7.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wiki.qt.io/PySide6
 INHERIT=cmake llvm-r1 python-r1 virtualx
 IUSE=3d bluetooth charts +concurrent +dbus designer gles2-only +gui help location multimedia +network network-auth nfc positioning +opengl pdfium positioning +printsupport qml quick quick3d serialport scxml sensors spatialaudio speech +sql svg test +testlib webchannel webengine websockets +widgets +xml +llvm_slot_17 llvm_slot_15 llvm_slot_16 llvm_slot_18 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 test
-KEYWORDS=~amd64
+KEYWORDS=amd64 ~arm ~arm64
 LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 )
 RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) =dev-python/shiboken6-6.7.1*:6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?,llvm_slot_15(-)?,llvm_slot_16(-)?,llvm_slot_17(-)?,llvm_slot_18(-)?] =dev-qt/qtbase-6.7.1*:6[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?] 3d? ( =dev-qt/qt3d-6.7.1*:6[qml?,gles2-only=] ) bluetooth? ( =dev-qt/qtconnectivity-6.7.1*:6[bluetooth] ) charts? ( =dev-qt/qtcharts-6.7.1*:6 ) designer? ( =dev-qt/qttools-6.7.1*:6[designer] ) gui? ( =dev-qt/qtbase-6.7.1*:6[gui,jpeg(+)] x11-libs/libxkbcommon ) help? ( =dev-qt/qttools-6.7.1*:6[assistant] ) location? ( =dev-qt/qtlocation-6.7.1*:6 ) multimedia? ( =dev-qt/qtmultimedia-6.7.1*:6 ) network? ( =dev-qt/qtbase-6.7.1*:6[ssl] ) network-auth? ( =dev-qt/qtnetworkauth-6.7.1*:6 ) nfc? ( =dev-qt/qtconnectivity-6.7.1*:6[nfc] ) pdfium? ( =dev-qt/qtwebengine-6.7.1*:6[pdfium(-),widgets?] ) positioning? ( =dev-qt/qtpositioning-6.7.1*:6 ) printsupport? ( =dev-qt/qtbase-6.7.1*:6[gui,widgets] ) qml? ( =dev-qt/qtdeclarative-6.7.1*:6[widgets?] ) quick3d? ( =dev-qt/qtquick3d-6.7.1*:6 ) scxml? ( =dev-qt/qtscxml-6.7.1*:6 ) sensors? ( =dev-qt/qtsensors-6.7.1*:6[qml?] ) speech? ( =dev-qt/qtspeech-6.7.1*:6 ) serialport? ( =dev-qt/qtserialport-6.7.1*:6 ) svg? ( =dev-qt/qtsvg-6.7.1*:6 ) testlib? ( =dev-qt/qtbase-6.7.1*:6[gui] ) webchannel? ( =dev-qt/qtwebchannel-6.7.1*:6 ) webengine? ( || ( =dev-qt/qtwebengine-6.7.1*:6[alsa,widgets?] =dev-qt/qtwebengine-6.7.1*:6[pulseaudio,widgets?] ) ) websockets? ( =dev-qt/qtwebsockets-6.7.1*:6 ) !dev-python/pyside6:0
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 ) 3d? ( gui network ) charts? ( gui widgets ) designer? ( widgets ) gles2-only? ( gui ) gui? ( dbus opengl ) help? ( network sql widgets ) location? ( gui network positioning quick ) multimedia? ( gui network ) network-auth? ( network ) opengl? ( gui ) pdfium? ( gui ) printsupport? ( widgets ) qml? ( network ) quick? ( gui network opengl qml ) quick3d? ( gui network opengl qml quick ) spatialaudio? ( multimedia ) speech? ( multimedia ) sql? ( widgets ) svg? ( gui ) testlib? ( widgets ) webchannel? ( qml ) webengine? ( network gui printsupport quick webchannel ) websockets? ( network ) widgets? ( gui ) ^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 llvm_slot_18 )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-6.7.1-src/pyside-setup-everywhere-src-6.7.1.tar.xz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=87927d65dc7da916210aaa6ccd77264a
+_md5_=82738214aeda90ce8f6aebeb95199eb7
diff --git a/metadata/md5-cache/dev-python/pyside6-tools-6.7.1 b/metadata/md5-cache/dev-python/pyside6-tools-6.7.1
index a97be43cb53b..d758676b483c 100644
--- a/metadata/md5-cache/dev-python/pyside6-tools-6.7.1
+++ b/metadata/md5-cache/dev-python/pyside6-tools-6.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.qt.io/PySide6
 INHERIT=cmake llvm-r1 python-r1
 IUSE=+llvm_slot_17 llvm_slot_15 llvm_slot_16 llvm_slot_18 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64
+KEYWORDS=amd64 ~arm ~arm64
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) =dev-python/shiboken6-6.7.1*:6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?,llvm_slot_15(-)?,llvm_slot_16(-)?,llvm_slot_17(-)?,llvm_slot_18(-)?] =dev-python/pyside6-6.7.1*:6[quick,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?,llvm_slot_15(-)?,llvm_slot_16(-)?,llvm_slot_17(-)?,llvm_slot_18(-)?] !dev-python/pyside6-tools:0
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 ) ^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 llvm_slot_18 )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-6.7.1-src/pyside-setup-everywhere-src-6.7.1.tar.xz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=36a7bf513d7dc311ca093b48a152b8b2
+_md5_=c9d471ab72db16504e4632136975d853
diff --git a/metadata/md5-cache/dev-python/sh-2.0.7 b/metadata/md5-cache/dev-python/sh-2.0.7
new file mode 100644
index 000000000000..75f29b7b6836
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sh-2.0.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/poetry-core-1.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python subprocess interface
+EAPI=8
+HOMEPAGE=https://github.com/amoffat/sh/ https://pypi.org/project/sh/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sh/sh-2.0.7.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=85ec086bc62ecb21c7bb1129fa5cfa71
diff --git a/metadata/md5-cache/dev-python/shiboken6-6.7.1 b/metadata/md5-cache/dev-python/shiboken6-6.7.1
index fd630abf97f4..6b7ffde08d79 100644
--- a/metadata/md5-cache/dev-python/shiboken6-6.7.1
+++ b/metadata/md5-cache/dev-python/shiboken6-6.7.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wiki.qt.io/PySide6
 INHERIT=cmake flag-o-matic llvm-r1 python-r1 toolchain-funcs
 IUSE=+docstrings numpy test vulkan +llvm_slot_17 llvm_slot_15 llvm_slot_16 llvm_slot_18 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64
+KEYWORDS=amd64 ~arm ~arm64
 LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3
 RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) =dev-qt/qtbase-6.7.1*:6 llvm_slot_15? ( sys-devel/clang:15 sys-devel/llvm:15 ) llvm_slot_16? ( sys-devel/clang:16 sys-devel/llvm:16 ) llvm_slot_17? ( sys-devel/clang:17 sys-devel/llvm:17 ) llvm_slot_18? ( sys-devel/clang:18 sys-devel/llvm:18 ) docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 ) numpy? ( dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) vulkan? ( dev-util/vulkan-headers ) !dev-python/shiboken6:0
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 ) ^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 llvm_slot_18 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-6.7.1-src/pyside-setup-everywhere-src-6.7.1.tar.xz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9b77a44e205b5638f8b41829db523182
+_md5_=8e42959055ed8dee265e3f46fa8e3fd9
diff --git a/metadata/md5-cache/dev-python/tlsh-4.8.2-r1 b/metadata/md5-cache/dev-python/tlsh-4.8.2-r1
new file mode 100644
index 000000000000..b807efcc2713
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tlsh-4.8.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/tlsh python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+DESCRIPTION=Fuzzy matching library - C++ extension for Python
+EAPI=8
+HOMEPAGE=https://pypi.org/project/python-tlsh/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86
+LICENSE=|| ( Apache-2.0 BSD )
+RDEPEND=dev-libs/tlsh python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+SLOT=0
+SRC_URI=https://github.com/trendmicro/tlsh/archive/4.8.2.tar.gz -> tlsh-4.8.2.gh.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=6643ca03739c5928e54b51a9878b6389
diff --git a/metadata/md5-cache/dev-python/typing-extensions-4.12.1 b/metadata/md5-cache/dev-python/typing-extensions-4.12.1
new file mode 100644
index 000000000000..eb44cdc8b1f9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/typing-extensions-4.12.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/flit-core-3.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Backported and Experimental Type Hints for Python 3.7+
+EAPI=8
+HOMEPAGE=https://pypi.org/project/typing-extensions/ https://github.com/python/typing_extensions/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=PSF-2
+RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/t/typing-extensions/typing_extensions-4.12.1.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=3d4574d67e2890ac2556d4f69afc883c
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 08730995c8d8..506fe3da4969 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qt-docs-6.7.1_p202404231200 b/metadata/md5-cache/dev-qt/qt-docs-6.7.1_p202404231200
index 91f8d1360eba..56dea0da8d8e 100644
--- a/metadata/md5-cache/dev-qt/qt-docs-6.7.1_p202404231200
+++ b/metadata/md5-cache/dev-qt/qt-docs-6.7.1_p202404231200
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://doc.qt.io/
 INHERIT=unpacker
 IUSE=+examples +html +qch +tools +webview +quick3d +webchannel grpc +3d +serialbus +qt5compat +imageformats +multimedia lottie +networkauth +sensors quickeffectmaker +speech quick3dphysics +connectivity +webengine +positioning activeqt +charts +declarative +svg remoteobjects +websockets +serialport graphs +httpserver datavis +wayland +shadertools +timeline +virtualkeyboard +scxml +location
-KEYWORDS=~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=FDL-1.3
 REQUIRED_USE=|| ( examples html qch )
 SLOT=6
 SRC_URI=https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qmake-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtcmake-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtconcurrent-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtcore-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtdbus-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtgui-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtnetwork-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtopengl-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtplatformintegration-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtprintsupport-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtsql-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qttestlib-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtwidgets-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtxml-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples/6.7.1-0-202404231200qtbase-examples-6.7.1.7z ) 3d? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qt3d/6.7.1-0-202404231200qt3d-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qt3d/6.7.1-0-202404231200qt3d-examples-6.7.1.7z ) ) activeqt? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtactiveqt/6.7.1-0-202404231200activeqt-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qtactiveqt/6.7.1-0-202404231200qtactiveqt-examples-6.7.1.7z ) ) charts? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtcharts/6.7.1-0-202404231200qtcharts-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qtcharts/6.7.1-0-202404231200qtcharts-examples-6.7.1.7z ) ) connectivity? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtbluetooth/6.7.1-0-202404231200qtbluetooth-documentation.tar.xz ) connectivity? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtbluetooth/6.7.1-0-202404231200qtbluetooth-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qtconnectivity/6.7.1-0-202404231200qtconnectivity-examples-6.7.1.7z ) ) connectivity? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtnfc/6.7.1-0-202404231200qtnfc-documentation.tar.xz ) datavis? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtdatavis3d/6.7.1-0-202404231200qtdatavis3d-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qtdatavis3d/6.7.1-0-202404231200qtdatavis3d-examples-6.7.1.7z ) ) declarative? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtlabsplatform-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtqml-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtqmlcore-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtqmlmodels-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtqmltest-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtqmlworkerscript-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtqmlxmllistmodel-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtquick-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtquickcontrols-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtquickdialogs-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples/6.7.1-0-202404231200qtdeclarative-examples-6.7.1.7z ) ) https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtdoc-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples/6.7.1-0-202404231200qtdoc-examples-6.7.1.7z ) graphs? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtgraphs/6.7.1-0-202404231200qtgraphs-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qtgraphs/6.7.1-0-202404231200qtgraphs-examples-6.7.1.7z ) ) grpc? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtgrpc/6.7.1-0-202404231200qtgrpc-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtgrpc/6.7.1-0-202404231200qtprotobuf-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qtgrpc/6.7.1-0-202404231200qtgrpc-examples-6.7.1.7z ) ) httpserver? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qthttpserver/6.7.1-0-202404231200qthttpserver-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qthttpserver/6.7.1-0-202404231200qthttpserver-examples-6.7.1.7z ) ) imageformats? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtimageformats/6.7.1-0-202404231200qtimageformats-documentation.tar.xz ) location? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtlocation/6.7.1-0-202404231200qtlocation-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qtlocation/6.7.1-0-202404231200qtlocation-examples-6.7.1.7z ) ) lottie? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtlottie/6.7.1-0-202404231200qtlottieanimation-documentation.tar.xz ) multimedia? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtmultimedia/6.7.1-0-202404231200qtmultimedia-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qtmultimedia/6.7.1-0-202404231200qtmultimedia-examples-6.7.1.7z ) ) networkauth? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtnetworkauth/6.7.1-0-202404231200qtnetworkauth-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qtnetworkauth/6.7.1-0-202404231200qtnetworkauth-examples-6.7.1.7z ) ) positioning? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtpositioning/6.7.1-0-202404231200qtpositioning-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qtpositioning/6.7.1-0-202404231200qtpositioning-examples-6.7.1.7z ) ) qt5compat? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qt5compat/6.7.1-0-202404231200qtcore5compat-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qt5compat/6.7.1-0-202404231200qtgraphicaleffects5compat-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qt5compat/6.7.1-0-202404231200qt5compat-examples-6.7.1.7z ) ) quick3dphysics? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtquick3dphysics/6.7.1-0-202404231200qtquick3dphysics-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qtquick3dphysics/6.7.1-0-202404231200qtquick3dphysics-examples-6.7.1.7z ) ) quick3d? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtquick3d/6.7.1-0-202404231200qtquick3d-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qtquick3d/6.7.1-0-202404231200qtquick3d-examples-6.7.1.7z ) ) quickeffectmaker? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtquickeffectmaker/6.7.1-0-202404231200qtquickeffectmaker-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qtquickeffectmaker/6.7.1-0-202404231200qtquickeffectmaker-examples-6.7.1.7z ) ) remoteobjects? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtremoteobjects/6.7.1-0-202404231200qtremoteobjects-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qtremoteobjects/6.7.1-0-202404231200qtremoteobjects-examples-6.7.1.7z ) ) scxml? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtscxml/6.7.1-0-202404231200qtscxml-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qtscxml/6.7.1-0-202404231200qtscxml-examples-6.7.1.7z ) ) sensors? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtsensors/6.7.1-0-202404231200qtsensors-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qtsensors/6.7.1-0-202404231200qtsensors-examples-6.7.1.7z ) ) serialbus? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtserialbus/6.7.1-0-202404231200qtserialbus-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qtserialbus/6.7.1-0-202404231200qtserialbus-examples-6.7.1.7z ) ) serialport? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtserialport/6.7.1-0-202404231200qtserialport-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qtserialport/6.7.1-0-202404231200qtserialport-examples-6.7.1.7z ) ) shadertools? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtshadertools/6.7.1-0-202404231200qtshadertools-documentation.tar.xz ) speech? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtspeech/6.7.1-0-202404231200qttexttospeech-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qtspeech/6.7.1-0-202404231200qtspeech-examples-6.7.1.7z ) ) svg? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtsvg-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples/6.7.1-0-202404231200qtsvg-examples-6.7.1.7z ) ) timeline? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtquicktimeline/6.7.1-0-202404231200qtquicktimeline-documentation.tar.xz ) tools? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qdoc-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtassistant-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtdesigner-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtdistancefieldgenerator-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qthelp-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtlinguist-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtuitools-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples/6.7.1-0-202404231200qttools-examples-6.7.1.7z ) ) virtualkeyboard? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtvirtualkeyboard/6.7.1-0-202404231200qtvirtualkeyboard-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qtvirtualkeyboard/6.7.1-0-202404231200qtvirtualkeyboard-examples-6.7.1.7z ) ) wayland? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc/6.7.1-0-202404231200qtwaylandcompositor-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples/6.7.1-0-202404231200qtwayland-examples-6.7.1.7z ) ) webchannel? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtwebchannel/6.7.1-0-202404231200qtwebchannel-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qtwebchannel/6.7.1-0-202404231200qtwebchannel-examples-6.7.1.7z ) ) webengine? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtpdf/6.7.1-0-202404231200qtpdf-documentation.tar.xz ) webengine? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtwebengine/6.7.1-0-202404231200qtwebengine-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qtwebengine/6.7.1-0-202404231200qtwebengine-examples-6.7.1.7z ) ) websockets? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtwebsockets/6.7.1-0-202404231200qtwebsockets-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qtwebsockets/6.7.1-0-202404231200qtwebsockets-examples-6.7.1.7z ) ) webview? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.doc.qtwebview/6.7.1-0-202404231200qtwebview-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_671_src_doc_examples/qt.qt6.671.examples.qtwebview/6.7.1-0-202404231200qtwebview-examples-6.7.1.7z ) )
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09
-_md5_=a2a1798572ff98f23e837e170ca497c6
+_md5_=1407a486f9973dc8566ab072932c9650
diff --git a/metadata/md5-cache/dev-qt/qt3d-6.7.0 b/metadata/md5-cache/dev-qt/qt3d-6.7.0
index 25e380681848..26e1569f5143 100644
--- a/metadata/md5-cache/dev-qt/qt3d-6.7.0
+++ b/metadata/md5-cache/dev-qt/qt3d-6.7.0
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.0:6[concurrent,gles2-only=,gui,network,opengl,vulkan=
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qt3d-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=fc15fefe1c5bebc638d18140a0d2a5ec
diff --git a/metadata/md5-cache/dev-qt/qt3d-6.7.1 b/metadata/md5-cache/dev-qt/qt3d-6.7.1
index d63b8daf1f8a..a65fb8aaac68 100644
--- a/metadata/md5-cache/dev-qt/qt3d-6.7.1
+++ b/metadata/md5-cache/dev-qt/qt3d-6.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=gles2-only qml vulkan test
-KEYWORDS=~amd64 arm ~arm64 ~riscv x86
+KEYWORDS=amd64 arm ~arm64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6[concurrent,gles2-only=,gui,network,opengl,vulkan=] ~dev-qt/qtshadertools-6.7.1:6 media-libs/assimp:= qml? ( ~dev-qt/qtdeclarative-6.7.1:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qt3d-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=56162bdf3e8b3408c74ae7e6fb1559a9
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=e8cd5b3fc110d08e872673bb89768c45
diff --git a/metadata/md5-cache/dev-qt/qt3d-6.7.9999 b/metadata/md5-cache/dev-qt/qt3d-6.7.9999
index c61707c4c044..ae8a62af2580 100644
--- a/metadata/md5-cache/dev-qt/qt3d-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qt3d-6.7.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.7.9999:6[concurrent,gles2-only=,gui,network,opengl,vulkan=] ~dev-qt/qtshadertools-6.7.9999:6 media-libs/assimp:= qml? ( ~dev-qt/qtdeclarative-6.7.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=20af7ec131cc4ba8fee15c1074ec96e7
diff --git a/metadata/md5-cache/dev-qt/qt3d-6.9999 b/metadata/md5-cache/dev-qt/qt3d-6.9999
index e5b9d97d7f9d..6d3bc4cbf4cb 100644
--- a/metadata/md5-cache/dev-qt/qt3d-6.9999
+++ b/metadata/md5-cache/dev-qt/qt3d-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[concurrent,gles2-only=,gui,network,opengl,vulkan=] ~dev-qt/qtshadertools-6.9999:6 media-libs/assimp:= qml? ( ~dev-qt/qtdeclarative-6.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=20af7ec131cc4ba8fee15c1074ec96e7
diff --git a/metadata/md5-cache/dev-qt/qt5compat-6.7.0 b/metadata/md5-cache/dev-qt/qt5compat-6.7.0
index b5c88c88f26b..6b1d871416b3 100644
--- a/metadata/md5-cache/dev-qt/qt5compat-6.7.0
+++ b/metadata/md5-cache/dev-qt/qt5compat-6.7.0
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.0:6[gui,icu=,network,xml] icu? ( dev-libs/icu:= ) qml
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qt5compat-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=33e2b0964bba86b85cc10f7b4ce03afc
diff --git a/metadata/md5-cache/dev-qt/qt5compat-6.7.1 b/metadata/md5-cache/dev-qt/qt5compat-6.7.1
index 41609040073b..f26ddc15ee62 100644
--- a/metadata/md5-cache/dev-qt/qt5compat-6.7.1
+++ b/metadata/md5-cache/dev-qt/qt5compat-6.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=icu qml test
-KEYWORDS=~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6[gui,icu=,network,xml] icu? ( dev-libs/icu:= ) qml? ( ~dev-qt/qtdeclarative-6.7.1:6 ~dev-qt/qtshadertools-6.7.1:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qt5compat-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=faff2e14e5f669cdd5dd71113651e5f1
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=71a91396a8d3a2aa1b51c4c202180323
diff --git a/metadata/md5-cache/dev-qt/qt5compat-6.7.9999 b/metadata/md5-cache/dev-qt/qt5compat-6.7.9999
index dd0fdc4005f3..5b5d37f2eb73 100644
--- a/metadata/md5-cache/dev-qt/qt5compat-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qt5compat-6.7.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.7.9999:6[gui,icu=,network,xml] icu? ( dev-libs/icu:= ) qml? ( ~dev-qt/qtdeclarative-6.7.9999:6 ~dev-qt/qtshadertools-6.7.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2b1903b217447293de8043d42e2f885f
diff --git a/metadata/md5-cache/dev-qt/qt5compat-6.9999 b/metadata/md5-cache/dev-qt/qt5compat-6.9999
index 7852dcedfe70..0c44ae06ef6a 100644
--- a/metadata/md5-cache/dev-qt/qt5compat-6.9999
+++ b/metadata/md5-cache/dev-qt/qt5compat-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[gui,icu=,network,xml] icu? ( dev-libs/icu:= ) qml? ( ~dev-qt/qtdeclarative-6.9999:6 ~dev-qt/qtshadertools-6.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2b1903b217447293de8043d42e2f885f
diff --git a/metadata/md5-cache/dev-qt/qtbase-6.7.0-r2 b/metadata/md5-cache/dev-qt/qtbase-6.7.0-r2
index 18c51ace25bf..6e2b55589609 100644
--- a/metadata/md5-cache/dev-qt/qtbase-6.7.0-r2
+++ b/metadata/md5-cache/dev-qt/qtbase-6.7.0-r2
@@ -4,7 +4,7 @@ DEPEND=sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) z
 DESCRIPTION=Cross-platform application development framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
-INHERIT=flag-o-matic qt6-build toolchain-funcs
+INHERIT=qt6-build toolchain-funcs
 IUSE=+X accessibility eglfs evdev gles2-only +libinput opengl renderdoc tslib vulkan wayland +widgets +ssl +udev zstd brotli gssapi libproxy sctp +concurrent +dbus +gui +network +sql +xml icu mysql oci8 odbc postgres +sqlite cups gtk nls test
 KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
@@ -14,5 +14,5 @@ REQUIRED_USE=X? ( gui ) accessibility? ( gui ) eglfs? ( gui ) evdev? ( gui ) gle
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtbase-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=02d6464a8e86cac3bb7d7940686ce907
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=a37202b48df668a9c8a24bda865d6cc6
diff --git a/metadata/md5-cache/dev-qt/qtbase-6.7.1 b/metadata/md5-cache/dev-qt/qtbase-6.7.1
index 06a1041d9d1a..c5dd9514f77f 100644
--- a/metadata/md5-cache/dev-qt/qtbase-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtbase-6.7.1
@@ -4,9 +4,9 @@ DEPEND=sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) z
 DESCRIPTION=Cross-platform application development framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
-INHERIT=flag-o-matic qt6-build toolchain-funcs
+INHERIT=qt6-build toolchain-funcs
 IUSE=+X accessibility eglfs evdev gles2-only +libinput opengl renderdoc tslib vulkan wayland +widgets +ssl +udev zstd brotli gssapi libproxy sctp +concurrent +dbus +gui +network +sql +xml icu mysql oci8 odbc postgres +sqlite cups gtk nls test
-KEYWORDS=~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=nls? ( ~dev-qt/qttranslations-6.7.1:6 ) wayland? ( ~dev-qt/qtwayland-6.7.1:6 )
 RDEPEND=sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) app-crypt/libb2 dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode(+)] icu? ( dev-libs/icu:= ) dbus? ( sys-apps/dbus ) gui? ( media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:= x11-libs/libdrm x11-libs/libxkbcommon[X?] X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) accessibility? ( app-accessibility/at-spi2-core:2 ) eglfs? ( media-libs/mesa[gbm(+)] ) evdev? ( sys-libs/mtdev ) libinput? ( dev-libs/libinput:= ) opengl? ( gles2-only? ( media-libs/libglvnd ) !gles2-only? ( media-libs/libglvnd[X?] ) ) renderdoc? ( media-gfx/renderdoc ) tslib? ( x11-libs/tslib ) widgets? ( cups? ( net-print/cups ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango ) ) ) network? ( brotli? ( app-arch/brotli:= ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) ) sql? ( mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) )
@@ -14,5 +14,5 @@ REQUIRED_USE=X? ( gui ) accessibility? ( gui ) eglfs? ( gui ) evdev? ( gui ) gle
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtbase-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6e21f1184ea558795a57924e8a3c24c7
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=af8487c70bed1cfe16b2cd85c3378396
diff --git a/metadata/md5-cache/dev-qt/qtbase-6.7.9999 b/metadata/md5-cache/dev-qt/qtbase-6.7.9999
index d2b5b57b0785..974116135183 100644
--- a/metadata/md5-cache/dev-qt/qtbase-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtbase-6.7.9999
@@ -4,7 +4,7 @@ DEPEND=sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) z
 DESCRIPTION=Cross-platform application development framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
-INHERIT=flag-o-matic qt6-build toolchain-funcs
+INHERIT=qt6-build toolchain-funcs
 IUSE=+X accessibility eglfs evdev gles2-only +libinput opengl renderdoc tslib vulkan wayland +widgets +ssl +udev zstd brotli gssapi libproxy sctp +concurrent +dbus +gui +network +sql +xml icu mysql oci8 odbc postgres +sqlite cups gtk nls test
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=nls? ( ~dev-qt/qttranslations-6.7.9999:6 ) wayland? ( ~dev-qt/qtwayland-6.7.9999:6 )
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= )
 REQUIRED_USE=X? ( gui ) accessibility? ( gui ) eglfs? ( gui ) evdev? ( gui ) gles2-only? ( gui ) libinput? ( gui ) opengl? ( gui ) renderdoc? ( gui ) tslib? ( gui ) vulkan? ( gui ) wayland? ( gui ) widgets? ( gui ) brotli? ( network ) gssapi? ( network ) libproxy? ( network ) sctp? ( network ) mysql? ( sql ) oci8? ( sql ) odbc? ( sql ) postgres? ( sql ) sqlite? ( sql ) cups? ( gui widgets ) gtk? ( gui widgets ) accessibility? ( dbus ) eglfs? ( opengl ) gles2-only? ( opengl ) gui? ( || ( X eglfs wayland ) ) libinput? ( udev ) sql? ( || ( mysql oci8 odbc postgres sqlite ) ) test? ( icu sql? ( sqlite ) )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c19ed85a5d92a66543d6a8668082bf67
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=5efa8d430ed06dea221f981222968995
diff --git a/metadata/md5-cache/dev-qt/qtbase-6.9999 b/metadata/md5-cache/dev-qt/qtbase-6.9999
index ea42aced7d1c..b22c45248310 100644
--- a/metadata/md5-cache/dev-qt/qtbase-6.9999
+++ b/metadata/md5-cache/dev-qt/qtbase-6.9999
@@ -4,7 +4,7 @@ DEPEND=sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) z
 DESCRIPTION=Cross-platform application development framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
-INHERIT=flag-o-matic qt6-build toolchain-funcs
+INHERIT=qt6-build toolchain-funcs
 IUSE=+X accessibility eglfs evdev gles2-only +libinput opengl renderdoc tslib vulkan wayland +widgets +ssl +udev zstd brotli gssapi libproxy sctp +concurrent +dbus +gui +network +sql +xml icu mysql oci8 odbc postgres +sqlite cups gtk nls test
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=nls? ( ~dev-qt/qttranslations-6.9999:6 ) wayland? ( ~dev-qt/qtwayland-6.9999:6 )
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= )
 REQUIRED_USE=X? ( gui ) accessibility? ( gui ) eglfs? ( gui ) evdev? ( gui ) gles2-only? ( gui ) libinput? ( gui ) opengl? ( gui ) renderdoc? ( gui ) tslib? ( gui ) vulkan? ( gui ) wayland? ( gui ) widgets? ( gui ) brotli? ( network ) gssapi? ( network ) libproxy? ( network ) sctp? ( network ) mysql? ( sql ) oci8? ( sql ) odbc? ( sql ) postgres? ( sql ) sqlite? ( sql ) cups? ( gui widgets ) gtk? ( gui widgets ) accessibility? ( dbus ) eglfs? ( opengl ) gles2-only? ( opengl ) gui? ( || ( X eglfs wayland ) ) libinput? ( udev ) sql? ( || ( mysql oci8 odbc postgres sqlite ) ) test? ( icu sql? ( sqlite ) )
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c19ed85a5d92a66543d6a8668082bf67
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=5efa8d430ed06dea221f981222968995
diff --git a/metadata/md5-cache/dev-qt/qtcharts-6.7.0 b/metadata/md5-cache/dev-qt/qtcharts-6.7.0
index 5bf8284073ae..fbf96c6aa240 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-6.7.0
+++ b/metadata/md5-cache/dev-qt/qtcharts-6.7.0
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.0:6[gles2-only=,gui,opengl,widgets] qml? ( ~dev-qt/qt
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtcharts-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=776d609a3df3aa916236925cafacacb7
diff --git a/metadata/md5-cache/dev-qt/qtcharts-6.7.1 b/metadata/md5-cache/dev-qt/qtcharts-6.7.1
index a2f35a182a21..b9729124d2e3 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtcharts-6.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=gles2-only qml test
-KEYWORDS=~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv x86
+KEYWORDS=amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6[gles2-only=,gui,opengl,widgets] qml? ( ~dev-qt/qtdeclarative-6.7.1:6[opengl] )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtcharts-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fc5bb505b30d0ebf95bb5817565d0bee
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=4b7b819d0642af6bd9b67e9200e35a05
diff --git a/metadata/md5-cache/dev-qt/qtcharts-6.7.9999 b/metadata/md5-cache/dev-qt/qtcharts-6.7.9999
index 1f5fbbb1d865..933be9ee6318 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtcharts-6.7.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.7.9999:6[gles2-only=,gui,opengl,widgets] qml? ( ~dev-qt/qtdeclarative-6.7.9999:6[opengl] )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3d347d590ef42927b2814c3cf9c5c11c
diff --git a/metadata/md5-cache/dev-qt/qtcharts-6.9999 b/metadata/md5-cache/dev-qt/qtcharts-6.9999
index 620be65009c1..6a9e99242198 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-6.9999
+++ b/metadata/md5-cache/dev-qt/qtcharts-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[gles2-only=,gui,opengl,widgets] qml? ( ~dev-qt/qtdeclarative-6.9999:6[opengl] )
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3d347d590ef42927b2814c3cf9c5c11c
diff --git a/metadata/md5-cache/dev-qt/qtconnectivity-6.7.0 b/metadata/md5-cache/dev-qt/qtconnectivity-6.7.0
index bbe9486c4136..a29025889e3b 100644
--- a/metadata/md5-cache/dev-qt/qtconnectivity-6.7.0
+++ b/metadata/md5-cache/dev-qt/qtconnectivity-6.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( bluetooth nfc )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtconnectivity-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=34ce121c87df83f1065d1e262cec1c66
diff --git a/metadata/md5-cache/dev-qt/qtconnectivity-6.7.1 b/metadata/md5-cache/dev-qt/qtconnectivity-6.7.1
index 6a361a6fdf93..4298dbe1b3c8 100644
--- a/metadata/md5-cache/dev-qt/qtconnectivity-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtconnectivity-6.7.1
@@ -6,12 +6,12 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=+bluetooth nfc smartcard test
-KEYWORDS=~amd64 arm ~arm64 ~loong ~riscv x86
+KEYWORDS=amd64 arm ~arm64 ~loong ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6[network] bluetooth? ( ~dev-qt/qtbase-6.7.1:6[dbus] net-wireless/bluez:= ) nfc? ( smartcard? ( sys-apps/pcsc-lite ) )
 REQUIRED_USE=|| ( bluetooth nfc )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtconnectivity-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=70e6798f47e43f99a84c16c5c789e90a
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=d383c9c3a785a943ce4b607006ae78b4
diff --git a/metadata/md5-cache/dev-qt/qtconnectivity-6.7.9999 b/metadata/md5-cache/dev-qt/qtconnectivity-6.7.9999
index 6df427ff14f5..d34cf119b94e 100644
--- a/metadata/md5-cache/dev-qt/qtconnectivity-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtconnectivity-6.7.9999
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.9999:6[network] bluetooth? ( ~dev-qt/qtbase-6.7.9999:
 REQUIRED_USE=|| ( bluetooth nfc )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=966404245f8bb8d566998da838784da6
diff --git a/metadata/md5-cache/dev-qt/qtconnectivity-6.9999 b/metadata/md5-cache/dev-qt/qtconnectivity-6.9999
index d5e6b2fea4bf..7b2872a64eee 100644
--- a/metadata/md5-cache/dev-qt/qtconnectivity-6.9999
+++ b/metadata/md5-cache/dev-qt/qtconnectivity-6.9999
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.9999:6[network] bluetooth? ( ~dev-qt/qtbase-6.9999:6[db
 REQUIRED_USE=|| ( bluetooth nfc )
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=966404245f8bb8d566998da838784da6
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-6.7.0 b/metadata/md5-cache/dev-qt/qtdeclarative-6.7.0
index 864509bf3ba9..e14d4b186665 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-6.7.0
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-6.7.0
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.0:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vul
 RESTRICT=test
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtdeclarative-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6ff8546899a3d5aadb461b1ab5e449fe
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-6.7.1 b/metadata/md5-cache/dev-qt/qtdeclarative-6.7.1
index ca613895becb..26fe27473055 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-6.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=python-any-r1 qt6-build
 IUSE=accessibility +jit +network opengl qmlls +sql +ssl svg vulkan +widgets
-KEYWORDS=~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=] qmlls? ( ~dev-qt/qtlanguageserver-6.7.1:6 ) svg? ( ~dev-qt/qtsvg-6.7.1:6 )
 RESTRICT=test
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtdeclarative-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=db0cf631e2fcb6ec832c73d2e51fd39b
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=8d17ed61c667daead8df126e518546c7
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-6.7.9999 b/metadata/md5-cache/dev-qt/qtdeclarative-6.7.9999
index 34fab7f9aa67..6c82ead8cf64 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-6.7.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.7.9999:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=] qmlls? ( ~dev-qt/qtlanguageserver-6.7.9999:6 ) svg? ( ~dev-qt/qtsvg-6.7.9999:6 )
 RESTRICT=test
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=10ff46e99bdf438b8fca3d26850be38c
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-6.9999 b/metadata/md5-cache/dev-qt/qtdeclarative-6.9999
index ffa0dd4043a4..495f1209dbca 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-6.9999
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=] qmlls? ( ~dev-qt/qtlanguageserver-6.9999:6 ) svg? ( ~dev-qt/qtsvg-6.9999:6 )
 RESTRICT=test
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=10ff46e99bdf438b8fca3d26850be38c
diff --git a/metadata/md5-cache/dev-qt/qthttpserver-6.7.0 b/metadata/md5-cache/dev-qt/qthttpserver-6.7.0
index a2fd99549976..149ab4e0893d 100644
--- a/metadata/md5-cache/dev-qt/qthttpserver-6.7.0
+++ b/metadata/md5-cache/dev-qt/qthttpserver-6.7.0
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.0:6[network,ssl=] websockets? ( ~dev-qt/qtwebsockets-
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qthttpserver-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=818a7030e1b47b5adcddf5e2673092c8
diff --git a/metadata/md5-cache/dev-qt/qthttpserver-6.7.1 b/metadata/md5-cache/dev-qt/qthttpserver-6.7.1
index 8f13594a2a49..93e0281ab9e7 100644
--- a/metadata/md5-cache/dev-qt/qthttpserver-6.7.1
+++ b/metadata/md5-cache/dev-qt/qthttpserver-6.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=+ssl websockets test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6[network,ssl=] websockets? ( ~dev-qt/qtwebsockets-6.7.1:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qthttpserver-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=81f12114169fb7a3f20052b67adedd70
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=818a7030e1b47b5adcddf5e2673092c8
diff --git a/metadata/md5-cache/dev-qt/qthttpserver-6.7.9999 b/metadata/md5-cache/dev-qt/qthttpserver-6.7.9999
index c8ded32249ac..4a4d80a5cefa 100644
--- a/metadata/md5-cache/dev-qt/qthttpserver-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qthttpserver-6.7.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.7.9999:6[network,ssl=] websockets? ( ~dev-qt/qtwebsockets-6.7.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=752beff3345a486b2a6086e39564d137
diff --git a/metadata/md5-cache/dev-qt/qthttpserver-6.9999 b/metadata/md5-cache/dev-qt/qthttpserver-6.9999
index 6f6fdedde716..4193f73695fe 100644
--- a/metadata/md5-cache/dev-qt/qthttpserver-6.9999
+++ b/metadata/md5-cache/dev-qt/qthttpserver-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[network,ssl=] websockets? ( ~dev-qt/qtwebsockets-6.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=752beff3345a486b2a6086e39564d137
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-6.7.0 b/metadata/md5-cache/dev-qt/qtimageformats-6.7.0
index 71a3e7d3fba4..a5ea264b0653 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-6.7.0
+++ b/metadata/md5-cache/dev-qt/qtimageformats-6.7.0
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.0:6[gui] media-libs/libwebp:= media-libs/tiff:= mng?
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtimageformats-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=df2c6bdf76d6e819e4c5caefefa37447
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-6.7.1 b/metadata/md5-cache/dev-qt/qtimageformats-6.7.1
index fee463599a72..4a6cdf10838e 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtimageformats-6.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=mng test
-KEYWORDS=~amd64 arm ~arm64 ~hppa ~loong ppc64 ~riscv x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~loong ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6[gui] media-libs/libwebp:= media-libs/tiff:= mng? ( media-libs/libmng:= )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtimageformats-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c566dcf44f021635368bf2e38aa14a3b
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=7c547a640dc80b5ec32171c0a933eb74
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-6.7.9999 b/metadata/md5-cache/dev-qt/qtimageformats-6.7.9999
index 2ac9570a2414..f990e3c7b4ae 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtimageformats-6.7.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.7.9999:6[gui] media-libs/libwebp:= media-libs/tiff:= mng? ( media-libs/libmng:= )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=da8ed7b1dd06095e9dd7ce88767237f5
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-6.9999 b/metadata/md5-cache/dev-qt/qtimageformats-6.9999
index d439877e52e2..c2623c9fd963 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-6.9999
+++ b/metadata/md5-cache/dev-qt/qtimageformats-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[gui] media-libs/libwebp:= media-libs/tiff:= mng? ( media-libs/libmng:= )
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=da8ed7b1dd06095e9dd7ce88767237f5
diff --git a/metadata/md5-cache/dev-qt/qtlanguageserver-6.7.0 b/metadata/md5-cache/dev-qt/qtlanguageserver-6.7.0
index c639f82d3eb2..40a43582346e 100644
--- a/metadata/md5-cache/dev-qt/qtlanguageserver-6.7.0
+++ b/metadata/md5-cache/dev-qt/qtlanguageserver-6.7.0
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.0:6
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtlanguageserver-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3b14f9f190737f90d3fc98b813256bb5
diff --git a/metadata/md5-cache/dev-qt/qtlanguageserver-6.7.1 b/metadata/md5-cache/dev-qt/qtlanguageserver-6.7.1
index a5d221db2df8..bd386bcd9080 100644
--- a/metadata/md5-cache/dev-qt/qtlanguageserver-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtlanguageserver-6.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtlanguageserver-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=edf19ed090dec62429f7153ea7eb7a8c
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=3b14f9f190737f90d3fc98b813256bb5
diff --git a/metadata/md5-cache/dev-qt/qtlanguageserver-6.7.9999 b/metadata/md5-cache/dev-qt/qtlanguageserver-6.7.9999
index 3563a4ccf6d8..edea024a3c92 100644
--- a/metadata/md5-cache/dev-qt/qtlanguageserver-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtlanguageserver-6.7.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.7.9999:6
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=edf19ed090dec62429f7153ea7eb7a8c
diff --git a/metadata/md5-cache/dev-qt/qtlanguageserver-6.9999 b/metadata/md5-cache/dev-qt/qtlanguageserver-6.9999
index a9ba0989ccf0..7f0506717c12 100644
--- a/metadata/md5-cache/dev-qt/qtlanguageserver-6.9999
+++ b/metadata/md5-cache/dev-qt/qtlanguageserver-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=edf19ed090dec62429f7153ea7eb7a8c
diff --git a/metadata/md5-cache/dev-qt/qtlocation-6.7.0 b/metadata/md5-cache/dev-qt/qtlocation-6.7.0
index 2be15a88523a..245ea8874d5c 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-6.7.0
+++ b/metadata/md5-cache/dev-qt/qtlocation-6.7.0
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.0:6[network] ~dev-qt/qtdeclarative-6.7.0:6 ~dev-qt/qt
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtlocation-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=12e6a06c196d81b63a946f91fda1dbef
diff --git a/metadata/md5-cache/dev-qt/qtlocation-6.7.1 b/metadata/md5-cache/dev-qt/qtlocation-6.7.1
index 711ed2061b54..6b5cfdc37f63 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtlocation-6.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=test
-KEYWORDS=~amd64 arm ~arm64 ~riscv x86
+KEYWORDS=amd64 arm ~arm64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6[network] ~dev-qt/qtdeclarative-6.7.1:6 ~dev-qt/qtpositioning-6.7.1:6[qml]
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtlocation-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fd2d18eb4881e3a690ed2a9254ad7480
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=890d6922f84022eca70bc813445270a1
diff --git a/metadata/md5-cache/dev-qt/qtlocation-6.7.9999 b/metadata/md5-cache/dev-qt/qtlocation-6.7.9999
index 8087174331ac..e1e39a7884ac 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtlocation-6.7.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.7.9999:6[network] ~dev-qt/qtdeclarative-6.7.9999:6 ~dev-qt/qtpositioning-6.7.9999:6[qml]
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=acb4d50f88aecf293a4051cc1337264a
diff --git a/metadata/md5-cache/dev-qt/qtlocation-6.9999 b/metadata/md5-cache/dev-qt/qtlocation-6.9999
index 46d56b612527..bc288a690600 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-6.9999
+++ b/metadata/md5-cache/dev-qt/qtlocation-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[network] ~dev-qt/qtdeclarative-6.9999:6 ~dev-qt/qtpositioning-6.9999:6[qml]
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=acb4d50f88aecf293a4051cc1337264a
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-6.7.0 b/metadata/md5-cache/dev-qt/qtmultimedia-6.7.0
index 654c6efb2ac1..d82ea53c0313 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-6.7.0
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-6.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ffmpeg gstreamer ) eglfs? ( ffmpeg opengl ) vaapi? ( ffmpeg op
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtmultimedia-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7a11da6273fb1b65a803fb33d977c055
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-6.7.1 b/metadata/md5-cache/dev-qt/qtmultimedia-6.7.1
index 06eb3283bf41..111688c02435 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-6.7.1
@@ -6,12 +6,12 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=flag-o-matic qt6-build
 IUSE=+X alsa eglfs +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan test
-KEYWORDS=~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6[gui,network,opengl=,vulkan=,widgets] alsa? ( media-libs/alsa-lib ) ffmpeg? ( ~dev-qt/qtbase-6.7.1:6[X=,concurrent,eglfs=] media-video/ffmpeg:=[vaapi?] X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr ) ) gstreamer? ( dev-libs/glib:2 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0[X=,opengl?] media-libs/gstreamer:1.0 ) opengl? ( media-libs/libglvnd ) pulseaudio? ( media-libs/libpulse ) qml? ( ~dev-qt/qtdeclarative-6.7.1:6 ~dev-qt/qtquick3d-6.7.1:6 )
 REQUIRED_USE=|| ( ffmpeg gstreamer ) eglfs? ( ffmpeg opengl ) vaapi? ( ffmpeg opengl ) test? ( qml )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtmultimedia-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=93b393ec659a523b85e8aab985774361
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=f03dc6c111bbeb9e3b8e2cc627a82a2c
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-6.7.9999 b/metadata/md5-cache/dev-qt/qtmultimedia-6.7.9999
index 3ec7bceca4db..7eab7f96fd0c 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-6.7.9999
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.9999:6[gui,network,opengl=,vulkan=,widgets] alsa? ( m
 REQUIRED_USE=|| ( ffmpeg gstreamer ) eglfs? ( ffmpeg opengl ) vaapi? ( ffmpeg opengl ) test? ( qml )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=eb0646b401a2d45f1737024f0cf67d97
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-6.9999 b/metadata/md5-cache/dev-qt/qtmultimedia-6.9999
index 073788bc8631..8845db3fb538 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-6.9999
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-6.9999
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.9999:6[gui,network,opengl=,vulkan=,widgets] alsa? ( med
 REQUIRED_USE=|| ( ffmpeg gstreamer ) eglfs? ( ffmpeg opengl ) vaapi? ( ffmpeg opengl ) test? ( qml )
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=eb0646b401a2d45f1737024f0cf67d97
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-6.7.0 b/metadata/md5-cache/dev-qt/qtnetworkauth-6.7.0
index dac73c79e877..58ed10aabd5e 100644
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-6.7.0
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-6.7.0
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.0:6[network]
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtnetworkauth-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=11ef23bd59e5d31d174d290ab7a942df
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-6.7.1 b/metadata/md5-cache/dev-qt/qtnetworkauth-6.7.1
index 7d98fada402b..1f78d0f53911 100644
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-6.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~riscv x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6[network]
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtnetworkauth-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b2e71e0d3603a1ea7bc41b54d0747150
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=9370ea52b81a5f0bface5fac64efc950
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-6.7.9999 b/metadata/md5-cache/dev-qt/qtnetworkauth-6.7.9999
index f201139b7aa6..c9e7d2ac7f62 100644
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-6.7.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.7.9999:6[network]
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=53c0bb3891f96a5a25ffe106497ddd6c
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-6.9999 b/metadata/md5-cache/dev-qt/qtnetworkauth-6.9999
index 0254dfb39105..944065011825 100644
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-6.9999
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[network]
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=53c0bb3891f96a5a25ffe106497ddd6c
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-6.7.0 b/metadata/md5-cache/dev-qt/qtpositioning-6.7.0
index a316fba4354f..18850ba781d6 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-6.7.0
+++ b/metadata/md5-cache/dev-qt/qtpositioning-6.7.0
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.0:6 geoclue? ( ~dev-qt/qtbase-6.7.0:6[dbus] ) nmea? (
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtpositioning-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ef2942efd89e6c63464e80969fc18724
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-6.7.1 b/metadata/md5-cache/dev-qt/qtpositioning-6.7.1
index 8e3f057a4324..047fe8bab928 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtpositioning-6.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=geoclue nmea +qml test
-KEYWORDS=~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6 geoclue? ( ~dev-qt/qtbase-6.7.1:6[dbus] ) nmea? ( ~dev-qt/qtbase-6.7.1:6[network] ~dev-qt/qtserialport-6.7.1:6 ) qml? ( ~dev-qt/qtdeclarative-6.7.1:6 ) geoclue? ( app-misc/geoclue:2.0 )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtpositioning-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=dd352585058320b781d48dac4f095d11
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=9301f1244770f245bd792f73d9d4276d
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-6.7.9999 b/metadata/md5-cache/dev-qt/qtpositioning-6.7.9999
index 0b4e58ad482d..75a23c54685f 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtpositioning-6.7.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.7.9999:6 geoclue? ( ~dev-qt/qtbase-6.7.9999:6[dbus] ) nmea? ( ~dev-qt/qtbase-6.7.9999:6[network] ~dev-qt/qtserialport-6.7.9999:6 ) qml? ( ~dev-qt/qtdeclarative-6.7.9999:6 ) geoclue? ( app-misc/geoclue:2.0 )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6c2681fdf3e41d546f6045d8b81edbb5
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-6.9999 b/metadata/md5-cache/dev-qt/qtpositioning-6.9999
index 6d14478ed527..7b4d96c91dc2 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-6.9999
+++ b/metadata/md5-cache/dev-qt/qtpositioning-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6 geoclue? ( ~dev-qt/qtbase-6.9999:6[dbus] ) nmea? ( ~dev-qt/qtbase-6.9999:6[network] ~dev-qt/qtserialport-6.9999:6 ) qml? ( ~dev-qt/qtdeclarative-6.9999:6 ) geoclue? ( app-misc/geoclue:2.0 )
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6c2681fdf3e41d546f6045d8b81edbb5
diff --git a/metadata/md5-cache/dev-qt/qtquick3d-6.7.0 b/metadata/md5-cache/dev-qt/qtquick3d-6.7.0
index 8515b56982a0..0878309464da 100644
--- a/metadata/md5-cache/dev-qt/qtquick3d-6.7.0
+++ b/metadata/md5-cache/dev-qt/qtquick3d-6.7.0
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.0:6[concurrent,gui,opengl=,vulkan=,widgets] ~dev-qt/q
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtquick3d-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=fadebbe3f903d8a9abb030b7540f0306
diff --git a/metadata/md5-cache/dev-qt/qtquick3d-6.7.1 b/metadata/md5-cache/dev-qt/qtquick3d-6.7.1
index a3fd611109b7..69369bbcd0de 100644
--- a/metadata/md5-cache/dev-qt/qtquick3d-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtquick3d-6.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=opengl vulkan test
-KEYWORDS=~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv x86
+KEYWORDS=amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6[concurrent,gui,opengl=,vulkan=,widgets] ~dev-qt/qtdeclarative-6.7.1:6 ~dev-qt/qtquicktimeline-6.7.1:6 ~dev-qt/qtshadertools-6.7.1:6 media-libs/assimp:= sys-libs/zlib:=
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtquick3d-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1f21940a636c14cdf5bb88b701ebf3bf
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=8537064164074987d10f59b0f93a7430
diff --git a/metadata/md5-cache/dev-qt/qtquick3d-6.7.9999 b/metadata/md5-cache/dev-qt/qtquick3d-6.7.9999
index f5487368612d..73dceb7e8a9d 100644
--- a/metadata/md5-cache/dev-qt/qtquick3d-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtquick3d-6.7.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.7.9999:6[concurrent,gui,opengl=,vulkan=,widgets] ~dev-qt/qtdeclarative-6.7.9999:6 ~dev-qt/qtquicktimeline-6.7.9999:6 ~dev-qt/qtshadertools-6.7.9999:6 media-libs/assimp:= sys-libs/zlib:=
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9b8f07234b7903be9a588d26451809ff
diff --git a/metadata/md5-cache/dev-qt/qtquick3d-6.9999 b/metadata/md5-cache/dev-qt/qtquick3d-6.9999
index db1bffb1adc6..397e0f00115b 100644
--- a/metadata/md5-cache/dev-qt/qtquick3d-6.9999
+++ b/metadata/md5-cache/dev-qt/qtquick3d-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[concurrent,gui,opengl=,vulkan=,widgets] ~dev-qt/qtdeclarative-6.9999:6 ~dev-qt/qtquicktimeline-6.9999:6 ~dev-qt/qtshadertools-6.9999:6 media-libs/assimp:= sys-libs/zlib:=
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9b8f07234b7903be9a588d26451809ff
diff --git a/metadata/md5-cache/dev-qt/qtquicktimeline-6.7.0 b/metadata/md5-cache/dev-qt/qtquicktimeline-6.7.0
index 910a144b4f04..3be592cfac1c 100644
--- a/metadata/md5-cache/dev-qt/qtquicktimeline-6.7.0
+++ b/metadata/md5-cache/dev-qt/qtquicktimeline-6.7.0
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.0:6 ~dev-qt/qtdeclarative-6.7.0:6
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtquicktimeline-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=41de6080eb581cb6d9702f1decbd180b
diff --git a/metadata/md5-cache/dev-qt/qtquicktimeline-6.7.1 b/metadata/md5-cache/dev-qt/qtquicktimeline-6.7.1
index a01bc3bd641c..cefbd8103ad0 100644
--- a/metadata/md5-cache/dev-qt/qtquicktimeline-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtquicktimeline-6.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=test
-KEYWORDS=~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv x86
+KEYWORDS=amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6 ~dev-qt/qtdeclarative-6.7.1:6
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtquicktimeline-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c641bb32f566ff23621b2360e7dcf02a
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=a42ac4eca5897f372cbaa7471be55962
diff --git a/metadata/md5-cache/dev-qt/qtquicktimeline-6.7.9999 b/metadata/md5-cache/dev-qt/qtquicktimeline-6.7.9999
index ca27b5724565..7c81afe02c34 100644
--- a/metadata/md5-cache/dev-qt/qtquicktimeline-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtquicktimeline-6.7.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.7.9999:6 ~dev-qt/qtdeclarative-6.7.9999:6
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=37817451b77a5cba69d2a0e32218f4f1
diff --git a/metadata/md5-cache/dev-qt/qtquicktimeline-6.9999 b/metadata/md5-cache/dev-qt/qtquicktimeline-6.9999
index 2cfdea58b8ae..c610587e1d3b 100644
--- a/metadata/md5-cache/dev-qt/qtquicktimeline-6.9999
+++ b/metadata/md5-cache/dev-qt/qtquicktimeline-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6 ~dev-qt/qtdeclarative-6.9999:6
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=37817451b77a5cba69d2a0e32218f4f1
diff --git a/metadata/md5-cache/dev-qt/qtscxml-6.7.0 b/metadata/md5-cache/dev-qt/qtscxml-6.7.0
index 3cff0863f622..9f42fa5ffe6d 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-6.7.0
+++ b/metadata/md5-cache/dev-qt/qtscxml-6.7.0
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.0:6[gui] qml? ( ~dev-qt/qtdeclarative-6.7.0:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtscxml-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3f20016e113ad5549a3a5aa3a20ca6aa
diff --git a/metadata/md5-cache/dev-qt/qtscxml-6.7.1 b/metadata/md5-cache/dev-qt/qtscxml-6.7.1
index ddc39579f8fa..7c21594ad4db 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtscxml-6.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=qml test
-KEYWORDS=~amd64 arm ~arm64 ~riscv x86
+KEYWORDS=amd64 arm ~arm64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6[gui] qml? ( ~dev-qt/qtdeclarative-6.7.1:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtscxml-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=680c87458c3bdfec77c902e8e56d7894
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=c084cff7c295f44f8ae92aae692e3e76
diff --git a/metadata/md5-cache/dev-qt/qtscxml-6.7.9999 b/metadata/md5-cache/dev-qt/qtscxml-6.7.9999
index 92be918b1a36..a94dd5c09370 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtscxml-6.7.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.7.9999:6[gui] qml? ( ~dev-qt/qtdeclarative-6.7.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d8e2453fd34969bb8f93b6554d44a5b9
diff --git a/metadata/md5-cache/dev-qt/qtscxml-6.9999 b/metadata/md5-cache/dev-qt/qtscxml-6.9999
index 702db58a44cd..a83d313fab93 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-6.9999
+++ b/metadata/md5-cache/dev-qt/qtscxml-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[gui] qml? ( ~dev-qt/qtdeclarative-6.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d8e2453fd34969bb8f93b6554d44a5b9
diff --git a/metadata/md5-cache/dev-qt/qtsensors-6.7.0 b/metadata/md5-cache/dev-qt/qtsensors-6.7.0
index 2ef9254204ed..ed1d61b42c6c 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-6.7.0
+++ b/metadata/md5-cache/dev-qt/qtsensors-6.7.0
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.0:6[dbus] qml? ( ~dev-qt/qtdeclarative-6.7.0:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtsensors-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c14940e03ccb35013e4e902b61810f0d
diff --git a/metadata/md5-cache/dev-qt/qtsensors-6.7.1 b/metadata/md5-cache/dev-qt/qtsensors-6.7.1
index f6ca38089f8b..d70be9ba0e1d 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtsensors-6.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=qml test
-KEYWORDS=~amd64 arm ~arm64 ~hppa ~loong ~ppc ~riscv x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~loong ~ppc ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6[dbus] qml? ( ~dev-qt/qtdeclarative-6.7.1:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtsensors-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=50a3ad5321b0f1c182222a53c4bf94f8
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=eea6bbbfb72f17e442fa91945893dced
diff --git a/metadata/md5-cache/dev-qt/qtsensors-6.7.9999 b/metadata/md5-cache/dev-qt/qtsensors-6.7.9999
index 6205d2a74ebc..9e84d5fd77e3 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtsensors-6.7.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.7.9999:6[dbus] qml? ( ~dev-qt/qtdeclarative-6.7.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=07aede0dad326b603ed009abca5ca532
diff --git a/metadata/md5-cache/dev-qt/qtsensors-6.9999 b/metadata/md5-cache/dev-qt/qtsensors-6.9999
index de8f4d0bc9bb..3ab6eb562648 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-6.9999
+++ b/metadata/md5-cache/dev-qt/qtsensors-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[dbus] qml? ( ~dev-qt/qtdeclarative-6.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=07aede0dad326b603ed009abca5ca532
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-6.7.0 b/metadata/md5-cache/dev-qt/qtserialbus-6.7.0
index b3d94a15c4a1..f89f651525da 100644
--- a/metadata/md5-cache/dev-qt/qtserialbus-6.7.0
+++ b/metadata/md5-cache/dev-qt/qtserialbus-6.7.0
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.0:6[network] ~dev-qt/qtserialport-6.7.0:6
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtserialbus-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=76d285d1833a944989cf09c8a4f33949
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-6.7.1 b/metadata/md5-cache/dev-qt/qtserialbus-6.7.1
index 5c7805a69f8b..3f8af0fea599 100644
--- a/metadata/md5-cache/dev-qt/qtserialbus-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtserialbus-6.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=test
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6[network] ~dev-qt/qtserialport-6.7.1:6
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtserialbus-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e5ab9dac29856383c1943bc8311dcde8
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=4ad2b828b1f99e111fd5e2d940a919be
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-6.7.9999 b/metadata/md5-cache/dev-qt/qtserialbus-6.7.9999
index e8021bd03c7b..ccbb52dc24a7 100644
--- a/metadata/md5-cache/dev-qt/qtserialbus-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtserialbus-6.7.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.7.9999:6[network] ~dev-qt/qtserialport-6.7.9999:6
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5522c0b0db795607d3ec20c329b2a184
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-6.9999 b/metadata/md5-cache/dev-qt/qtserialbus-6.9999
index 4e5d4337d679..7cb48f9053ec 100644
--- a/metadata/md5-cache/dev-qt/qtserialbus-6.9999
+++ b/metadata/md5-cache/dev-qt/qtserialbus-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[network] ~dev-qt/qtserialport-6.9999:6
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5522c0b0db795607d3ec20c329b2a184
diff --git a/metadata/md5-cache/dev-qt/qtserialport-6.7.0 b/metadata/md5-cache/dev-qt/qtserialport-6.7.0
index bd0826fec7ad..f978315669b0 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-6.7.0
+++ b/metadata/md5-cache/dev-qt/qtserialport-6.7.0
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.0:6 virtual/libudev:=
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtserialport-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e8df993b3cea8dbd200b3425d96c2c99
diff --git a/metadata/md5-cache/dev-qt/qtserialport-6.7.1 b/metadata/md5-cache/dev-qt/qtserialport-6.7.1
index ce0342a0067e..80e42b483c58 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtserialport-6.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=test
-KEYWORDS=~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6 virtual/libudev:=
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtserialport-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5fc1efe2b9da372d7973051970bedf57
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=3eec7e6b69b55f83df47854853c999a9
diff --git a/metadata/md5-cache/dev-qt/qtserialport-6.7.9999 b/metadata/md5-cache/dev-qt/qtserialport-6.7.9999
index 3e0917af9424..81eb7b9fb6cc 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtserialport-6.7.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.7.9999:6 virtual/libudev:=
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1a7c2c38705eafef26eb1c353ea9c724
diff --git a/metadata/md5-cache/dev-qt/qtserialport-6.9999 b/metadata/md5-cache/dev-qt/qtserialport-6.9999
index 6798bc9594a7..408298f88519 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-6.9999
+++ b/metadata/md5-cache/dev-qt/qtserialport-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6 virtual/libudev:=
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1a7c2c38705eafef26eb1c353ea9c724
diff --git a/metadata/md5-cache/dev-qt/qtshadertools-6.7.0 b/metadata/md5-cache/dev-qt/qtshadertools-6.7.0
index 29adcce4fb73..3c4c81d887cf 100644
--- a/metadata/md5-cache/dev-qt/qtshadertools-6.7.0
+++ b/metadata/md5-cache/dev-qt/qtshadertools-6.7.0
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.0:6[gui]
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtshadertools-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ed03d88d64cd75666316b95b210d7f5f
diff --git a/metadata/md5-cache/dev-qt/qtshadertools-6.7.1 b/metadata/md5-cache/dev-qt/qtshadertools-6.7.1
index d4b8c72182bc..5a4e7004c679 100644
--- a/metadata/md5-cache/dev-qt/qtshadertools-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtshadertools-6.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=test
-KEYWORDS=~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6[gui]
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtshadertools-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=27ed2f080e8f73845f967ccb8c6fed5c
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=85fd8a7e53b3dd7fba8fe228f7e16476
diff --git a/metadata/md5-cache/dev-qt/qtshadertools-6.7.9999 b/metadata/md5-cache/dev-qt/qtshadertools-6.7.9999
index 0b10efba4019..5ac604923221 100644
--- a/metadata/md5-cache/dev-qt/qtshadertools-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtshadertools-6.7.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.7.9999:6[gui]
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=75f38895341b872fc479b7eff052fe46
diff --git a/metadata/md5-cache/dev-qt/qtshadertools-6.9999 b/metadata/md5-cache/dev-qt/qtshadertools-6.9999
index c3519ae0bf4c..ecc72a6b0111 100644
--- a/metadata/md5-cache/dev-qt/qtshadertools-6.9999
+++ b/metadata/md5-cache/dev-qt/qtshadertools-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[gui]
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=75f38895341b872fc479b7eff052fe46
diff --git a/metadata/md5-cache/dev-qt/qtspeech-6.7.0 b/metadata/md5-cache/dev-qt/qtspeech-6.7.0
index 56255ad159fc..1b20539fd929 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-6.7.0
+++ b/metadata/md5-cache/dev-qt/qtspeech-6.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( flite speechd )
 RESTRICT=test
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtspeech-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a7cd97c18a45d0b3eab9e6dbeb0b569a
diff --git a/metadata/md5-cache/dev-qt/qtspeech-6.7.1 b/metadata/md5-cache/dev-qt/qtspeech-6.7.1
index 88cef7f9ea56..d6f4aa90c0e5 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtspeech-6.7.1
@@ -6,12 +6,12 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=flite qml +speechd
-KEYWORDS=~amd64 arm ~arm64 ~loong ~riscv x86
+KEYWORDS=amd64 arm ~arm64 ~loong ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6 ~dev-qt/qtmultimedia-6.7.1:6 flite? ( app-accessibility/flite ) qml? ( ~dev-qt/qtdeclarative-6.7.1:6 ) speechd? ( app-accessibility/speech-dispatcher )
 REQUIRED_USE=|| ( flite speechd )
 RESTRICT=test
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtspeech-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d02f3af8bed97685a6c4e8f742b5d5ed
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=deddc655952950b2da3599cc0b48c179
diff --git a/metadata/md5-cache/dev-qt/qtspeech-6.7.9999 b/metadata/md5-cache/dev-qt/qtspeech-6.7.9999
index d87667170d56..694b66229fb2 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtspeech-6.7.9999
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.9999:6 ~dev-qt/qtmultimedia-6.7.9999:6 flite? ( app-a
 REQUIRED_USE=|| ( flite speechd )
 RESTRICT=test
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=113be18713e4252d1c5964a89c75bb4f
diff --git a/metadata/md5-cache/dev-qt/qtspeech-6.9999 b/metadata/md5-cache/dev-qt/qtspeech-6.9999
index d3641fc5d7ae..e722486e5790 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-6.9999
+++ b/metadata/md5-cache/dev-qt/qtspeech-6.9999
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.9999:6 ~dev-qt/qtmultimedia-6.9999:6 flite? ( app-acces
 REQUIRED_USE=|| ( flite speechd )
 RESTRICT=test
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=113be18713e4252d1c5964a89c75bb4f
diff --git a/metadata/md5-cache/dev-qt/qtsvg-6.7.0 b/metadata/md5-cache/dev-qt/qtsvg-6.7.0
index da57f9a2b7ce..ad64aab7dfd1 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-6.7.0
+++ b/metadata/md5-cache/dev-qt/qtsvg-6.7.0
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.0:6[gui,widgets] sys-libs/zlib:=
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtsvg-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e069a02e79c5fc6d9dd01a74de22f99c
diff --git a/metadata/md5-cache/dev-qt/qtsvg-6.7.1 b/metadata/md5-cache/dev-qt/qtsvg-6.7.1
index 8e6ee124c5af..20621a1a569f 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtsvg-6.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=test
-KEYWORDS=~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6[gui,widgets] sys-libs/zlib:=
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtsvg-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ae645b107c4c297f0bf04a284038c37e
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=27a7aa897ecbbaa77959cc490db52692
diff --git a/metadata/md5-cache/dev-qt/qtsvg-6.7.9999 b/metadata/md5-cache/dev-qt/qtsvg-6.7.9999
index 791b6fd7dd27..d8baab49363c 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtsvg-6.7.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.7.9999:6[gui,widgets] sys-libs/zlib:=
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=092e0a7b1575273142bdb49e818aca78
diff --git a/metadata/md5-cache/dev-qt/qtsvg-6.9999 b/metadata/md5-cache/dev-qt/qtsvg-6.9999
index 7a4838a8ac7a..ef7f3a30d7cd 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-6.9999
+++ b/metadata/md5-cache/dev-qt/qtsvg-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[gui,widgets] sys-libs/zlib:=
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=092e0a7b1575273142bdb49e818aca78
diff --git a/metadata/md5-cache/dev-qt/qttools-6.7.0 b/metadata/md5-cache/dev-qt/qttools-6.7.0
index aa1a3d2be2be..18ac44f384f5 100644
--- a/metadata/md5-cache/dev-qt/qttools-6.7.0
+++ b/metadata/md5-cache/dev-qt/qttools-6.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=assistant? ( widgets ) clang? ( ^^ ( llvm_slot_15 llvm_slot_16 llvm
 RESTRICT=test
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qttools-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=42720e55200dc024abba58263049cff8
diff --git a/metadata/md5-cache/dev-qt/qttools-6.7.1 b/metadata/md5-cache/dev-qt/qttools-6.7.1
index c4571741d527..445d29943679 100644
--- a/metadata/md5-cache/dev-qt/qttools-6.7.1
+++ b/metadata/md5-cache/dev-qt/qttools-6.7.1
@@ -6,12 +6,12 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=desktop llvm-r1 optfeature qt6-build
 IUSE=+assistant clang designer distancefieldgenerator gles2-only +linguist opengl pixeltool +qdbus qdoc qml qtattributionsscanner qtdiag qtplugininfo vulkan +widgets zstd +llvm_slot_17 llvm_slot_15 llvm_slot_16 llvm_slot_18
-KEYWORDS=~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6[network,widgets?] assistant? ( ~dev-qt/qtbase-6.7.1:6[sql,sqlite] ) clang? ( llvm_slot_15? ( sys-devel/clang:15= sys-devel/llvm:15= ) llvm_slot_16? ( sys-devel/clang:16= sys-devel/llvm:16= ) llvm_slot_17? ( sys-devel/clang:17= sys-devel/llvm:17= ) llvm_slot_18? ( sys-devel/clang:18= sys-devel/llvm:18= ) ) designer? ( ~dev-qt/qtbase-6.7.1:6[xml,zstd=] zstd? ( app-arch/zstd:= ) ) qdbus? ( ~dev-qt/qtbase-6.7.1:6[dbus,xml] ) qml? ( ~dev-qt/qtdeclarative-6.7.1:6[widgets?] ) qtdiag? ( ~dev-qt/qtbase-6.7.1:6[gles2-only=,vulkan=] ) widgets? ( ~dev-qt/qtbase-6.7.1:6[opengl=] )
 REQUIRED_USE=assistant? ( widgets ) clang? ( ^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 llvm_slot_18 ) ) designer? ( qml widgets ) distancefieldgenerator? ( qml widgets ) pixeltool? ( widgets ) qdoc? ( clang qml )
 RESTRICT=test
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qttools-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=044e966930498d78eb6a12e7b6f6db97
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=c192c2c8da32cbd217b8fee7ff9103ae
diff --git a/metadata/md5-cache/dev-qt/qttools-6.7.9999 b/metadata/md5-cache/dev-qt/qttools-6.7.9999
index 07bbfab3bf01..1e25a6763e68 100644
--- a/metadata/md5-cache/dev-qt/qttools-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qttools-6.7.9999
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.9999:6[network,widgets?] assistant? ( ~dev-qt/qtbase-
 REQUIRED_USE=assistant? ( widgets ) clang? ( ^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 llvm_slot_18 ) ) designer? ( qml widgets ) distancefieldgenerator? ( qml widgets ) pixeltool? ( widgets ) qdoc? ( clang qml )
 RESTRICT=test
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=80f7638f5b515a903a147fbde0ef2943
diff --git a/metadata/md5-cache/dev-qt/qttools-6.9999 b/metadata/md5-cache/dev-qt/qttools-6.9999
index 39dc65c49cad..2a5a29826a1e 100644
--- a/metadata/md5-cache/dev-qt/qttools-6.9999
+++ b/metadata/md5-cache/dev-qt/qttools-6.9999
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.9999:6[network,widgets?] assistant? ( ~dev-qt/qtbase-6.
 REQUIRED_USE=assistant? ( widgets ) clang? ( ^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 llvm_slot_18 ) ) designer? ( qml widgets ) distancefieldgenerator? ( qml widgets ) pixeltool? ( widgets ) qdoc? ( clang qml )
 RESTRICT=test
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=80f7638f5b515a903a147fbde0ef2943
diff --git a/metadata/md5-cache/dev-qt/qttranslations-6.7.0 b/metadata/md5-cache/dev-qt/qttranslations-6.7.0
index b74ab1c896cd..837c0fb870ed 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-6.7.0
+++ b/metadata/md5-cache/dev-qt/qttranslations-6.7.0
@@ -10,5 +10,5 @@ LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RESTRICT=test
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qttranslations-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8d034fb201283a2f1f568dcf2ffb7ea6
diff --git a/metadata/md5-cache/dev-qt/qttranslations-6.7.1 b/metadata/md5-cache/dev-qt/qttranslations-6.7.1
index 0657f3a1f8cd..6c0e1e1284e3 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-6.7.1
+++ b/metadata/md5-cache/dev-qt/qttranslations-6.7.1
@@ -5,10 +5,10 @@ DESCRIPTION=Translation files for the Qt6 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
-KEYWORDS=~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RESTRICT=test
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qttranslations-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e22df1db22007613bea545c8128b373c
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=552b9c7afb1c100c8b1de4068b920ab6
diff --git a/metadata/md5-cache/dev-qt/qttranslations-6.7.9999 b/metadata/md5-cache/dev-qt/qttranslations-6.7.9999
index a22bdd5b4b65..51b5fac3ece9 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qttranslations-6.7.9999
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PROPERTIES=live
 RESTRICT=test
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9fd31e26aacb3e2c9f8a17b0ea445f45
diff --git a/metadata/md5-cache/dev-qt/qttranslations-6.9999 b/metadata/md5-cache/dev-qt/qttranslations-6.9999
index f16d679c7ecc..6ca133a82ee1 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-6.9999
+++ b/metadata/md5-cache/dev-qt/qttranslations-6.9999
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PROPERTIES=live
 RESTRICT=test
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9fd31e26aacb3e2c9f8a17b0ea445f45
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.7.0 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.7.0
index 770b53864f64..29da0b40bf9b 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.7.0
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.7.0
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.0:6[gui] ~dev-qt/qtdeclarative-6.7.0:6 ~dev-qt/qtsvg-
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtvirtualkeyboard-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=4fd48e0bbe892256de2a36a037ac357e
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.7.1 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.7.1
index 95083ef3d910..ed66c2b3e7e5 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=+spell test
-KEYWORDS=~amd64 arm ~arm64 ~loong ~riscv x86
+KEYWORDS=amd64 arm ~arm64 ~loong ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6[gui] ~dev-qt/qtdeclarative-6.7.1:6 ~dev-qt/qtsvg-6.7.1:6 spell? ( app-text/hunspell:= )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtvirtualkeyboard-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e96f6e3d678ab35c6e2ecff5395920bb
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=4bacc8f60f332d446ba37ebf5bda60a7
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.7.9999 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.7.9999
index 6ec79bf8d383..6dd9d0cba1c1 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.7.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.7.9999:6[gui] ~dev-qt/qtdeclarative-6.7.9999:6 ~dev-qt/qtsvg-6.7.9999:6 spell? ( app-text/hunspell:= )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=cf24e6e7b7f36c7596243b50eab6b504
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.9999 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.9999
index 0c625f628f4b..17b1c614b344 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.9999
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[gui] ~dev-qt/qtdeclarative-6.9999:6 ~dev-qt/qtsvg-6.9999:6 spell? ( app-text/hunspell:= )
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=cf24e6e7b7f36c7596243b50eab6b504
diff --git a/metadata/md5-cache/dev-qt/qtwayland-6.7.0 b/metadata/md5-cache/dev-qt/qtwayland-6.7.0
index 12fc9df49f18..eab22aafd82f 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-6.7.0
+++ b/metadata/md5-cache/dev-qt/qtwayland-6.7.0
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/wayland ~dev-qt/qtbase-6.7.0:6[accessibility=,gui,opengl,vulkan
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtwayland-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=fe9f565a24dcf92f4cc8754c801f6621
diff --git a/metadata/md5-cache/dev-qt/qtwayland-6.7.1 b/metadata/md5-cache/dev-qt/qtwayland-6.7.1
index cdf064fcd513..0d5046bc271a 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtwayland-6.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=accessibility compositor qml vulkan test
-KEYWORDS=~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/wayland ~dev-qt/qtbase-6.7.1:6[accessibility=,gui,opengl,vulkan=,wayland] media-libs/libglvnd x11-libs/libxkbcommon compositor? ( qml? ( ~dev-qt/qtdeclarative-6.7.1:6 ) )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtwayland-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fb5c663da0d930b69652e50a06d858d8
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=8a9e9b9993484f8a94d53dd6c2be5adf
diff --git a/metadata/md5-cache/dev-qt/qtwayland-6.7.9999 b/metadata/md5-cache/dev-qt/qtwayland-6.7.9999
index d6e3cd6f8891..51daf8e90490 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtwayland-6.7.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/wayland ~dev-qt/qtbase-6.7.9999:6[accessibility=,gui,opengl,vulkan=,wayland] media-libs/libglvnd x11-libs/libxkbcommon compositor? ( qml? ( ~dev-qt/qtdeclarative-6.7.9999:6 ) )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=578fab809679f0ec04e36f211dd63811
diff --git a/metadata/md5-cache/dev-qt/qtwayland-6.9999 b/metadata/md5-cache/dev-qt/qtwayland-6.9999
index ddcf0e74fc87..93f1de56b8fb 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-6.9999
+++ b/metadata/md5-cache/dev-qt/qtwayland-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/wayland ~dev-qt/qtbase-6.9999:6[accessibility=,gui,opengl,vulkan=,wayland] media-libs/libglvnd x11-libs/libxkbcommon compositor? ( qml? ( ~dev-qt/qtdeclarative-6.9999:6 ) )
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=578fab809679f0ec04e36f211dd63811
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-6.7.0-r1 b/metadata/md5-cache/dev-qt/qtwebchannel-6.7.0-r1
index caec990ac01e..f2b9e275dd90 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-6.7.0-r1
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-6.7.0-r1
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.0:6[concurrent] qml? ( ~dev-qt/qtdeclarative-6.7.0:6
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtwebchannel-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6961b159415ccf87fe4d1f19118148ce
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-6.7.1 b/metadata/md5-cache/dev-qt/qtwebchannel-6.7.1
index c01205fd555c..43bfd80837f9 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-6.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=qml test
-KEYWORDS=~amd64 arm ~arm64 ~loong ~ppc ~riscv x86
+KEYWORDS=amd64 arm ~arm64 ~loong ~ppc ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6[concurrent] qml? ( ~dev-qt/qtdeclarative-6.7.1:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtwebchannel-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0057f6b6f0e9f748c69c11868e11ec69
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=23c09925ec070c64b218382dd6063766
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-6.7.9999 b/metadata/md5-cache/dev-qt/qtwebchannel-6.7.9999
index adb16ea7ee34..3e92f6f4000c 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-6.7.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.7.9999:6[concurrent] qml? ( ~dev-qt/qtdeclarative-6.7.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b0890ae86e6b82d3ff64affc9524ab1b
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-6.9999 b/metadata/md5-cache/dev-qt/qtwebchannel-6.9999
index 4e48e41e23d9..0f2af0be9bfb 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-6.9999
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[concurrent] qml? ( ~dev-qt/qtdeclarative-6.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b0890ae86e6b82d3ff64affc9524ab1b
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-6.7.0 b/metadata/md5-cache/dev-qt/qtwebengine-6.7.0
index 57391b7b2589..bab10a45c06e 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-6.7.0
+++ b/metadata/md5-cache/dev-qt/qtwebengine-6.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=designer? ( qml widgets )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtwebengine-everywhere-src-6.7.0.tar.xz https://dev.gentoo.org/~ionen/distfiles/qtwebengine-6.7-patchset-6.tar.xz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=72a8b6bb6526c56a3d2a092cd852a2c1
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-6.7.1 b/metadata/md5-cache/dev-qt/qtwebengine-6.7.1
index f9c70a429cfc..6df420eae543 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtwebengine-6.7.1
@@ -6,12 +6,12 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=check-reqs flag-o-matic multiprocessing optfeature prefix python-any-r1 qt6-build toolchain-funcs
 IUSE=accessibility +alsa bindist custom-cflags designer geolocation +jumbo-build kerberos opengl pdfium pulseaudio qml screencast +system-icu vaapi vulkan webdriver +widgets test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=app-arch/snappy:= dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/nspr dev-libs/nss ~dev-qt/qtbase-6.7.1:6[accessibility=,gui,opengl=,vulkan?,widgets?] ~dev-qt/qtdeclarative-6.7.1:6[widgets?] ~dev-qt/qtwebchannel-6.7.1:6[qml?] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libwebp:= media-libs/mesa[gbm(+)] media-libs/openjpeg:2= media-libs/opus media-libs/tiff:= sys-apps/dbus sys-apps/pciutils sys-devel/gcc:* sys-libs/zlib:=[minizip] virtual/libudev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libdrm x11-libs/libxcb:= x11-libs/libxkbcommon x11-libs/libxkbfile alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/qttools-6.7.1:6[designer] ) geolocation? ( ~dev-qt/qtpositioning-6.7.1:6 ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse[glib] ) screencast? ( dev-libs/glib:2 media-video/pipewire:= ) system-icu? ( dev-libs/icu:= ) vaapi? ( media-libs/libva:=[X] ) !vaapi? ( media-libs/libvpx:= )
 REQUIRED_USE=designer? ( qml widgets )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtwebengine-everywhere-src-6.7.1.tar.xz https://dev.gentoo.org/~ionen/distfiles/qtwebengine-6.7-patchset-8.tar.xz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=edea8e84ad66efd457d364730b71b563
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=0fa99418f89b1fbf73d92621ccb7614d
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-6.7.9999 b/metadata/md5-cache/dev-qt/qtwebengine-6.7.9999
index a69324d5da9c..ef0e5e641a57 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtwebengine-6.7.9999
@@ -13,5 +13,5 @@ REQUIRED_USE=designer? ( qml widgets )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
 SRC_URI=https://dev.gentoo.org/~ionen/distfiles/qtwebengine-6.7-patchset-8.tar.xz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=edea8e84ad66efd457d364730b71b563
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-6.9999 b/metadata/md5-cache/dev-qt/qtwebengine-6.9999
index af9d83195ad1..ef94f8333848 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-6.9999
+++ b/metadata/md5-cache/dev-qt/qtwebengine-6.9999
@@ -13,5 +13,5 @@ REQUIRED_USE=designer? ( qml widgets )
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
 SRC_URI=https://dev.gentoo.org/~ionen/distfiles/qtwebengine-6.7-patchset-8.tar.xz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=edea8e84ad66efd457d364730b71b563
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-6.7.0 b/metadata/md5-cache/dev-qt/qtwebsockets-6.7.0
index 962465bc2d0b..f3cb1b2f0112 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-6.7.0
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-6.7.0
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.0:6[network,ssl=] qml? ( ~dev-qt/qtdeclarative-6.7.0:
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtwebsockets-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c6ec5718cce350862e5a5d6f56455144
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-6.7.1 b/metadata/md5-cache/dev-qt/qtwebsockets-6.7.1
index ab17d0b87533..38e9213037c8 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-6.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=qml +ssl test
-KEYWORDS=~amd64 arm ~arm64 ~hppa ~loong ~ppc ~riscv x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~loong ~ppc ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6[network,ssl=] qml? ( ~dev-qt/qtdeclarative-6.7.1:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtwebsockets-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9549e4fac4b82380b75e3a0512d9cfcc
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=444fd72466a1b677d0488d9ce442b7ec
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-6.7.9999 b/metadata/md5-cache/dev-qt/qtwebsockets-6.7.9999
index 99eb35c06f00..56a666e04ccc 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-6.7.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.7.9999:6[network,ssl=] qml? ( ~dev-qt/qtdeclarative-6.7.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6f80d5d1c88c24da15fce15d5eb1037c
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-6.9999 b/metadata/md5-cache/dev-qt/qtwebsockets-6.9999
index 5537a9f9f37b..98ba4dd8aa62 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-6.9999
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[network,ssl=] qml? ( ~dev-qt/qtdeclarative-6.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6f80d5d1c88c24da15fce15d5eb1037c
diff --git a/metadata/md5-cache/dev-qt/qtwebview-6.7.0 b/metadata/md5-cache/dev-qt/qtwebview-6.7.0
index fd5552ac41c6..81e4beaff0ae 100644
--- a/metadata/md5-cache/dev-qt/qtwebview-6.7.0
+++ b/metadata/md5-cache/dev-qt/qtwebview-6.7.0
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.7.0:6[gui] ~dev-qt/qtdeclarative-6.7.0:6 ~dev-qt/qtwebe
 RESTRICT=!test? ( test )
 SLOT=6/6.7.0
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtwebview-everywhere-src-6.7.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=782e329ecb084eaf9cc7feed5719cec6
diff --git a/metadata/md5-cache/dev-qt/qtwebview-6.7.1 b/metadata/md5-cache/dev-qt/qtwebview-6.7.1
index bd2862479614..14a8c6114b9d 100644
--- a/metadata/md5-cache/dev-qt/qtwebview-6.7.1
+++ b/metadata/md5-cache/dev-qt/qtwebview-6.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.7.1:6[gui] ~dev-qt/qtdeclarative-6.7.1:6 ~dev-qt/qtwebengine-6.7.1:6[qml]
 RESTRICT=!test? ( test )
 SLOT=6/6.7.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtwebview-everywhere-src-6.7.1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e4f78dbb188c4f5ed13d0673b4e9bd07
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=782e329ecb084eaf9cc7feed5719cec6
diff --git a/metadata/md5-cache/dev-qt/qtwebview-6.7.9999 b/metadata/md5-cache/dev-qt/qtwebview-6.7.9999
index 81598866845c..18d41228d585 100644
--- a/metadata/md5-cache/dev-qt/qtwebview-6.7.9999
+++ b/metadata/md5-cache/dev-qt/qtwebview-6.7.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.7.9999:6[gui] ~dev-qt/qtdeclarative-6.7.9999:6 ~dev-qt/qtwebengine-6.7.9999:6[qml]
 RESTRICT=!test? ( test )
 SLOT=6/6.7.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e4f78dbb188c4f5ed13d0673b4e9bd07
diff --git a/metadata/md5-cache/dev-qt/qtwebview-6.9999 b/metadata/md5-cache/dev-qt/qtwebview-6.9999
index 567cf1154381..b946050c6df7 100644
--- a/metadata/md5-cache/dev-qt/qtwebview-6.9999
+++ b/metadata/md5-cache/dev-qt/qtwebview-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[gui] ~dev-qt/qtdeclarative-6.9999:6 ~dev-qt/qtwebengine-6.9999:6[qml]
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	3960a31b5c28ef4081d93cf409b9b303	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	77071bdf1dd7847c89d3f7de5ea76787	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e4f78dbb188c4f5ed13d0673b4e9bd07
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 84cd3546fc54..f5a78c09d0a0 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/childprocess-5.0.0 b/metadata/md5-cache/dev-ruby/childprocess-5.0.0
index f81bc4c6ac75..afd5fd11e9cc 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-5.0.0
+++ b/metadata/md5-cache/dev-ruby/childprocess-5.0.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/enkessler/childprocess
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby31? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby33(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/childprocess-5.0.0.gem
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a2b0371b3fc760998be767e7b51ee8a6
+_md5_=3ba92b48c0108df5ef1c493aed88adb2
diff --git a/metadata/md5-cache/dev-ruby/commander-4.6.0-r1 b/metadata/md5-cache/dev-ruby/commander-4.6.0-r1
new file mode 100644
index 000000000000..692e451326ca
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/commander-4.6.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby31? ( dev-ruby/highline:2[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/highline:2[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=The complete solution for Ruby command-line executables
+EAPI=7
+HOMEPAGE=https://github.com/commander-rb/commander
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby31? ( dev-ruby/highline:2[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/highline:2[ruby_targets_ruby32(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/commander-4.6.0.gem
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=0ac865bee83b4a36380e1025c54446b4
diff --git a/metadata/md5-cache/dev-ruby/commander-5.0.0 b/metadata/md5-cache/dev-ruby/commander-5.0.0
new file mode 100644
index 000000000000..f3ab947d7456
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/commander-5.0.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby31? ( !<dev-ruby/commander-4.6.0-r1:0[ruby_targets_ruby31(-)] dev-ruby/highline:3[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( !<dev-ruby/commander-4.6.0-r1:0[ruby_targets_ruby32(-)] dev-ruby/highline:3[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( !<dev-ruby/commander-4.6.0-r1:0[ruby_targets_ruby33(-)] dev-ruby/highline:3[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+DESCRIPTION=The complete solution for Ruby command-line executables
+EAPI=8
+HOMEPAGE=https://github.com/commander-rb/commander
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby31? ( !<dev-ruby/commander-4.6.0-r1:0[ruby_targets_ruby31(-)] dev-ruby/highline:3[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( !<dev-ruby/commander-4.6.0-r1:0[ruby_targets_ruby32(-)] dev-ruby/highline:3[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( !<dev-ruby/commander-4.6.0-r1:0[ruby_targets_ruby33(-)] dev-ruby/highline:3[ruby_targets_ruby33(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/commander-5.0.0.gem
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=c9e493aad61394f642935032c6b55ec7
diff --git a/metadata/md5-cache/dev-ruby/curb-1.0.5 b/metadata/md5-cache/dev-ruby/curb-1.0.5
index 6e7b15aa820a..94162a0142b2 100644
--- a/metadata/md5-cache/dev-ruby/curb-1.0.5
+++ b/metadata/md5-cache/dev-ruby/curb-1.0.5
@@ -1,11 +1,11 @@
-BDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rake[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) ) virtual/pkgconfig
+BDEPEND=ruby_targets_ruby31? ( test? ( dev-ruby/webrick[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/webrick[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/webrick[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rake[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=net-misc/curl[ssl] test? ( net-misc/curl ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
 DESCRIPTION=Ruby-language bindings for libcurl
 EAPI=8
 HOMEPAGE=https://github.com/taf2/curb
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
+IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
 KEYWORDS=amd64
 LICENSE=Ruby
 RDEPEND=net-misc/curl[ssl] ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/curb-1.0.5.gem
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a0e620f69121bbf228c4c69c60a720ea
+_md5_=86e964df9dd7968c1926427d38a19f10
diff --git a/metadata/md5-cache/dev-ruby/delayer-1.2.1 b/metadata/md5-cache/dev-ruby/delayer-1.2.1
deleted file mode 100644
index 0004319b74a3..000000000000
--- a/metadata/md5-cache/dev-ruby/delayer-1.2.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-DESCRIPTION=Delay the processing
-EAPI=7
-HOMEPAGE=https://rubygems.org/gems/delayer
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=1
-SRC_URI=https://rubygems.org/gems/delayer-1.2.1.gem
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=7471702e9a95e5a89a11463da19bba4c
diff --git a/metadata/md5-cache/dev-ruby/diva-1.1.1-r1 b/metadata/md5-cache/dev-ruby/diva-1.1.1-r1
deleted file mode 100644
index fd3492e9e163..000000000000
--- a/metadata/md5-cache/dev-ruby/diva-1.1.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby31? ( <dev-ruby/addressable-2.9[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( <dev-ruby/addressable-2.9[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-DESCRIPTION=Implementation of expression for handling things
-EAPI=8
-HOMEPAGE=https://github.com/toshia/diva https://rubygems.org/gems/diva
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby31? ( <dev-ruby/addressable-2.9[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( <dev-ruby/addressable-2.9[ruby_targets_ruby32(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/toshia/diva/archive/v1.1.1.tar.gz -> diva-1.1.1.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=8ad4a3109c8a8d47e8e47e0b5a9ba550
diff --git a/metadata/md5-cache/dev-ruby/drb-2.2.1 b/metadata/md5-cache/dev-ruby/drb-2.2.1
index c8a4c1bc9c26..9dc260c1a765 100644
--- a/metadata/md5-cache/dev-ruby/drb-2.2.1
+++ b/metadata/md5-cache/dev-ruby/drb-2.2.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby31? ( dev-ruby/ruby2_keywords[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/ruby2_keywords[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( dev-ruby/ruby2_keywords[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rake[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby31? ( dev-ruby/ruby2_keywords[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/ruby2_keywords[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( dev-ruby/ruby2_keywords[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/test-unit[ruby_targets_ruby31(-)] dev-ruby/test-unit-ruby-core[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/test-unit[ruby_targets_ruby32(-)] dev-ruby/test-unit-ruby-core[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/test-unit[ruby_targets_ruby33(-)] dev-ruby/test-unit-ruby-core[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rake[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
 DESCRIPTION=Distributed object system for Ruby
@@ -10,8 +10,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby31? ( dev-ruby/ruby2_keywords[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/ruby2_keywords[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( dev-ruby/ruby2_keywords[ruby_targets_ruby33(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/drb/archive/v2.2.1.tar.gz -> drb-2.2.1.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=47155ffb274ac2db70e59df9d2e37ded
+_md5_=6e4a5c1b5ec317fbc499ef6d1f1f136a
diff --git a/metadata/md5-cache/dev-ruby/ethon-0.16.0 b/metadata/md5-cache/dev-ruby/ethon-0.16.0
index bf8dc348dcaa..676487a0bb01 100644
--- a/metadata/md5-cache/dev-ruby/ethon-0.16.0
+++ b/metadata/md5-cache/dev-ruby/ethon-0.16.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby31? ( >=dev-ruby/ffi-1.15.0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/ffi-1.15.0[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( >=dev-ruby/ffi-1.15.0[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/sinatra[ruby_targets_ruby31(-)] dev-ruby/mime-types[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/sinatra[ruby_targets_ruby32(-)] dev-ruby/mime-types[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/sinatra[ruby_targets_ruby33(-)] dev-ruby/mime-types[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby31? ( >=dev-ruby/ffi-1.15.0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/ffi-1.15.0[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( >=dev-ruby/ffi-1.15.0[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( || ( dev-ruby/rackup[ruby_targets_ruby31(-)] dev-ruby/rack:2.2[ruby_targets_ruby31(-)] ) dev-ruby/sinatra[ruby_targets_ruby31(-)] dev-ruby/mime-types[ruby_targets_ruby31(-)] dev-ruby/webrick[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( || ( dev-ruby/rackup[ruby_targets_ruby32(-)] dev-ruby/rack:2.2[ruby_targets_ruby32(-)] ) dev-ruby/sinatra[ruby_targets_ruby32(-)] dev-ruby/mime-types[ruby_targets_ruby32(-)] dev-ruby/webrick[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( || ( dev-ruby/rackup[ruby_targets_ruby33(-)] dev-ruby/rack:2.2[ruby_targets_ruby33(-)] ) dev-ruby/sinatra[ruby_targets_ruby33(-)] dev-ruby/mime-types[ruby_targets_ruby33(-)] dev-ruby/webrick[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
 DESCRIPTION=Very lightweight libcurl wrapper
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ethon-0.16.0.gem
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=d6542c4a796c5a06c92b225bfc041fc5
+_md5_=187f82a3830cfe4c4335ae21820d3712
diff --git a/metadata/md5-cache/dev-ruby/fakefs-1.9.0 b/metadata/md5-cache/dev-ruby/fakefs-1.9.0
index b746aa44e355..dfe6845d68ca 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-1.9.0
+++ b/metadata/md5-cache/dev-ruby/fakefs-1.9.0
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby31? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby31(-)] >=dev-ruby/maxitest-3.6:1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby32(-)] >=dev-ruby/maxitest-3.6:1[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+BDEPEND=ruby_targets_ruby31? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby31(-)] >=dev-ruby/maxitest-3.6:1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby32(-)] >=dev-ruby/maxitest-3.6:1[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby33(-)] >=dev-ruby/maxitest-3.6:1[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
 DESCRIPTION=A fake filesystem. Use it in your tests
 EAPI=8
 HOMEPAGE=https://github.com/defunkt/fakefs
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby31 ruby_targets_ruby32 doc test
+IUSE=ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test
 KEYWORDS=amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
+RDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/defunkt/fakefs/archive/v1.9.0.tar.gz -> fakefs-1.9.0.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=6d4940a059e94ff9672cc122ecb6f466
+_md5_=c0b559826919fd54ba16ee06b5cbfb1d
diff --git a/metadata/md5-cache/dev-ruby/fakefs-2.5.0 b/metadata/md5-cache/dev-ruby/fakefs-2.5.0
index b17936a6e0e3..9b789b1c3171 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-2.5.0
+++ b/metadata/md5-cache/dev-ruby/fakefs-2.5.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fakefs/fakefs/archive/v2.5.0.tar.gz -> fakefs-2.5.0.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=ee8f6f237160f92c779d1442181e7631
+_md5_=c6cceca520feaca94c2be155a62717d8
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-2.2.0 b/metadata/md5-cache/dev-ruby/fast_gettext-2.2.0
deleted file mode 100644
index 19e7ce4847a2..000000000000
--- a/metadata/md5-cache/dev-ruby/fast_gettext-2.2.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby31? ( test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/bundler[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-DESCRIPTION=GetText but 3.5x faster, 560x less memory, clean namespace and threadsafe!
-EAPI=8
-HOMEPAGE=https://github.com/grosser/fast_gettext
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby31 ruby_targets_ruby32 test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
-LICENSE=public-domain
-RDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://github.com/grosser/fast_gettext/archive/v2.2.0.tar.gz -> fast_gettext-2.2.0.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=411ba557d939e35486d47eaeec684614
diff --git a/metadata/md5-cache/dev-ruby/ffaker-2.21.0 b/metadata/md5-cache/dev-ruby/ffaker-2.21.0
deleted file mode 100644
index ff7c61b3bb7f..000000000000
--- a/metadata/md5-cache/dev-ruby/ffaker-2.21.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby31? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-DESCRIPTION=Faster Faker, generates dummy data
-EAPI=8
-HOMEPAGE=https://github.com/emmanueloga/ffaker
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/ffaker-2.21.0.gem
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c3a5611c56d7017f0de5b75693833fe7
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.15.5-r1 b/metadata/md5-cache/dev-ruby/ffi-1.15.5-r1
deleted file mode 100644
index e288cfe00df9..000000000000
--- a/metadata/md5-cache/dev-ruby/ffi-1.15.5-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby31? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/libffi:= ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-DESCRIPTION=Ruby extension for programmatically loading dynamic libraries
-EAPI=8
-HOMEPAGE=https://github.com/ffi/ffi/wiki
-INHERIT=ruby-fakegem toolchain-funcs
-IUSE=ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=dev-libs/libffi:= ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ffi/ffi/archive/v1.15.5.tar.gz -> ffi-git-1.15.5.tgz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=5e91b5f5aa10367ef20b13ad23b0c431
diff --git a/metadata/md5-cache/dev-ruby/globalid-1.1.0-r1 b/metadata/md5-cache/dev-ruby/globalid-1.1.0-r1
deleted file mode 100644
index 062dce3fbf82..000000000000
--- a/metadata/md5-cache/dev-ruby/globalid-1.1.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby31? ( test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] >=dev-ruby/activemodel-5.0[ruby_targets_ruby31(-)] >=dev-ruby/railties-5.0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/bundler[ruby_targets_ruby32(-)] >=dev-ruby/activemodel-5.0[ruby_targets_ruby32(-)] >=dev-ruby/railties-5.0[ruby_targets_ruby32(-)] ) ) test? ( ruby_targets_ruby31? ( >=dev-ruby/activesupport-5.0:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/activesupport-5.0:*[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-DESCRIPTION=Reference models by URI
-EAPI=8
-HOMEPAGE=https://github.com/rails/globalid
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby31? ( >=dev-ruby/activesupport-5.0:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/activesupport-5.0:*[ruby_targets_ruby32(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/rails/globalid/archive/v1.1.0.tar.gz -> globalid-1.1.0.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=8a64937afec14bf3558e55fff8c44d12
diff --git a/metadata/md5-cache/dev-ruby/haml-6.1.1-r1 b/metadata/md5-cache/dev-ruby/haml-6.1.1-r1
deleted file mode 100644
index 0b9e5aa0af2f..000000000000
--- a/metadata/md5-cache/dev-ruby/haml-6.1.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby31? ( >=dev-ruby/temple-0.8.2[ruby_targets_ruby31(-)] dev-ruby/thor[ruby_targets_ruby31(-)] dev-ruby/tilt:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/temple-0.8.2[ruby_targets_ruby32(-)] dev-ruby/thor[ruby_targets_ruby32(-)] dev-ruby/tilt:*[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest:5.15[ruby_targets_ruby31(-)] dev-ruby/nokogiri[ruby_targets_ruby31(-)] >=dev-ruby/railties-6.0[ruby_targets_ruby31(-)] >=dev-ruby/activemodel-6.0[ruby_targets_ruby31(-)] >=dev-ruby/actionpack-6.0[ruby_targets_ruby31(-)] dev-ruby/unindent[ruby_targets_ruby31(-)] ) doc? ( dev-ruby/yard[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/minitest:5.15[ruby_targets_ruby32(-)] dev-ruby/nokogiri[ruby_targets_ruby32(-)] >=dev-ruby/railties-6.0[ruby_targets_ruby32(-)] >=dev-ruby/activemodel-6.0[ruby_targets_ruby32(-)] >=dev-ruby/actionpack-6.0[ruby_targets_ruby32(-)] dev-ruby/unindent[ruby_targets_ruby32(-)] ) doc? ( dev-ruby/yard[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-DESCRIPTION=A ruby web page templating engine
-EAPI=8
-HOMEPAGE=https://haml.info/
-INHERIT=ruby-fakegem
-IUSE=doc test test ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby31? ( >=dev-ruby/temple-0.8.2[ruby_targets_ruby31(-)] dev-ruby/thor[ruby_targets_ruby31(-)] dev-ruby/tilt:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/temple-0.8.2[ruby_targets_ruby32(-)] dev-ruby/thor[ruby_targets_ruby32(-)] dev-ruby/tilt:*[ruby_targets_ruby32(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6
-SRC_URI=https://github.com/haml/haml/archive/v6.1.1.tar.gz -> haml-6.1.1.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a1a37bcb90376c466d0ce154d93fc455
diff --git a/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r2 b/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r2
deleted file mode 100644
index 3dd6aeac99d2..000000000000
--- a/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby31? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-DESCRIPTION=Internal HashiCorp service to check version information
-EAPI=8
-HOMEPAGE=https://www.hashicorp.com
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/hashicorp-checkpoint-0.1.5.gem
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=d3d368f226a5f779f34e30b8de69df2c
diff --git a/metadata/md5-cache/dev-ruby/http-cookie-1.0.6 b/metadata/md5-cache/dev-ruby/http-cookie-1.0.6
new file mode 100644
index 000000000000..17b19dbdbc51
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/http-cookie-1.0.6
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby31? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rake[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+DESCRIPTION=A ruby library to handle HTTP cookies
+EAPI=8
+HOMEPAGE=https://github.com/sparklemotion/http-cookie
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby31? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby33(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/http-cookie-1.0.6.gem
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=824ea7bb2363c5fc48e4f95c1f9483cc
diff --git a/metadata/md5-cache/dev-ruby/introspection-0.0.4-r1 b/metadata/md5-cache/dev-ruby/introspection-0.0.4-r1
deleted file mode 100644
index 21086401ec5f..000000000000
--- a/metadata/md5-cache/dev-ruby/introspection-0.0.4-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby31? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/blankslate[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/blankslate[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-DESCRIPTION=Dynamic inspection of the hierarchy of method definitions on a Ruby object
-EAPI=7
-HOMEPAGE=http://jamesmead.org/
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby31? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby32(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/introspection-0.0.4.gem
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=ae7f452fc19bc4c2b032befb966ae991
diff --git a/metadata/md5-cache/dev-ruby/io-event-1.3.2 b/metadata/md5-cache/dev-ruby/io-event-1.3.2
deleted file mode 100644
index 4de1adb10e43..000000000000
--- a/metadata/md5-cache/dev-ruby/io-event-1.3.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/sus[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/sus[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=io-uring? ( sys-libs/liburing:= ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-DESCRIPTION=An event loop
-EAPI=8
-HOMEPAGE=https://github.com/socketry/io-event
-INHERIT=ruby-fakegem
-IUSE=+io-uring ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=io-uring? ( sys-libs/liburing:= ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=1.3
-SRC_URI=https://github.com/socketry/io-event/archive/v1.3.2.tar.gz -> io-event-1.3.2.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=31b4ae0a1863e3b51c49a310a0b565cb
diff --git a/metadata/md5-cache/dev-ruby/io-event-1.4.0 b/metadata/md5-cache/dev-ruby/io-event-1.4.0
deleted file mode 100644
index 43bc9fc36137..000000000000
--- a/metadata/md5-cache/dev-ruby/io-event-1.4.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/sus[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/sus[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/sus[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=io-uring? ( sys-libs/liburing:= ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
-DESCRIPTION=An event loop
-EAPI=8
-HOMEPAGE=https://github.com/socketry/io-event
-INHERIT=ruby-fakegem
-IUSE=+io-uring ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=io-uring? ( sys-libs/liburing:= ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=1
-SRC_URI=https://github.com/socketry/io-event/archive/v1.4.0.tar.gz -> io-event-1.4.0.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=b18de967d06545adffbc974d7cc36a51
diff --git a/metadata/md5-cache/dev-ruby/jbuilder-2.11.5 b/metadata/md5-cache/dev-ruby/jbuilder-2.11.5
deleted file mode 100644
index a59dc48e8706..000000000000
--- a/metadata/md5-cache/dev-ruby/jbuilder-2.11.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby31? ( >=dev-ruby/activesupport-5.0.0:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/activesupport-5.0.0:*[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( >=dev-ruby/activesupport-5.0.0:*[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/activemodel-5.0.0[ruby_targets_ruby31(-)] >=dev-ruby/railties-5.0.0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( >=dev-ruby/activemodel-5.0.0[ruby_targets_ruby32(-)] >=dev-ruby/railties-5.0.0[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( >=dev-ruby/activemodel-5.0.0[ruby_targets_ruby33(-)] >=dev-ruby/railties-5.0.0[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rake[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
-DESCRIPTION=Create JSON structures via a Builder-style DSL
-EAPI=8
-HOMEPAGE=https://github.com/rails/jbuilder
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby31? ( >=dev-ruby/activesupport-5.0.0:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/activesupport-5.0.0:*[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( >=dev-ruby/activesupport-5.0.0:*[ruby_targets_ruby33(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://rubygems.org/gems/jbuilder-2.11.5.gem
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=7bfea9fd185285194b16900fe4bf0d82
diff --git a/metadata/md5-cache/dev-ruby/jbuilder-2.12.0 b/metadata/md5-cache/dev-ruby/jbuilder-2.12.0
index 91d9aabf94ec..6e3fc402e4a9 100644
--- a/metadata/md5-cache/dev-ruby/jbuilder-2.12.0
+++ b/metadata/md5-cache/dev-ruby/jbuilder-2.12.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby31? ( || ( dev-ruby/activesupport:7.1[ruby_targets_ruby31(-)] dev-ruby/activesupport:7.0[ruby_targets_ruby31(-)] dev-ruby/activesupport:6.1[ruby_targets_ruby31(-)] ) || ( dev-ruby/actionview:7.1[ruby_targets_ruby31(-)] dev-ruby/actionview:7.0[ruby_targets_ruby31(-)] dev-ruby/actionview:6.1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( || ( dev-ruby/activesupport:7.1[ruby_targets_ruby32(-)] dev-ruby/activesupport:7.0[ruby_targets_ruby32(-)] dev-ruby/activesupport:6.1[ruby_targets_ruby32(-)] ) || ( dev-ruby/actionview:7.1[ruby_targets_ruby32(-)] dev-ruby/actionview:7.0[ruby_targets_ruby32(-)] dev-ruby/actionview:6.1[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( || ( dev-ruby/activesupport:7.1[ruby_targets_ruby33(-)] dev-ruby/activesupport:7.0[ruby_targets_ruby33(-)] dev-ruby/activesupport:6.1[ruby_targets_ruby33(-)] ) || ( dev-ruby/actionview:7.1[ruby_targets_ruby33(-)] dev-ruby/actionview:7.0[ruby_targets_ruby33(-)] dev-ruby/actionview:6.1[ruby_targets_ruby33(-)] ) ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/activemodel-5.0.0[ruby_targets_ruby31(-)] >=dev-ruby/railties-5.0.0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( >=dev-ruby/activemodel-5.0.0[ruby_targets_ruby32(-)] >=dev-ruby/railties-5.0.0[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( >=dev-ruby/activemodel-5.0.0[ruby_targets_ruby33(-)] >=dev-ruby/railties-5.0.0[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rake[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby31? ( || ( dev-ruby/activesupport:7.1[ruby_targets_ruby31(-)] dev-ruby/activesupport:7.0[ruby_targets_ruby31(-)] dev-ruby/activesupport:6.1[ruby_targets_ruby31(-)] ) || ( dev-ruby/actionview:7.1[ruby_targets_ruby31(-)] dev-ruby/actionview:7.0[ruby_targets_ruby31(-)] dev-ruby/actionview:6.1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( || ( dev-ruby/activesupport:7.1[ruby_targets_ruby32(-)] dev-ruby/activesupport:7.0[ruby_targets_ruby32(-)] dev-ruby/activesupport:6.1[ruby_targets_ruby32(-)] ) || ( dev-ruby/actionview:7.1[ruby_targets_ruby32(-)] dev-ruby/actionview:7.0[ruby_targets_ruby32(-)] dev-ruby/actionview:6.1[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( || ( dev-ruby/activesupport:7.1[ruby_targets_ruby33(-)] dev-ruby/activesupport:7.0[ruby_targets_ruby33(-)] dev-ruby/activesupport:6.1[ruby_targets_ruby33(-)] ) || ( dev-ruby/actionview:7.1[ruby_targets_ruby33(-)] dev-ruby/actionview:7.0[ruby_targets_ruby33(-)] dev-ruby/actionview:6.1[ruby_targets_ruby33(-)] ) ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/activemodel-5.0.0[ruby_targets_ruby31(-)] >=dev-ruby/railties-5.0.0[ruby_targets_ruby31(-)] dev-ruby/mocha:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( >=dev-ruby/activemodel-5.0.0[ruby_targets_ruby32(-)] >=dev-ruby/railties-5.0.0[ruby_targets_ruby32(-)] dev-ruby/mocha:2[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( >=dev-ruby/activemodel-5.0.0[ruby_targets_ruby33(-)] >=dev-ruby/railties-5.0.0[ruby_targets_ruby33(-)] dev-ruby/mocha:2[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rake[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
 DESCRIPTION=Create JSON structures via a Builder-style DSL
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/jbuilder-2.12.0.gem
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=e0f3ae55e0b7604645483b407baa171c
+_md5_=eb5d3b54b1690b6b9161bc174e95b3fd
diff --git a/metadata/md5-cache/dev-ruby/json-2.7.1-r1 b/metadata/md5-cache/dev-ruby/json-2.7.1-r1
deleted file mode 100644
index e1a963bd9fc2..000000000000
--- a/metadata/md5-cache/dev-ruby/json-2.7.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby31? ( dev-ruby/rake[ruby_targets_ruby31(-)] doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby31(-)] dev-ruby/test-unit-ruby-core[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( dev-ruby/rake[ruby_targets_ruby32(-)] doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby32(-)] dev-ruby/test-unit-ruby-core[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( dev-ruby/rake[ruby_targets_ruby33(-)] doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby33(-)] dev-ruby/test-unit-ruby-core[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rake[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/ragel ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
-DESCRIPTION=A JSON implementation as a Ruby extension
-EAPI=8
-HOMEPAGE=https://github.com/flori/json
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=|| ( BSD-2 Ruby )
-RDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://github.com/flori/json/archive/v2.7.1.tar.gz -> json-2.7.1.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=b5e462a785f8c844aba30596d20c2ad6
diff --git a/metadata/md5-cache/dev-ruby/jwt-2.7.0 b/metadata/md5-cache/dev-ruby/jwt-2.7.0
deleted file mode 100644
index 1a6d590f6e05..000000000000
--- a/metadata/md5-cache/dev-ruby/jwt-2.7.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby31? ( test? ( dev-ruby/rbnacl[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rbnacl[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-DESCRIPTION=A Ruby implementation of JSON Web Token draft 06
-EAPI=8
-HOMEPAGE=https://github.com/jwt/ruby-jwt
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://github.com/jwt/ruby-jwt/archive/v2.7.0.tar.gz -> jwt-2.7.0.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=3fdf676aaca5b98e26ddbb8eaf3ae545
diff --git a/metadata/md5-cache/dev-ruby/jwt-2.8.0 b/metadata/md5-cache/dev-ruby/jwt-2.8.0
deleted file mode 100644
index 5811324a5cf7..000000000000
--- a/metadata/md5-cache/dev-ruby/jwt-2.8.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby31? ( test? ( dev-ruby/rbnacl[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rbnacl[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rbnacl[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
-DESCRIPTION=A Ruby implementation of JSON Web Token draft 06
-EAPI=8
-HOMEPAGE=https://github.com/jwt/ruby-jwt
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://github.com/jwt/ruby-jwt/archive/v2.8.0.tar.gz -> jwt-2.8.0.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=7ff74214b7e1dc26faf9c393eef64baa
diff --git a/metadata/md5-cache/dev-ruby/mini_portile2-2.8.7 b/metadata/md5-cache/dev-ruby/mini_portile2-2.8.7
new file mode 100644
index 000000000000..007c098e5e25
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mini_portile2-2.8.7
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-build/cmake ) ruby_targets_ruby31? ( test? ( dev-ruby/minitar[ruby_targets_ruby31(-)] dev-ruby/minitest-hooks[ruby_targets_ruby31(-)] dev-ruby/net-ftp[ruby_targets_ruby31(-)] dev-ruby/webrick[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/minitar[ruby_targets_ruby32(-)] dev-ruby/minitest-hooks[ruby_targets_ruby32(-)] dev-ruby/net-ftp[ruby_targets_ruby32(-)] dev-ruby/webrick[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/minitar[ruby_targets_ruby33(-)] dev-ruby/minitest-hooks[ruby_targets_ruby33(-)] dev-ruby/net-ftp[ruby_targets_ruby33(-)] dev-ruby/webrick[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rake[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+DESCRIPTION=Simplistic port-like solution for developers
+EAPI=8
+HOMEPAGE=https://github.com/flavorjones/mini_portile
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2.8
+SRC_URI=https://rubygems.org/gems/mini_portile2-2.8.7.gem
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=a630e4c4d055048d5bd15d727c72988b
diff --git a/metadata/md5-cache/dev-ruby/net-ftp-0.2.0 b/metadata/md5-cache/dev-ruby/net-ftp-0.2.0
deleted file mode 100644
index 5c24f242f34c..000000000000
--- a/metadata/md5-cache/dev-ruby/net-ftp-0.2.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby31? ( dev-ruby/net-protocol[ruby_targets_ruby31(-)] dev-ruby/time[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/net-protocol[ruby_targets_ruby32(-)] dev-ruby/time[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-DESCRIPTION=Support for the File Transfer Protocol
-EAPI=8
-HOMEPAGE=https://github.com/ruby/net-ftp
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby31? ( dev-ruby/net-protocol[ruby_targets_ruby31(-)] dev-ruby/time[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/net-protocol[ruby_targets_ruby32(-)] dev-ruby/time[ruby_targets_ruby32(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ruby/net-ftp/archive/v0.2.0.tar.gz -> net-ftp-0.2.0.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=9b1703bb21aa07fe81aab7898bbf79ba
diff --git a/metadata/md5-cache/dev-ruby/net-ftp-0.3.5 b/metadata/md5-cache/dev-ruby/net-ftp-0.3.5
new file mode 100644
index 000000000000..35f398a475b4
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/net-ftp-0.3.5
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby31? ( dev-ruby/net-protocol[ruby_targets_ruby31(-)] dev-ruby/time[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/net-protocol[ruby_targets_ruby32(-)] dev-ruby/time[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( dev-ruby/net-protocol[ruby_targets_ruby33(-)] dev-ruby/time[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rake[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+DESCRIPTION=Support for the File Transfer Protocol
+EAPI=8
+HOMEPAGE=https://github.com/ruby/net-ftp
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=BSD-2
+RDEPEND=ruby_targets_ruby31? ( dev-ruby/net-protocol[ruby_targets_ruby31(-)] dev-ruby/time[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/net-protocol[ruby_targets_ruby32(-)] dev-ruby/time[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( dev-ruby/net-protocol[ruby_targets_ruby33(-)] dev-ruby/time[ruby_targets_ruby33(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby/net-ftp/archive/v0.3.5.tar.gz -> net-ftp-0.3.5.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=6f83739a4c2edebb695f6015585c9bfd
diff --git a/metadata/md5-cache/dev-ruby/net-imap-0.4.12 b/metadata/md5-cache/dev-ruby/net-imap-0.4.12
new file mode 100644
index 000000000000..7f97df442e7b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/net-imap-0.4.12
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby31? ( dev-ruby/date[ruby_targets_ruby31(-)] dev-ruby/net-protocol[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/date[ruby_targets_ruby32(-)] dev-ruby/net-protocol[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( dev-ruby/date[ruby_targets_ruby33(-)] dev-ruby/net-protocol[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/digest[ruby_targets_ruby31(-)] dev-ruby/strscan[ruby_targets_ruby31(-)] dev-ruby/test-unit[ruby_targets_ruby31(-)] dev-ruby/test-unit-ruby-core[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/digest[ruby_targets_ruby32(-)] dev-ruby/strscan[ruby_targets_ruby32(-)] dev-ruby/test-unit[ruby_targets_ruby32(-)] dev-ruby/test-unit-ruby-core[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/digest[ruby_targets_ruby33(-)] dev-ruby/strscan[ruby_targets_ruby33(-)] dev-ruby/test-unit[ruby_targets_ruby33(-)] dev-ruby/test-unit-ruby-core[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rake[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+DESCRIPTION=Ruby client api for Internet Message Access Protocol
+EAPI=8
+HOMEPAGE=https://github.com/ruby/net-imap
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=BSD-2
+RDEPEND=ruby_targets_ruby31? ( dev-ruby/date[ruby_targets_ruby31(-)] dev-ruby/net-protocol[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/date[ruby_targets_ruby32(-)] dev-ruby/net-protocol[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( dev-ruby/date[ruby_targets_ruby33(-)] dev-ruby/net-protocol[ruby_targets_ruby33(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0.4
+SRC_URI=https://github.com/ruby/net-imap/archive/v0.4.12.tar.gz -> net-imap-0.4.12.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=70249e8a2719528c3838270a779a8040
diff --git a/metadata/md5-cache/dev-ruby/pg-1.5.6 b/metadata/md5-cache/dev-ruby/pg-1.5.6
index 530b425c63d6..e10fb1ca8ae0 100644
--- a/metadata/md5-cache/dev-ruby/pg-1.5.6
+++ b/metadata/md5-cache/dev-ruby/pg-1.5.6
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ged/ruby-pg/archive/v1.5.6.tar.gz -> pg-1.5.6.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=5fbba8de8c267b2be1375e0c283136c1
+_md5_=5f2b9b6e02e3a59859835f15d84ee4cf
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.13.0 b/metadata/md5-cache/dev-ruby/rspec-3.13.0
index 221e7cfea952..ce5eb13c23d0 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.13.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.13.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rspec/rspec
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby31? ( =dev-ruby/rspec-core-3.13*[ruby_targets_ruby31(-)] =dev-ruby/rspec-expectations-3.13*[ruby_targets_ruby31(-)] =dev-ruby/rspec-mocks-3.13*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( =dev-ruby/rspec-core-3.13*[ruby_targets_ruby32(-)] =dev-ruby/rspec-expectations-3.13*[ruby_targets_ruby32(-)] =dev-ruby/rspec-mocks-3.13*[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( =dev-ruby/rspec-core-3.13*[ruby_targets_ruby33(-)] =dev-ruby/rspec-expectations-3.13*[ruby_targets_ruby33(-)] =dev-ruby/rspec-mocks-3.13*[ruby_targets_ruby33(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/rspec-3.13.0.gem
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=b69c423c8ee2c36a4e9bf37d0bbb1a36
+_md5_=e5bcbc71e06e88e357c0f892afde9a67
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.13.0 b/metadata/md5-cache/dev-ruby/rspec-core-3.13.0
index 25f4ab153e2f..6a36add7da3d 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.13.0
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.13.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rspec/rspec-core
 INHERIT=ruby-fakegem
 IUSE=highlight test test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby31? ( =dev-ruby/rspec-support-3.13*[ruby_targets_ruby31(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( =dev-ruby/rspec-support-3.13*[ruby_targets_ruby32(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( =dev-ruby/rspec-support-3.13*[ruby_targets_ruby33(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.13.0.tar.gz -> rspec-core-3.13.0-git.tgz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=6fdd181231f9f48f81cbd030188595cc
+_md5_=278734021581244f4cbd544674699617
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.13.0 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.13.0
index 30cb1aaf78ec..88b1505fc800 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.13.0
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.13.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rspec/rspec-expectations
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby31? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby31(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby31(-)] =dev-ruby/rspec-support-3.13*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby32(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby32(-)] =dev-ruby/rspec-support-3.13*[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby33(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby33(-)] =dev-ruby/rspec-support-3.13*[ruby_targets_ruby33(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.13.0.tar.gz -> rspec-expectations-3.13.0-git.tgz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=855e680c8a59175c29cdc405fea57e84
+_md5_=3340f990d60dac7dc56ab9e9897372fc
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.13.1 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.13.1
index 2fbb1625e5b6..621d30e80160 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.13.1
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.13.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rspec/rspec-mocks
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby31? ( =dev-ruby/rspec-support-3.13*[ruby_targets_ruby31(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby31(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( =dev-ruby/rspec-support-3.13*[ruby_targets_ruby32(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby32(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( =dev-ruby/rspec-support-3.13*[ruby_targets_ruby33(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby33(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby33(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.13.1.tar.gz -> rspec-mocks-3.13.1-git.tgz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=52642a22d3e3481ddbe5dda80fe70e3a
+_md5_=0abc8ec4d932ea8924a53c261be49cc4
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.13.1 b/metadata/md5-cache/dev-ruby/rspec-support-3.13.1
index ecb9e4ae31f1..34b94be94566 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.13.1
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.13.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rspec/rspec-support
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.13.1.tar.gz -> rspec-support-3.13.1-git.tgz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=33ac778db8ae2a93064d9f0f71fbbb34
+_md5_=b7d6f6ffaa3631ca9f128dd7ca62a7cd
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.6.9 b/metadata/md5-cache/dev-ruby/sqlite3-1.6.9
deleted file mode 100644
index 3b804aad388b..000000000000
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.6.9
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] dev-ruby/redcloth[ruby_targets_ruby31(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] dev-ruby/redcloth[ruby_targets_ruby32(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-db/sqlite-3.44.2:3 ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-DESCRIPTION=An extension library to access a SQLite database from Ruby
-EAPI=8
-HOMEPAGE=https://github.com/sparklemotion/sqlite3-ruby
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=>=dev-db/sqlite-3.44.2:3 ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/sqlite3-1.6.9.gem
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=98c7851ba9c5ae3a596b6c372913b340
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.7.0 b/metadata/md5-cache/dev-ruby/sqlite3-1.7.0
deleted file mode 100644
index f59caf191740..000000000000
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.7.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rake[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-db/sqlite-3.44.2:3 ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
-DESCRIPTION=An extension library to access a SQLite database from Ruby
-EAPI=8
-HOMEPAGE=https://github.com/sparklemotion/sqlite3-ruby
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=>=dev-db/sqlite-3.44.2:3 ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/sqlite3-1.7.0.gem
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=66910438a3cea82f765b4dc7c3b08812
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.7.2 b/metadata/md5-cache/dev-ruby/sqlite3-1.7.2
deleted file mode 100644
index 378095cf8ab5..000000000000
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.7.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rake[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-db/sqlite-3.45.1:3 ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
-DESCRIPTION=An extension library to access a SQLite database from Ruby
-EAPI=8
-HOMEPAGE=https://github.com/sparklemotion/sqlite3-ruby
-INHERIT=ruby-fakegem
-IUSE=doc test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=>=dev-db/sqlite-3.45.1:3 ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/sqlite3-1.7.2.gem
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=75104eb8428310ce5d2b8adb118fc0b3
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.7.3 b/metadata/md5-cache/dev-ruby/sqlite3-1.7.3
index 1f073265a3e6..cf7e0f7fce3e 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.7.3
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.7.3
@@ -1,6 +1,6 @@
 BDEPEND=ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rake[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-db/sqlite-3.45.2:3 ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+DEPEND=>=dev-db/sqlite-3.45.2:3 <dev-db/sqlite-3.46.0 ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
 DESCRIPTION=An extension library to access a SQLite database from Ruby
 EAPI=8
 HOMEPAGE=https://github.com/sparklemotion/sqlite3-ruby
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sqlite3-1.7.3.gem
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=121d8dd271695db30f60710b3e50a3a5
+_md5_=c31b4af2a7d8004b3008f0af15f7c4b1
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.9.9 b/metadata/md5-cache/dev-ruby/timecop-0.9.9
new file mode 100644
index 000000000000..53cd915b43ca
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/timecop-0.9.9
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby31? ( test? ( dev-ruby/activesupport[ruby_targets_ruby31(-)] dev-ruby/mocha[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/activesupport[ruby_targets_ruby32(-)] dev-ruby/mocha[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/activesupport[ruby_targets_ruby33(-)] dev-ruby/mocha[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rake[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+DESCRIPTION=A gem providing 'time travel' and 'time freezing' capabilities
+EAPI=8
+HOMEPAGE=https://github.com/travisjeffery/timecop
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/travisjeffery/timecop/archive/refs/tags/v0.9.9.tar.gz -> timecop-0.9.9.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=8adee1b7ca971883924199f80e2e4d3a
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 0f300742d336..c025382c56a9 100644
--- a/metadata/md5-cache/dev-scheme/Manifest.gz
+++ b/metadata/md5-cache/dev-scheme/Manifest.gz
diff --git a/metadata/md5-cache/dev-scheme/chibi-0.11.0 b/metadata/md5-cache/dev-scheme/chibi-0.11.0
new file mode 100644
index 000000000000..965ddea99ae3
--- /dev/null
+++ b/metadata/md5-cache/dev-scheme/chibi-0.11.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Minimal Scheme implementation for use as an extension language
+EAPI=8
+HOMEPAGE=http://synthcode.com/scheme/chibi/
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/ashinn/chibi-scheme/archive/0.11.tar.gz -> chibi-0.11.0.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=7fb46080902b54be3e0dd5edaa0721e7
diff --git a/metadata/md5-cache/dev-scheme/chibi-9999 b/metadata/md5-cache/dev-scheme/chibi-9999
index 0daaf1946949..6f32a3cc7835 100644
--- a/metadata/md5-cache/dev-scheme/chibi-9999
+++ b/metadata/md5-cache/dev-scheme/chibi-9999
@@ -8,4 +8,4 @@ LICENSE=BSD
 PROPERTIES=live
 SLOT=0
 _eclasses_=git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=22b7478093b2ff40db73bd50ce8f4450
+_md5_=7fb46080902b54be3e0dd5edaa0721e7
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 0c36e6976e6b..135f816d22a8 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/mingw64-toolchain-12.0.0 b/metadata/md5-cache/dev-util/mingw64-toolchain-12.0.0
index 9f127f592d92..3d4f20047337 100644
--- a/metadata/md5-cache/dev-util/mingw64-toolchain-12.0.0
+++ b/metadata/md5-cache/dev-util/mingw64-toolchain-12.0.0
@@ -5,10 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.mingw-w64.org/ https://gcc.gnu.org/ https://sourceware.org/binutils/
 INHERIT=edo flag-o-matic multilib-build toolchain-funcs
 IUSE=+abi_x86_32 bin-symlinks custom-cflags +strip abi_x86_32 abi_x86_64
+KEYWORDS=-* ~amd64 ~x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain
 RDEPEND=dev-libs/gmp:= dev-libs/mpc:= dev-libs/mpfr:= sys-libs/zlib:= virtual/libiconv bin-symlinks? ( abi_x86_64? ( !cross-x86_64-w64-mingw32/binutils !cross-x86_64-w64-mingw32/gcc ) abi_x86_32? ( !cross-i686-w64-mingw32/binutils !cross-i686-w64-mingw32/gcc ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v12.0.0.tar.bz2 mirror://gnu/binutils/binutils-2.42.tar.xz mirror://gcc/gcc-14.1.0/gcc-14.1.0.tar.xz mirror://gnu/gcc/gcc-14.1.0/gcc-14.1.0.tar.xz
 _eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a8b85a0dae1460014f0dfd54ecb230e6
+_md5_=f89036d1838ca1b8e8e53ef285aab600
diff --git a/metadata/md5-cache/dev-util/nihtest-1.6.0 b/metadata/md5-cache/dev-util/nihtest-1.7.0
index 39efdb0f3339..5e05ee396d61 100644
--- a/metadata/md5-cache/dev-util/nihtest-1.6.0
+++ b/metadata/md5-cache/dev-util/nihtest-1.7.0
@@ -11,6 +11,6 @@ RDEPEND=python_single_target_python3_10? ( dev-python/python-dateutil[python_tar
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/n/nihtest/nihtest-1.6.0.tar.gz https://nih.at/nihtest/nihtest-1.6.0.tar.gz https://github.com/nih-at/nihtest/releases/download/v1.6.0/nihtest-1.6.0.tar.gz
+SRC_URI=https://files.pythonhosted.org/packages/source/n/nihtest/nihtest-1.7.0.tar.gz https://nih.at/nihtest/nihtest-1.7.0.tar.gz https://github.com/nih-at/nihtest/releases/download/v1.7.0/nihtest-1.7.0.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=67d0204d29d70a9bb5798adf739655c8
+_md5_=a7a8dd8605782635d6c79a9c7bef67be
diff --git a/metadata/md5-cache/dev-util/packer-1.8.6 b/metadata/md5-cache/dev-util/packer-1.8.6
deleted file mode 100644
index fe1e71f938f3..000000000000
--- a/metadata/md5-cache/dev-util/packer-1.8.6
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.20:= app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=A tool to create identical machine images for multiple platforms
-EAPI=8
-HOMEPAGE=https://www.packer.io
-INHERIT=go-module
-KEYWORDS=~amd64 ~arm64 ~riscv
-LICENSE=Apache-2.0 BSD-2 BSD-4 MIT MPL-2.0 unicode
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/hashicorp/packer/archive/v1.8.6.tar.gz -> packer-1.8.6.tar.gz https://gentoofiles.s3.eu-central-1.amazonaws.com/packer-1.8.6-deps.tar.xz
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=e18820f8f14c9e7bc51fd4b5ddf2d3e8
diff --git a/metadata/md5-cache/dev-util/packer-1.9.4 b/metadata/md5-cache/dev-util/packer-1.9.4
deleted file mode 100644
index b4748795610c..000000000000
--- a/metadata/md5-cache/dev-util/packer-1.9.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.20:= app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=A tool to create identical machine images for multiple platforms
-EAPI=8
-HOMEPAGE=https://www.packer.io
-INHERIT=go-module
-KEYWORDS=~amd64 ~arm64 ~riscv
-LICENSE=Apache-2.0 BSD-2 BSD-4 MIT MPL-2.0 unicode
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/hashicorp/packer/archive/v1.9.4.tar.gz -> packer-1.9.4.tar.gz https://gentoo.neutroniak.com/packer-1.9.4-deps.tar.xz
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=0f60e69f7233153302fe5ac71de8430c
diff --git a/metadata/md5-cache/dev-util/rpmdevtools-9.6 b/metadata/md5-cache/dev-util/rpmdevtools-9.6
new file mode 100644
index 000000000000..d5d3cff1a9dd
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rpmdevtools-9.6
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/help2man
+DEFINED_PHASES=prepare setup
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) app-arch/rpm[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?] dev-lang/perl:* python_single_target_python3_10? ( dev-python/progressbar2[python_targets_python3_10(-)] dev-python/requests_download[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/progressbar2[python_targets_python3_11(-)] dev-python/requests_download[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/progressbar2[python_targets_python3_12(-)] dev-python/requests_download[python_targets_python3_12(-)] )
+DESCRIPTION=Collection of rpm packaging related utilities
+EAPI=8
+HOMEPAGE=https://pagure.io/rpmdevtools
+INHERIT=python-single-r1
+IUSE=emacs python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) app-arch/rpm[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?] dev-lang/perl:* python_single_target_python3_10? ( dev-python/progressbar2[python_targets_python3_10(-)] dev-python/requests_download[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/progressbar2[python_targets_python3_11(-)] dev-python/requests_download[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/progressbar2[python_targets_python3_12(-)] dev-python/requests_download[python_targets_python3_12(-)] ) net-misc/curl emacs? ( app-emacs/rpm-spec-mode )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
+SLOT=0
+SRC_URI=https://releases.pagure.org/rpmdevtools/rpmdevtools-9.6.tar.xz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=cbdbd7573660e383c07886b97a6823bc
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index d4195804264c..ecb3ffd45eb2 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/git-filter-repo-2.38.0-r2 b/metadata/md5-cache/dev-vcs/git-filter-repo-2.38.0-r3
index 8538aeb7a282..c62685803000 100644
--- a/metadata/md5-cache/dev-vcs/git-filter-repo-2.38.0-r2
+++ b/metadata/md5-cache/dev-vcs/git-filter-repo-2.38.0-r3
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Quickly rewrite git repository history (filter-branch replacement)
 EAPI=8
 HOMEPAGE=https://github.com/newren/git-filter-repo/
 INHERIT=distutils-r1
-IUSE=python_targets_python3_10 python_targets_python3_11
+IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~amd64 ~arm64 ~loong ~x86
 LICENSE=MIT
-RDEPEND=>=dev-vcs/git-2.38 python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 ) || ( python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=>=dev-vcs/git-2.38 python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 SLOT=0
 SRC_URI=https://github.com/newren/git-filter-repo/releases/download/v2.38.0/git-filter-repo-2.38.0.tar.xz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=74284be2b359aecd14b1886116ffe889
+_md5_=a27ad4b7cdc83660faae3fb655d49d9a
diff --git a/metadata/md5-cache/dev-vcs/python-gitlab-4.6.0 b/metadata/md5-cache/dev-vcs/python-gitlab-4.6.0
new file mode 100644
index 000000000000..ff92b0eb2a8b
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/python-gitlab-4.6.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/coverage[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-console-scripts-1.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-cov[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyyaml-5.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/responses[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/requests-2.32.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-toolbelt-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python command line interface to gitlab API
+EAPI=8
+HOMEPAGE=https://github.com/python-gitlab/python-gitlab/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64
+LICENSE=LGPL-3
+RDEPEND=>=dev-python/requests-2.32.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-toolbelt-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/python-gitlab/python_gitlab-4.6.0.tar.gz -> python-gitlab-4.6.0.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=65d855e031f3733e05508d1665118b9b
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 8a3e4c91f6cd..a104179d2bf0 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/dolphin-5.0_p20220520-r2 b/metadata/md5-cache/games-emulation/dolphin-5.0_p20220520-r2
index d89bb82e0636..f96f1ff9c8e7 100644
--- a/metadata/md5-cache/games-emulation/dolphin-5.0_p20220520-r2
+++ b/metadata/md5-cache/games-emulation/dolphin-5.0_p20220520-r2
@@ -12,4 +12,4 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-arch/zstd:= dev-libs/hidapi:= >
 SLOT=0
 SRC_URI=https://github.com/dolphin-emu/dolphin/archive/0f2540a0d1133950467845f20b1e003181147781.tar.gz -> dolphin-5.0_p20220520.tar.gz mgba? ( https://github.com/mgba-emu/mgba/archive/40d4c430fc36caeb7ea32fd39624947ed487d2f2.tar.gz -> mgba-40d4c430fc36caeb7ea32fd39624947ed487d2f2.tar.gz )
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2b29f2d881eae6183ffcf26b04de1c60
+_md5_=6e5653f9b6a60f7816fe4116882d64bb
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 25df00674150..11f5e1a67768 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-6.0.4 b/metadata/md5-cache/gnome-extra/cinnamon-6.0.4
index 8892df3a6f7e..37101d3f35bd 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-6.0.4
+++ b/metadata/md5-cache/gnome-extra/cinnamon-6.0.4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon
 INHERIT=meson gnome2-utils pax-utils python-single-r1 xdg
 IUSE=+desktop-portal +eds +gstreamer gtk-doc +nls +networkmanager wayland python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~amd64 ~arm64 ~loong ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~loong ~riscv ~x86
 LICENSE=BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT
 RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[xml(+)] ) python_single_target_python3_12? ( dev-lang/python:3.12[xml(+)] ) >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/glib-2.52.0:2[dbus] >=dev-libs/gobject-introspection-1.29.15:= dev-libs/libxml2:2 >=gnome-extra/cinnamon-desktop-6.0:0= >=gnome-extra/cinnamon-menus-6.0 >=gnome-extra/cjs-6.0[cairo] sys-apps/dbus >=sys-auth/polkit-0.100[introspection] virtual/opengl x11-libs/cairo x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.12.0:3[introspection,wayland?] >=x11-libs/libnotify-0.7.3:0=[introspection] x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-libs/pango[introspection] >=x11-libs/xapp-2.8.2[introspection] >=x11-wm/muffin-6.0[introspection,wayland?] eds? ( gnome-extra/evolution-data-server ) gstreamer? ( media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) >=app-accessibility/caribou-0.3 dev-libs/keybinder:3[introspection] dev-libs/libtimezonemap python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/distro[python_targets_python3_10(-)] dev-python/pexpect[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyinotify[python_targets_python3_10(-)] dev-python/python-pam[python_targets_python3_10(-)] dev-python/pytz[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/setproctitle[python_targets_python3_10(-)] dev-python/tinycss2[python_targets_python3_10(-)] >=dev-python/python3-xapp-2.4.1-r2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] dev-python/distro[python_targets_python3_11(-)] dev-python/pexpect[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyinotify[python_targets_python3_11(-)] dev-python/python-pam[python_targets_python3_11(-)] dev-python/pytz[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/setproctitle[python_targets_python3_11(-)] dev-python/tinycss2[python_targets_python3_11(-)] >=dev-python/python3-xapp-2.4.1-r2[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/dbus-python[python_targets_python3_12(-)] dev-python/distro[python_targets_python3_12(-)] dev-python/pexpect[python_targets_python3_12(-)] dev-python/pillow[python_targets_python3_12(-)] dev-python/pycairo[python_targets_python3_12(-)] dev-python/pygobject:3[python_targets_python3_12(-)] dev-python/pyinotify[python_targets_python3_12(-)] dev-python/python-pam[python_targets_python3_12(-)] dev-python/pytz[python_targets_python3_12(-)] dev-python/requests[python_targets_python3_12(-)] dev-python/setproctitle[python_targets_python3_12(-)] dev-python/tinycss2[python_targets_python3_12(-)] >=dev-python/python3-xapp-2.4.1-r2[python_targets_python3_12(-)] ) >=gnome-base/dconf-0.4.1 >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-base/libgnomekbd-2.91.4 >=gnome-extra/cinnamon-control-center-6.0[networkmanager=,wayland?] >=gnome-extra/cinnamon-screensaver-6.0 >=gnome-extra/cinnamon-session-6.0 >=gnome-extra/cinnamon-settings-daemon-6.0[wayland?] >=gnome-extra/nemo-6.0[wayland?] gnome-extra/polkit-gnome media-libs/gsound net-libs/libsoup:3.0[introspection] net-misc/wget sys-apps/accountsservice[introspection] sys-apps/coreutils sys-apps/pciutils sys-apps/util-linux sys-power/upower[introspection] x11-misc/xdg-utils x11-themes/adwaita-icon-theme x11-themes/gnome-themes-standard desktop-portal? ( sys-apps/xdg-desktop-portal-gtk sys-apps/xdg-desktop-portal-xapp ) nls? ( >=gnome-extra/cinnamon-translations-6.0 )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon/archive/6.0.4.tar.gz -> cinnamon-6.0.4.tar.gz
 _eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnome2-utils	30dbce54b89e77b86f366548f94419ad	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=288f23f8fbccebcff104188383f248c8
+_md5_=0752b1d4e7d2025971af607a99e411b0
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index 2e8c2fce5ee8..f28d49cee925 100644
--- a/metadata/md5-cache/gui-apps/Manifest.gz
+++ b/metadata/md5-cache/gui-apps/Manifest.gz
diff --git a/metadata/md5-cache/gui-apps/waypipe-0.8.6 b/metadata/md5-cache/gui-apps/waypipe-0.8.6
deleted file mode 100644
index b7b14dac7b3b..000000000000
--- a/metadata/md5-cache/gui-apps/waypipe-0.8.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) app-text/scdoc virtual/pkgconfig test? ( dev-libs/weston[examples,headless,remoting,screen-sharing,wayland-compositor] ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
-DEFINED_PHASES=compile configure install setup test
-DEPEND=dmabuf? ( media-libs/mesa[gbm(+),vaapi?,wayland] x11-libs/libdrm ) lz4? ( app-arch/lz4 ) systemtap? ( dev-debug/systemtap ) vaapi? ( media-libs/libva[drm(+),wayland] ) ffmpeg? ( media-video/ffmpeg[x264,vaapi?] ) zstd? ( app-arch/zstd )
-DESCRIPTION=Transparent network proxy for Wayland compositors
-EAPI=8
-HOMEPAGE=https://gitlab.freedesktop.org/mstoeckl/waypipe
-INHERIT=meson python-any-r1
-IUSE=dmabuf ffmpeg lz4 systemtap test vaapi zstd cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_sse3 cpu_flags_arm_neon
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dmabuf? ( media-libs/mesa[gbm(+),vaapi?,wayland] x11-libs/libdrm ) lz4? ( app-arch/lz4 ) systemtap? ( dev-debug/systemtap ) vaapi? ( media-libs/libva[drm(+),wayland] ) ffmpeg? ( media-video/ffmpeg[x264,vaapi?] ) zstd? ( app-arch/zstd )
-REQUIRED_USE=vaapi? ( ffmpeg )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v0.8.6/waypipe-v0.8.6.tar.bz2
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=1b9415efb1908975042f72682f717d8d
diff --git a/metadata/md5-cache/gui-apps/waypipe-9999 b/metadata/md5-cache/gui-apps/waypipe-9999
index 51a7aed312f4..e3ce33992dcd 100644
--- a/metadata/md5-cache/gui-apps/waypipe-9999
+++ b/metadata/md5-cache/gui-apps/waypipe-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) app-text/scdoc virtual/pkgconfig test? ( dev-libs/weston[examples,headless,remoting,screen-sharing,wayland-compositor] ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) app-text/scdoc virtual/pkgconfig test? ( dev-libs/weston[examples,headless,remoting,screen-sharing,wayland-compositor] ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install setup test unpack
 DEPEND=dmabuf? ( media-libs/mesa[gbm(+),vaapi?,wayland] x11-libs/libdrm ) lz4? ( app-arch/lz4 ) systemtap? ( dev-debug/systemtap ) vaapi? ( media-libs/libva[drm(+),wayland] ) ffmpeg? ( media-video/ffmpeg[x264,vaapi?] ) zstd? ( app-arch/zstd )
 DESCRIPTION=Transparent network proxy for Wayland compositors
@@ -13,4 +13,4 @@ REQUIRED_USE=vaapi? ( ffmpeg )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=1b9415efb1908975042f72682f717d8d
+_md5_=bd6aa8bb884d212e2408f7b7ee57ee94
diff --git a/metadata/md5-cache/gui-apps/wmenu-0.1.8 b/metadata/md5-cache/gui-apps/wmenu-0.1.8
index 0c9eda63ced5..46cffccafe74 100644
--- a/metadata/md5-cache/gui-apps/wmenu-0.1.8
+++ b/metadata/md5-cache/gui-apps/wmenu-0.1.8
@@ -5,10 +5,10 @@ DESCRIPTION=dynamic menu for wlroots compositors, maintains the look and feel of
 EAPI=8
 HOMEPAGE=https://sr.ht/~adnano/wmenu/
 INHERIT=meson
-KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=x11-libs/cairo x11-libs/pango dev-libs/wayland x11-libs/libxkbcommon
 SLOT=0
 SRC_URI=https://git.sr.ht/~adnano/wmenu/archive/0.1.8.tar.gz -> wmenu-0.1.8.tar.gz
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=811ea42454f7634674bfda87baaa7d53
+_md5_=a4f7313b94a391d5cd307e049f1bc1c5
diff --git a/metadata/md5-cache/gui-wm/Manifest.gz b/metadata/md5-cache/gui-wm/Manifest.gz
index 892850ed8e43..8e88e0469a53 100644
--- a/metadata/md5-cache/gui-wm/Manifest.gz
+++ b/metadata/md5-cache/gui-wm/Manifest.gz
diff --git a/metadata/md5-cache/gui-wm/gamescope-3.14.14 b/metadata/md5-cache/gui-wm/gamescope-3.14.14
deleted file mode 100644
index 67fb39b158a3..000000000000
--- a/metadata/md5-cache/gui-wm/gamescope-3.14.14
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/glslang dev-util/wayland-scanner virtual/pkgconfig >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND==dev-libs/libliftoff-0.4* >=dev-libs/wayland-1.21 gui-libs/libdecor >=media-libs/libavif-1.0.0:= >=media-libs/libdisplay-info-0.1.1 media-libs/libsdl2[video,vulkan] media-libs/vulkan-loader sys-apps/hwdata sys-libs/libcap >=x11-libs/libdrm-2.4.109 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbcommon x11-libs/libXmu x11-libs/libXrender x11-libs/libXres x11-libs/libXtst x11-libs/libXxf86vm pipewire? ( >=media-video/pipewire-0.3:= ) wsi-layer? ( x11-libs/libxcb ) >=dev-libs/libinput-1.14.0:= media-libs/libglvnd media-libs/mesa[egl(+),gles2(+)] sys-auth/seatd:= virtual/libudev x11-base/xwayland x11-libs/libxcb:= >=x11-libs/pixman-0.42.0 x11-libs/xcb-util-wm >=dev-libs/wayland-protocols-1.34 >=dev-libs/stb-20240201-r1 dev-util/vulkan-headers media-libs/glm dev-util/spirv-headers wsi-layer? ( >=media-libs/vkroots-0_p20240430 )
-DESCRIPTION=Efficient micro-compositor for running games
-EAPI=8
-HOMEPAGE=https://github.com/ValveSoftware/gamescope
-IDEPEND=filecaps? ( sys-libs/libcap )
-INHERIT=fcaps meson
-IUSE=pipewire +wsi-layer +filecaps
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND==dev-libs/libliftoff-0.4* >=dev-libs/wayland-1.21 gui-libs/libdecor >=media-libs/libavif-1.0.0:= >=media-libs/libdisplay-info-0.1.1 media-libs/libsdl2[video,vulkan] media-libs/vulkan-loader sys-apps/hwdata sys-libs/libcap >=x11-libs/libdrm-2.4.109 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbcommon x11-libs/libXmu x11-libs/libXrender x11-libs/libXres x11-libs/libXtst x11-libs/libXxf86vm pipewire? ( >=media-video/pipewire-0.3:= ) wsi-layer? ( x11-libs/libxcb ) >=dev-libs/libinput-1.14.0:= media-libs/libglvnd media-libs/mesa[egl(+),gles2(+)] sys-auth/seatd:= virtual/libudev x11-base/xwayland x11-libs/libxcb:= >=x11-libs/pixman-0.42.0 x11-libs/xcb-util-wm
-SLOT=0
-SRC_URI=https://github.com/ValveSoftware/gamescope/archive/refs/tags/3.14.14.tar.gz -> gamescope-3.14.14.tar.gz https://github.com/Joshua-Ashton/reshade/archive/9fdbea6892f9959fdc18095d035976c574b268b7.tar.gz -> reshade-9fdbea6892f9959fdc18095d035976c574b268b7.tar.gz https://github.com/Joshua-Ashton/wlroots/archive/a5c9826e6d7d8b504b07d1c02425e6f62b020791.tar.gz -> wlroots-a5c9826e6d7d8b504b07d1c02425e6f62b020791.tar.gz
-_eclasses_=fcaps	c0a086b957a1b183a8d136eabf02f191	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c4ed1489f9f843be0b48f2f4460ba859
diff --git a/metadata/md5-cache/gui-wm/gamescope-3.14.18 b/metadata/md5-cache/gui-wm/gamescope-3.14.18
new file mode 100644
index 000000000000..6d0420606435
--- /dev/null
+++ b/metadata/md5-cache/gui-wm/gamescope-3.14.18
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/glslang dev-util/wayland-scanner virtual/pkgconfig >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-libs/wayland-1.21 gui-libs/libdecor >=media-libs/libavif-1.0.0:= >=media-libs/libdisplay-info-0.1.1 media-libs/libsdl2[video,vulkan] media-libs/vulkan-loader sys-apps/hwdata sys-libs/libcap >=x11-libs/libdrm-2.4.109 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbcommon x11-libs/libXmu x11-libs/libXrender x11-libs/libXres x11-libs/libXtst x11-libs/libXxf86vm pipewire? ( >=media-video/pipewire-0.3:= ) wsi-layer? ( x11-libs/libxcb ) >=dev-libs/libinput-1.14.0:= media-libs/libglvnd media-libs/mesa[egl(+),gles2(+)] sys-auth/seatd:= virtual/libudev x11-base/xwayland x11-libs/libxcb:= >=x11-libs/pixman-0.42.0 x11-libs/xcb-util-wm =dev-libs/libliftoff-0.5* >=dev-libs/wayland-protocols-1.34 >=dev-libs/stb-20240201-r1 dev-util/vulkan-headers media-libs/glm dev-util/spirv-headers wsi-layer? ( >=media-libs/vkroots-0_p20240430 )
+DESCRIPTION=Efficient micro-compositor for running games
+EAPI=8
+HOMEPAGE=https://github.com/ValveSoftware/gamescope
+IDEPEND=filecaps? ( sys-libs/libcap )
+INHERIT=fcaps meson
+IUSE=pipewire +wsi-layer +filecaps
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=>=dev-libs/wayland-1.21 gui-libs/libdecor >=media-libs/libavif-1.0.0:= >=media-libs/libdisplay-info-0.1.1 media-libs/libsdl2[video,vulkan] media-libs/vulkan-loader sys-apps/hwdata sys-libs/libcap >=x11-libs/libdrm-2.4.109 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbcommon x11-libs/libXmu x11-libs/libXrender x11-libs/libXres x11-libs/libXtst x11-libs/libXxf86vm pipewire? ( >=media-video/pipewire-0.3:= ) wsi-layer? ( x11-libs/libxcb ) >=dev-libs/libinput-1.14.0:= media-libs/libglvnd media-libs/mesa[egl(+),gles2(+)] sys-auth/seatd:= virtual/libudev x11-base/xwayland x11-libs/libxcb:= >=x11-libs/pixman-0.42.0 x11-libs/xcb-util-wm dev-libs/libliftoff
+SLOT=0
+SRC_URI=https://github.com/ValveSoftware/gamescope/archive/refs/tags/3.14.18.tar.gz -> gamescope-3.14.18.tar.gz https://github.com/Joshua-Ashton/reshade/archive/9fdbea6892f9959fdc18095d035976c574b268b7.tar.gz -> reshade-9fdbea6892f9959fdc18095d035976c574b268b7.tar.gz https://github.com/Joshua-Ashton/wlroots/archive/a5c9826e6d7d8b504b07d1c02425e6f62b020791.tar.gz -> wlroots-a5c9826e6d7d8b504b07d1c02425e6f62b020791.tar.gz
+_eclasses_=fcaps	c0a086b957a1b183a8d136eabf02f191	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=42b65229a4ed8e3266c299bcd304be6d
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 48046effd757..bf539395c322 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-r3 b/metadata/md5-cache/mail-filter/spamassassin-4.0.0-r3
index 3ca20071781c..e03edc860f74 100644
--- a/metadata/md5-cache/mail-filter/spamassassin-4.0.0-r3
+++ b/metadata/md5-cache/mail-filter/spamassassin-4.0.0-r3
@@ -13,4 +13,4 @@ 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_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	perl-functions	c3fca037246e877693badea0df3b0ef8	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=cf267fb2d4b2c867af662ccfe7bad45a
+_md5_=301a8dcf405f3495a5398513ffe17819
diff --git a/metadata/md5-cache/mail-filter/spamassassin-4.0.0-r4 b/metadata/md5-cache/mail-filter/spamassassin-4.0.0-r4
index ce507c17ee3f..6d6b2db6a99c 100644
--- a/metadata/md5-cache/mail-filter/spamassassin-4.0.0-r4
+++ b/metadata/md5-cache/mail-filter/spamassassin-4.0.0-r4
@@ -13,4 +13,4 @@ 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_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	perl-functions	c3fca037246e877693badea0df3b0ef8	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=7f4abe0797fb95452a355e4c4f7a6d9d
+_md5_=3278c11221064420b60e1fa9d4a5fd03
diff --git a/metadata/md5-cache/mail-filter/spamassassin-4.0.1 b/metadata/md5-cache/mail-filter/spamassassin-4.0.1
index 7674d859d5cf..459b04b1a06b 100644
--- a/metadata/md5-cache/mail-filter/spamassassin-4.0.1
+++ b/metadata/md5-cache/mail-filter/spamassassin-4.0.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-4.0.1.tar.bz2 verify-sig? ( https://downloads.apache.org/spamassassin/source/Mail-SpamAssassin-4.0.1.tar.bz2.asc )
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	perl-functions	c3fca037246e877693badea0df3b0ef8	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=18998df7b16f3585083fcb926d507533
+_md5_=797cbf5a2b6f5556837a78483929b33d
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 416d64a13411..4cf43dfab2ce 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/opensmtpd-7.5.0_p0 b/metadata/md5-cache/mail-mta/opensmtpd-7.5.0_p0
new file mode 100644
index 000000000000..558e3b9900f9
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/opensmtpd-7.5.0_p0
@@ -0,0 +1,15 @@
+BDEPEND=app-alternatives/yacc virtual/pkgconfig verify-sig? ( sec-keys/signify-keys-opensmtpd ) virtual/pkgconfig verify-sig? ( app-crypt/signify )
+DEFINED_PHASES=configure install unpack
+DEPEND=dev-libs/libbsd dev-libs/libevent:= dev-libs/openssl:= sys-libs/zlib:= virtual/libcrypt:= berkdb? ( sys-libs/db:= ) elibc_musl? ( sys-libs/fts-standalone ) pam? ( sys-libs/pam )
+DESCRIPTION=Lightweight but featured SMTP daemon from OpenBSD
+EAPI=8
+HOMEPAGE=https://www.opensmtpd.org
+INHERIT=pam systemd verify-sig
+IUSE=berkdb +mta pam split-usr verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=ISC BSD BSD-1 BSD-2 BSD-4
+RDEPEND=dev-libs/libbsd dev-libs/libevent:= dev-libs/openssl:= sys-libs/zlib:= virtual/libcrypt:= berkdb? ( sys-libs/db:= ) elibc_musl? ( sys-libs/fts-standalone ) pam? ( sys-libs/pam ) acct-user/smtpd acct-user/smtpq app-misc/ca-certificates net-mail/mailbase !mail-client/mailx-support !mail-mta/courier !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]
+SLOT=0
+SRC_URI=https://www.opensmtpd.org/archives/opensmtpd-7.5.0p0.tar.gz verify-sig? ( https://www.opensmtpd.org/archives/opensmtpd-7.5.0p0.sum.sig )
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	b56d0c9c20fc5b553f13c8ae165a10a5	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_md5_=4fcf884504d9ec6df3fa41e9b3bf453f
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 6259d4d9a908..431866e7a5a0 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/blender-4.1.1 b/metadata/md5-cache/media-gfx/blender-4.1.1
index 35c1103a4594..64d71e7428bd 100644
--- a/metadata/md5-cache/media-gfx/blender-4.1.1
+++ b/metadata/md5-cache/media-gfx/blender-4.1.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.blender.org
 INHERIT=check-reqs cmake cuda flag-o-matic llvm-r1 pax-utils python-single-r1 toolchain-funcs xdg-utils
 IUSE=alembic +bullet collada +color-management cuda +cycles +cycles-bin-kernels debug doc +embree experimental +ffmpeg +fftw +fluid +gmp gnome hip jack jemalloc jpeg2k man +nanovdb ndof nls +oidn oneapi openal +openexr +openmp openpgl +opensubdiv +openvdb optix osl +otf +pdf +potrace +pugixml pulseaudio renderdoc sdl +sndfile +tbb test +tiff valgrind vulkan wayland +webp X +llvm_slot_17 llvm_slot_15 llvm_slot_16 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~amd64 ~arm ~arm64
+KEYWORDS=amd64 ~arm ~arm64
 LICENSE=|| ( GPL-3 BL )
 RDEPEND=python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) app-arch/zstd dev-libs/boost:=[nls?] dev-libs/lzo:2= python_single_target_python3_11? ( dev-python/cython[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/zstandard[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/cython[python_targets_python3_12(-)] dev-python/numpy[python_targets_python3_12(-)] dev-python/zstandard[python_targets_python3_12(-)] dev-python/requests[python_targets_python3_12(-)] ) media-libs/freetype:=[brotli] media-libs/libepoxy:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate >=media-libs/openimageio-2.5.6.0:= sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( media-libs/opencolorio:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( media-libs/embree:=[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) gnome? ( gui-libs/libdecor ) hip? ( >=dev-util/hip-5.7:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-2.1.0 ) oneapi? ( dev-libs/intel-compute-runtime[l0] ) openexr? ( >=dev-libs/imath-3.1.7:= >=media-libs/openexr-3.2.1:0= ) openpgl? ( media-libs/openpgl:= ) opensubdiv? ( >=media-libs/opensubdiv-3.5.0 ) openvdb? ( >=media-gfx/openvdb-11.0.0:=[nanovdb?] dev-libs/c-blosc:= ) optix? ( dev-libs/optix ) osl? ( >=media-libs/osl-1.13:= llvm_slot_15? ( >=media-libs/osl-1.13[llvm_slot_15] media-libs/mesa[llvm_slot_15] ) llvm_slot_16? ( >=media-libs/osl-1.13[llvm_slot_16] media-libs/mesa[llvm_slot_16] ) llvm_slot_17? ( >=media-libs/osl-1.13[llvm_slot_17] media-libs/mesa[llvm_slot_17] ) ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-libs/libpulse ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff:= ) valgrind? ( dev-debug/valgrind ) wayland? ( >=dev-libs/wayland-1.12 >=dev-libs/wayland-protocols-1.15 >=x11-libs/libxkbcommon-0.2.0 dev-util/wayland-scanner media-libs/mesa[wayland] sys-apps/dbus ) vulkan? ( media-libs/shaderc dev-util/spirv-tools dev-util/glslang media-libs/vulkan-loader ) otf? ( media-libs/harfbuzz ) renderdoc? ( media-gfx/renderdoc ) X? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm )
 REQUIRED_USE=^^ ( python_single_target_python3_11 python_single_target_python3_12 ) alembic? ( openexr ) cuda? ( cycles ) cycles? ( openexr tiff tbb ) fluid? ( tbb ) gnome? ( wayland ) hip? ( cycles ) nanovdb? ( openvdb ) openvdb? ( tbb openexr ) optix? ( cuda ) osl? ( cycles pugixml ) test? ( color-management ) ^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=4.1
 SRC_URI=https://download.blender.org/source/blender-4.1.1.tar.xz
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fbd60e87a3ff659bb7784b61cb637998
+_md5_=1f2ffce9d7191ac92ce90a469c201270
diff --git a/metadata/md5-cache/media-gfx/fontforge-20230101-r1 b/metadata/md5-cache/media-gfx/fontforge-20230101-r2
index 2a3189f8cc80..b8378939d436 100644
--- a/metadata/md5-cache/media-gfx/fontforge-20230101-r1
+++ b/metadata/md5-cache/media-gfx/fontforge-20230101-r2
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fontforge/fontforge/releases/download/20230101/fontforge-20230101.tar.xz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=84e457b604364b87b90f51d3cb362ea9
+_md5_=92389b52d43059bc83a6123a02660075
diff --git a/metadata/md5-cache/media-gfx/gimp-9999 b/metadata/md5-cache/media-gfx/gimp-9999
index 90e4a1212948..83de1ff912d5 100644
--- a/metadata/md5-cache/media-gfx/gimp-9999
+++ b/metadata/md5-cache/media-gfx/gimp-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_sing
 RESTRICT=!test? ( test )
 SLOT=0/3
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7b31f5993794d27e8fee95a006e48a3d
+_md5_=5b062ec564852946587ffafd1aaecf21
diff --git a/metadata/md5-cache/media-gfx/gscan2pdf-2.13.2-r1 b/metadata/md5-cache/media-gfx/gscan2pdf-2.13.2-r1
index e7e0061bdf1e..743ada1759fd 100644
--- a/metadata/md5-cache/media-gfx/gscan2pdf-2.13.2-r1
+++ b/metadata/md5-cache/media-gfx/gscan2pdf-2.13.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-perl/Config-General dev-perl/Data-UUID dev-perl/Date-Calc dev-perl/Filesys-Df dev-perl/glib-perl dev-perl/GooCanvas2 dev-perl/Gtk3 >=dev-perl/Gtk3-ImageView-10.0.0 dev-perl/Gtk3-SimpleList dev-perl/HTML-Parser dev-perl/Image-Sane dev-perl/List-MoreUtils dev-perl/Locale-Codes dev-perl/Locale-gettext dev-perl/Log-Log4perl >=dev-perl/PDF-Builder-3.23.0 dev-perl/Proc-ProcessTable dev-perl/Readonly dev-perl/Set-IntSpan dev-perl/Try-Tiny virtual/perl-Archive-Tar virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-threads virtual/perl-threads-shared media-gfx/imagemagick[png,tiff,perl] media-gfx/sane-backends media-libs/tiff dev-perl/IPC-System-Simple dev-perl/Sub-Override media-libs/fontconfig app-text/djvu[jpeg,tiff] app-text/poppler[utils] app-text/tesseract[-opencl,osd(+),png,tiff] app-text/unpaper media-gfx/imagemagick[djvu,jpeg,png,tiff,perl,postscript,truetype] media-gfx/sane-backends[sane_backends_test] media-gfx/sane-frontends ) || ( >=dev-lang/perl-5.38.2-r3[perl_features_debug=,perl_features_ithreads=,perl_features_quadmath=] <dev-lang/perl-5.38.2-r3 ) test? ( >=virtual/perl-Test-Simple-1 ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=test? ( dev-perl/Config-General dev-perl/Data-UUID dev-perl/Date-Calc dev-perl/Filesys-Df dev-perl/glib-perl dev-perl/GooCanvas2 dev-perl/Gtk3 >=dev-perl/Gtk3-ImageView-10.0.0 dev-perl/Gtk3-SimpleList dev-perl/HTML-Parser dev-perl/Image-Sane dev-perl/List-MoreUtils dev-perl/Locale-Codes dev-perl/Locale-gettext dev-perl/Log-Log4perl >=dev-perl/PDF-Builder-3.23.0 dev-perl/Proc-ProcessTable dev-perl/Readonly dev-perl/Set-IntSpan dev-perl/Try-Tiny virtual/perl-Archive-Tar virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-threads virtual/perl-threads-shared media-gfx/imagemagick[png,tiff,perl] media-gfx/sane-backends media-libs/tiff dev-perl/IPC-System-Simple dev-perl/Sub-Override media-libs/fontconfig app-text/djvu[jpeg,tiff] app-text/poppler[utils] app-text/tesseract[-opencl(-),osd(+),png,tiff] app-text/unpaper media-gfx/imagemagick[djvu,jpeg,png,tiff,perl,postscript,truetype] media-gfx/sane-backends[sane_backends_test] media-gfx/sane-frontends ) || ( >=dev-lang/perl-5.38.2-r3[perl_features_debug=,perl_features_ithreads=,perl_features_quadmath=] <dev-lang/perl-5.38.2-r3 ) test? ( >=virtual/perl-Test-Simple-1 ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=|| ( >=dev-lang/perl-5.38.2-r3[perl_features_debug=,perl_features_ithreads=,perl_features_quadmath=] <dev-lang/perl-5.38.2-r3 )
 DESCRIPTION=Scan documents, perform OCR, produce PDFs and DjVus
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/gscan2pdf/gscan2pdf-2.13.2.tar.xz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	07f7f317d867e5d5aa30fdeb6e873138	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=95474894dff72b58e46c7f18136a664e
+_md5_=945ad4d30621d87ead0a331ab65e4a7e
diff --git a/metadata/md5-cache/media-gfx/hydrus-565 b/metadata/md5-cache/media-gfx/hydrus-565-r1
index d4afef568405..c5a86b95b4a8 100644
--- a/metadata/md5-cache/media-gfx/hydrus-565
+++ b/metadata/md5-cache/media-gfx/hydrus-565-r1
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite] ) python_single_target_python3_10? ( dev-python/beautifulsoup4[python_targets_python3_10(-)] dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service-identity[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] dev-python/QtPy[widgets,gui,svg,multimedia,python_targets_python3_10(-)] || ( dev-python/QtPy[pyside2] dev-python/QtPy[pyside6] ) media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg ) python_single_target_python3_11? ( dev-python/beautifulsoup4[python_targets_python3_11(-)] dev-python/cbor2[python_targets_python3_11(-)] dev-python/chardet[python_targets_python3_11(-)] dev-python/cloudscraper[python_targets_python3_11(-)] dev-python/html5lib[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-),lcms] dev-python/psutil[python_targets_python3_11(-)] dev-python/pyopenssl[python_targets_python3_11(-)] dev-python/python-mpv[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/send2trash[python_targets_python3_11(-)] dev-python/service-identity[python_targets_python3_11(-)] dev-python/twisted[python_targets_python3_11(-)] dev-python/QtPy[widgets,gui,svg,multimedia,python_targets_python3_11(-)] || ( dev-python/QtPy[pyside2] dev-python/QtPy[pyside6] ) media-libs/opencv[python,png,jpeg,python_targets_python3_11(-)] media-video/ffmpeg ) python_single_target_python3_10? ( test? ( dev-python/httmock[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( test? ( dev-python/httmock[python_targets_python3_11(-)] dev-python/mock[python_targets_python3_11(-)] ) ) doc? ( python_single_target_python3_10? ( dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mkdocs[python_targets_python3_11(-)] dev-python/mkdocs-material[python_targets_python3_11(-)] dev-python/regex[python_targets_python3_11(-)] ) )
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite] ) python_single_target_python3_10? ( dev-python/beautifulsoup4[python_targets_python3_10(-)] dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service-identity[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] dev-python/QtPy[widgets,gui,svg,multimedia,python_targets_python3_10(-)] || ( dev-python/QtPy[pyside2] dev-python/QtPy[pyqt6] ) media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg ) python_single_target_python3_11? ( dev-python/beautifulsoup4[python_targets_python3_11(-)] dev-python/cbor2[python_targets_python3_11(-)] dev-python/chardet[python_targets_python3_11(-)] dev-python/cloudscraper[python_targets_python3_11(-)] dev-python/html5lib[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-),lcms] dev-python/psutil[python_targets_python3_11(-)] dev-python/pyopenssl[python_targets_python3_11(-)] dev-python/python-mpv[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/send2trash[python_targets_python3_11(-)] dev-python/service-identity[python_targets_python3_11(-)] dev-python/twisted[python_targets_python3_11(-)] dev-python/QtPy[widgets,gui,svg,multimedia,python_targets_python3_11(-)] || ( dev-python/QtPy[pyside2] dev-python/QtPy[pyqt6] ) media-libs/opencv[python,png,jpeg,python_targets_python3_11(-)] media-video/ffmpeg ) python_single_target_python3_10? ( test? ( dev-python/httmock[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( test? ( dev-python/httmock[python_targets_python3_11(-)] dev-python/mock[python_targets_python3_11(-)] ) ) doc? ( python_single_target_python3_10? ( dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mkdocs[python_targets_python3_11(-)] dev-python/mkdocs-material[python_targets_python3_11(-)] dev-python/regex[python_targets_python3_11(-)] ) )
 DEFINED_PHASES=compile install postinst prepare setup test
 DESCRIPTION=A booru-like media organizer for the desktop
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=python-single-r1 desktop docs optfeature
 IUSE=test python_single_target_python3_10 python_single_target_python3_11 doc
 KEYWORDS=~amd64
 LICENSE=WTFPL-2 CC-BY-2.5
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite] ) python_single_target_python3_10? ( dev-python/beautifulsoup4[python_targets_python3_10(-)] dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service-identity[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] dev-python/QtPy[widgets,gui,svg,multimedia,python_targets_python3_10(-)] || ( dev-python/QtPy[pyside2] dev-python/QtPy[pyside6] ) media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg ) python_single_target_python3_11? ( dev-python/beautifulsoup4[python_targets_python3_11(-)] dev-python/cbor2[python_targets_python3_11(-)] dev-python/chardet[python_targets_python3_11(-)] dev-python/cloudscraper[python_targets_python3_11(-)] dev-python/html5lib[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-),lcms] dev-python/psutil[python_targets_python3_11(-)] dev-python/pyopenssl[python_targets_python3_11(-)] dev-python/python-mpv[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/send2trash[python_targets_python3_11(-)] dev-python/service-identity[python_targets_python3_11(-)] dev-python/twisted[python_targets_python3_11(-)] dev-python/QtPy[widgets,gui,svg,multimedia,python_targets_python3_11(-)] || ( dev-python/QtPy[pyside2] dev-python/QtPy[pyside6] ) media-libs/opencv[python,png,jpeg,python_targets_python3_11(-)] media-video/ffmpeg )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite] ) python_single_target_python3_10? ( dev-python/beautifulsoup4[python_targets_python3_10(-)] dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service-identity[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] dev-python/QtPy[widgets,gui,svg,multimedia,python_targets_python3_10(-)] || ( dev-python/QtPy[pyside2] dev-python/QtPy[pyqt6] ) media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg ) python_single_target_python3_11? ( dev-python/beautifulsoup4[python_targets_python3_11(-)] dev-python/cbor2[python_targets_python3_11(-)] dev-python/chardet[python_targets_python3_11(-)] dev-python/cloudscraper[python_targets_python3_11(-)] dev-python/html5lib[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-),lcms] dev-python/psutil[python_targets_python3_11(-)] dev-python/pyopenssl[python_targets_python3_11(-)] dev-python/python-mpv[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/send2trash[python_targets_python3_11(-)] dev-python/service-identity[python_targets_python3_11(-)] dev-python/twisted[python_targets_python3_11(-)] dev-python/QtPy[widgets,gui,svg,multimedia,python_targets_python3_11(-)] || ( dev-python/QtPy[pyside2] dev-python/QtPy[pyqt6] ) media-libs/opencv[python,png,jpeg,python_targets_python3_11(-)] media-video/ffmpeg )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v565.tar.gz -> hydrus-565.tar.gz https://github.com/vaartis/hydrus/commit/5d2505a1eb4721f7750861f7622c46adec31db8b.diff -> hydrus-3500-mpeg-error.patch https://github.com/vaartis/hydrus/commit/dc20196f47ac29568a40cd04a45cf4fc5f237603.diff -> hydrus-test-fixes.patch
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	docs	7f3c0d47338743498c69f1887a139f57	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=5e5f32cf116978e3716029abde9cdf66
+_md5_=0d9a5485b13d69f7fc378ab619cf3d8a
diff --git a/metadata/md5-cache/media-gfx/hydrus-571 b/metadata/md5-cache/media-gfx/hydrus-571
new file mode 100644
index 000000000000..7c655494cbd5
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/hydrus-571
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite] ) python_single_target_python3_10? ( dev-python/beautifulsoup4[python_targets_python3_10(-)] dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service-identity[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] dev-python/QtPy[widgets,gui,svg,multimedia,python_targets_python3_10(-)] || ( dev-python/QtPy[pyside2] dev-python/QtPy[pyqt6] ) media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg ) python_single_target_python3_11? ( dev-python/beautifulsoup4[python_targets_python3_11(-)] dev-python/cbor2[python_targets_python3_11(-)] dev-python/chardet[python_targets_python3_11(-)] dev-python/cloudscraper[python_targets_python3_11(-)] dev-python/html5lib[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-),lcms] dev-python/psutil[python_targets_python3_11(-)] dev-python/pyopenssl[python_targets_python3_11(-)] dev-python/python-mpv[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/send2trash[python_targets_python3_11(-)] dev-python/service-identity[python_targets_python3_11(-)] dev-python/twisted[python_targets_python3_11(-)] dev-python/QtPy[widgets,gui,svg,multimedia,python_targets_python3_11(-)] || ( dev-python/QtPy[pyside2] dev-python/QtPy[pyqt6] ) media-libs/opencv[python,png,jpeg,python_targets_python3_11(-)] media-video/ffmpeg ) python_single_target_python3_10? ( test? ( dev-python/httmock[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( test? ( dev-python/httmock[python_targets_python3_11(-)] dev-python/mock[python_targets_python3_11(-)] ) ) doc? ( python_single_target_python3_10? ( dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mkdocs[python_targets_python3_11(-)] dev-python/mkdocs-material[python_targets_python3_11(-)] dev-python/regex[python_targets_python3_11(-)] ) )
+DEFINED_PHASES=compile install postinst prepare setup test
+DESCRIPTION=A booru-like media organizer for the desktop
+EAPI=8
+HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
+INHERIT=python-single-r1 desktop docs optfeature
+IUSE=test python_single_target_python3_10 python_single_target_python3_11 doc
+KEYWORDS=~amd64
+LICENSE=WTFPL-2 CC-BY-2.5
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite] ) python_single_target_python3_10? ( dev-python/beautifulsoup4[python_targets_python3_10(-)] dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service-identity[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] dev-python/QtPy[widgets,gui,svg,multimedia,python_targets_python3_10(-)] || ( dev-python/QtPy[pyside2] dev-python/QtPy[pyqt6] ) media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg ) python_single_target_python3_11? ( dev-python/beautifulsoup4[python_targets_python3_11(-)] dev-python/cbor2[python_targets_python3_11(-)] dev-python/chardet[python_targets_python3_11(-)] dev-python/cloudscraper[python_targets_python3_11(-)] dev-python/html5lib[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-),lcms] dev-python/psutil[python_targets_python3_11(-)] dev-python/pyopenssl[python_targets_python3_11(-)] dev-python/python-mpv[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/send2trash[python_targets_python3_11(-)] dev-python/service-identity[python_targets_python3_11(-)] dev-python/twisted[python_targets_python3_11(-)] dev-python/QtPy[widgets,gui,svg,multimedia,python_targets_python3_11(-)] || ( dev-python/QtPy[pyside2] dev-python/QtPy[pyqt6] ) media-libs/opencv[python,png,jpeg,python_targets_python3_11(-)] media-video/ffmpeg )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v571.tar.gz -> hydrus-571.tar.gz https://github.com/vaartis/hydrus/commit/5d2505a1eb4721f7750861f7622c46adec31db8b.diff -> hydrus-3500-mpeg-error.patch https://github.com/vaartis/hydrus/commit/dc20196f47ac29568a40cd04a45cf4fc5f237603.diff -> hydrus-test-fixes.patch
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	docs	7f3c0d47338743498c69f1887a139f57	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=0d9a5485b13d69f7fc378ab619cf3d8a
diff --git a/metadata/md5-cache/media-gfx/pngnq-1.1-r2 b/metadata/md5-cache/media-gfx/pngnq-1.1-r2
new file mode 100644
index 000000000000..eca99fd949cc
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/pngnq-1.1-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3
+DEFINED_PHASES=prepare
+DEPEND=media-libs/libpng:0=
+DESCRIPTION=Pngnq is a tool for quantizing PNG images in RGBA format
+EAPI=8
+HOMEPAGE=https://pngnq.sourceforge.net/
+INHERIT=autotools
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD pngnq rwpng
+RDEPEND=media-libs/libpng:0=
+SLOT=0
+SRC_URI=https://downloads.sourceforge.net/pngnq/pngnq-1.1.tar.gz
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=14f6b93cbee5938575073cf05ea4d449
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index f23dcc461978..10515109ff58 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/aubio-0.4.9-r3 b/metadata/md5-cache/media-libs/aubio-0.4.9-r3
new file mode 100644
index 000000000000..fb5be5b5b206
--- /dev/null
+++ b/metadata/md5-cache/media-libs/aubio-0.4.9-r3
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=ffmpeg? ( >=media-video/ffmpeg-2.6:0= ) fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) python? ( python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] ) dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) sndfile? ( media-libs/libsndfile ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] ) app-text/txt2man virtual/pkgconfig doc? ( app-text/doxygen dev-python/sphinx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] )
+DESCRIPTION=Library for audio labelling
+EAPI=8
+HOMEPAGE=https://aubio.org/
+INHERIT=distutils-r1 waf-utils
+IUSE=doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~amd64 ~loong ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=ffmpeg? ( >=media-video/ffmpeg-2.6:0= ) fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) python? ( python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] ) dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) sndfile? ( media-libs/libsndfile )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) ?? ( double-precision libsamplerate ) doc? ( python )
+RESTRICT=!test? ( test )
+SLOT=0/5
+SRC_URI=https://aubio.org/pub/aubio-0.4.9.tar.bz2 https://waf.io/waf-2.0.27.tar.bz2
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	waf-utils	be1df8dc616c09387b18633b4155fcb5
+_md5_=168efa11991e59c58b240b715b5ae6b2
diff --git a/metadata/md5-cache/media-libs/openexr-3.1.11 b/metadata/md5-cache/media-libs/openexr-3.1.11
index 1e0191718ce3..5bd698a5e648 100644
--- a/metadata/md5-cache/media-libs/openexr-3.1.11
+++ b/metadata/md5-cache/media-libs/openexr-3.1.11
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://openexr.com/
 INHERIT=cmake flag-o-matic
 IUSE=cpu_flags_x86_avx examples large-stack utils test threads
-KEYWORDS=amd64 ~arm ~arm64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=>=dev-libs/imath-3.1.6:= sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=0/30
 SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v3.1.11.tar.gz -> openexr-3.1.11.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0b86954eb49f4f991882716a6b4c7363
+_md5_=1c077e1dd1bc4b82df755b9bb34451c1
diff --git a/metadata/md5-cache/media-libs/openexr-3.1.12 b/metadata/md5-cache/media-libs/openexr-3.1.12
index cc18a2d21a3a..0c81d7cc54f6 100644
--- a/metadata/md5-cache/media-libs/openexr-3.1.12
+++ b/metadata/md5-cache/media-libs/openexr-3.1.12
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/30
 SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v3.1.12.tar.gz -> openexr-3.1.12.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0d29277969a82f5ce44533bbbc64f5f7
+_md5_=4f5d485a40b709337f7abb58a91ed86a
diff --git a/metadata/md5-cache/media-libs/openexr-3.2.3 b/metadata/md5-cache/media-libs/openexr-3.2.3
index ccc42b3626b3..14038df09945 100644
--- a/metadata/md5-cache/media-libs/openexr-3.2.3
+++ b/metadata/md5-cache/media-libs/openexr-3.2.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://openexr.com/
 INHERIT=cmake flag-o-matic
 IUSE=cpu_flags_x86_avx doc examples large-stack utils test threads
-KEYWORDS=amd64 ~arm ~arm64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=app-arch/libdeflate[zlib] >=dev-libs/imath-3.1.6:=
 REQUIRED_USE=doc? ( utils )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/31
 SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v3.2.3.tar.gz -> openexr-3.2.3.tar.gz test? ( utils? ( https://github.com/AcademySoftwareFoundation/openexr-images/archive/refs/tags/v1.0.tar.gz -> openexr-images-1.0.tar.gz ) )
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f156b9005de0bb251fb64d13dc301b9c
+_md5_=fbed43bc36abea0f3ea915b5592b53f5
diff --git a/metadata/md5-cache/media-libs/openexr-3.2.4 b/metadata/md5-cache/media-libs/openexr-3.2.4
new file mode 100644
index 000000000000..89214a976b07
--- /dev/null
+++ b/metadata/md5-cache/media-libs/openexr-3.2.4
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig doc? ( sys-apps/help2man ) app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/libdeflate[zlib] >=dev-libs/imath-3.1.6:=
+DESCRIPTION=ILM's OpenEXR high dynamic-range image file format libraries
+EAPI=8
+HOMEPAGE=https://openexr.com/
+INHERIT=cmake flag-o-matic
+IUSE=cpu_flags_x86_avx doc examples large-stack utils test threads
+KEYWORDS=~amd64 ~arm ~arm64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=app-arch/libdeflate[zlib] >=dev-libs/imath-3.1.6:=
+REQUIRED_USE=doc? ( utils )
+RESTRICT=!test? ( test )
+SLOT=0/31
+SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v3.2.4.tar.gz -> openexr-3.2.4.tar.gz test? ( utils? ( https://github.com/AcademySoftwareFoundation/openexr-images/archive/refs/tags/v1.0.tar.gz -> openexr-images-1.0.tar.gz ) )
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=008dcd309ea3f983c980a5548b29b686
diff --git a/metadata/md5-cache/media-libs/openimageio-2.5.9.0 b/metadata/md5-cache/media-libs/openimageio-2.5.9.0
index b0ea4c43b66b..44920c6b6a6d 100644
--- a/metadata/md5-cache/media-libs/openimageio-2.5.9.0
+++ b/metadata/md5-cache/media-libs/openimageio-2.5.9.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
 INHERIT=cmake flag-o-matic font python-single-r1 virtualx
 IUSE=dicom doc ffmpeg fits gif gui jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c X python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.13.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) fits? ( sci-libs/cfitsio:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-libs/boost:=[python,python_targets_python3_12(-)] dev-python/numpy[python_targets_python3_12(-)] dev-python/pybind11[python_targets_python3_12(-)] ) ) gui? ( media-libs/libglvnd !qt6? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets,opengl] ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) ) gui? ( tools ) test? ( tools )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0/2.5
 SRC_URI=https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v2.5.9.0.tar.gz -> openimageio-2.5.9.0.tar.gz test? ( https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz -> openimageio-oiio-test-image-aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz https://github.com/AcademySoftwareFoundation/openexr-images/archive/df16e765fee28a947244657cae3251959ae63c00.tar.gz -> openimageio-oexr-test-image-df16e765fee28a947244657cae3251959ae63c00.tar.gz jpeg2k? ( https://www.itu.int/wftp3/Public/t/testsignal/SpeImage/T803/v2002_11/J2KP4files.zip ) fits? ( https://www.cv.nrao.edu/fits/data/tests/ftt4b/file001.fits https://www.cv.nrao.edu/fits/data/tests/ftt4b/file002.fits https://www.cv.nrao.edu/fits/data/tests/ftt4b/file003.fits https://www.cv.nrao.edu/fits/data/tests/ftt4b/file009.fits https://www.cv.nrao.edu/fits/data/tests/ftt4b/file012.fits https://www.cv.nrao.edu/fits/data/tests/pg93/tst0001.fits https://www.cv.nrao.edu/fits/data/tests/pg93/tst0003.fits https://www.cv.nrao.edu/fits/data/tests/pg93/tst0005.fits https://www.cv.nrao.edu/fits/data/tests/pg93/tst0006.fits https://www.cv.nrao.edu/fits/data/tests/pg93/tst0007.fits https://www.cv.nrao.edu/fits/data/tests/pg93/tst0008.fits https://www.cv.nrao.edu/fits/data/tests/pg93/tst0013.fits ) )
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=27a61169d2e33f0b1a03548a4736ccb2
+_md5_=d935eda37fa63a78e372bd971654ac3b
diff --git a/metadata/md5-cache/media-libs/osl-1.13.7.0 b/metadata/md5-cache/media-libs/osl-1.13.7.0
index a8f2ff5de6fa..bfac371b14d6 100644
--- a/metadata/md5-cache/media-libs/osl-1.13.7.0
+++ b/metadata/md5-cache/media-libs/osl-1.13.7.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.imageworks.com/technology/opensource https://github.com/AcademySoftwareFoundation/OpenShadingLanguage
 INHERIT=cmake cuda flag-o-matic llvm-r1 toolchain-funcs python-single-r1
 IUSE=doc gui libcxx nofma optix partio qt6 test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c python +llvm_slot_17 llvm_slot_15 llvm_slot_16 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64
 LICENSE=BSD
 RDEPEND=dev-libs/boost:= dev-libs/pugixml >=media-libs/openexr-3:0= >=media-libs/openimageio-2.4:= llvm_slot_15? ( sys-devel/clang:15 sys-devel/llvm:15 ) llvm_slot_16? ( sys-devel/clang:16 sys-devel/llvm:16 ) llvm_slot_17? ( sys-devel/clang:17 sys-devel/llvm:17 ) sys-libs/zlib:= optix? ( dev-libs/optix[-headers-only] ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] media-libs/openimageio[python,python_single_target_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pybind11[python_targets_python3_11(-)] media-libs/openimageio[python,python_single_target_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pybind11[python_targets_python3_12(-)] media-libs/openimageio[python,python_single_target_python3_12(-)] ) ) partio? ( media-libs/partio ) gui? ( !qt6? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtopengl:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets,opengl] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) ^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.13.7
 SRC_URI=https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v1.13.7.0.tar.gz -> osl-1.13.7.0.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d71d7ab54556e5bc1cc905044eedfa14
+_md5_=679913c426cb55c60ee80d401caa39a1
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index a2b7e4fd1b84..fa09cd183454 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/abcmidi-2024.03.21 b/metadata/md5-cache/media-sound/abcmidi-2024.03.21
deleted file mode 100644
index e0c1c0ec24d3..000000000000
--- a/metadata/md5-cache/media-sound/abcmidi-2024.03.21
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Programs for processing ABC music notation files
-EAPI=8
-HOMEPAGE=https://ifdo.ca/~seymour/runabc/top.html
-INHERIT=autotools flag-o-matic
-IUSE=examples
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://ifdo.ca/~seymour/runabc/abcMIDI-2024.03.21.zip
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=faced3308f3c68df71f2ba9b629da40e
diff --git a/metadata/md5-cache/media-sound/grip-4.2.4 b/metadata/md5-cache/media-sound/grip-4.2.4
deleted file mode 100644
index d1f1eee120ab..000000000000
--- a/metadata/md5-cache/media-sound/grip-4.2.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure postinst postrm preinst
-DEPEND=!app-text/grip dev-libs/glib:2 media-libs/id3lib media-sound/cdparanoia media-sound/lame net-misc/curl x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango vorbis? ( media-sound/vorbis-tools ) sys-devel/gettext
-DESCRIPTION=GTK+ based Audio CD Player/Ripper
-EAPI=8
-HOMEPAGE=https://sourceforge.net/projects/grip/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=flag-o-matic toolchain-funcs xdg strip-linguas
-IUSE=vorbis
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=!app-text/grip dev-libs/glib:2 media-libs/id3lib media-sound/cdparanoia media-sound/lame net-misc/curl x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango vorbis? ( media-sound/vorbis-tools )
-SLOT=0
-SRC_URI=https://downloads.sourceforge.net/grip/grip-4.2.4.tar.gz
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e62670bec1ff01ba3f77cef7b4a4a63f
diff --git a/metadata/md5-cache/media-sound/qjackctl-0.9.13 b/metadata/md5-cache/media-sound/qjackctl-0.9.13
deleted file mode 100644
index 00fd6fbe725c..000000000000
--- a/metadata/md5-cache/media-sound/qjackctl-0.9.13
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 virtual/jack alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) portaudio? ( media-libs/portaudio )
-DESCRIPTION=Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections
-EAPI=8
-HOMEPAGE=https://qjackctl.sourceforge.io/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=xdg cmake
-IUSE=alsa dbus debug portaudio
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 virtual/jack alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) portaudio? ( media-libs/portaudio ) dev-qt/qtsvg:5
-SLOT=0
-SRC_URI=https://downloads.sourceforge.net/qjackctl/qjackctl-0.9.13.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=000ce4bc70aebe970d34d902a332200f
diff --git a/metadata/md5-cache/media-sound/qjackctl-0.9.90 b/metadata/md5-cache/media-sound/qjackctl-0.9.90
deleted file mode 100644
index dca93e9d043a..000000000000
--- a/metadata/md5-cache/media-sound/qjackctl-0.9.90
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 virtual/jack alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) portaudio? ( media-libs/portaudio )
-DESCRIPTION=Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections
-EAPI=8
-HOMEPAGE=https://qjackctl.sourceforge.io/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=xdg cmake
-IUSE=alsa dbus debug portaudio
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 virtual/jack alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) portaudio? ( media-libs/portaudio ) dev-qt/qtsvg:5
-SLOT=0
-SRC_URI=https://downloads.sourceforge.net/qjackctl/qjackctl-0.9.90.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0d7ab17e8d186c97683e3594ba73c4ff
diff --git a/metadata/md5-cache/media-sound/qsampler-0.9.12 b/metadata/md5-cache/media-sound/qsampler-0.9.12
deleted file mode 100644
index 32d57f5d6823..000000000000
--- a/metadata/md5-cache/media-sound/qsampler-0.9.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=qt6? ( dev-qt/qttools:6[linguist] ) !qt6? ( dev-qt/linguist-tools:5 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=media-libs/alsa-lib media-libs/liblscp:= x11-libs/libX11 libgig? ( media-libs/libgig:= ) qt6? ( dev-qt/qtbase:6[gui,network,widgets] dev-qt/qtsvg:6 ) !qt6? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 )
-DESCRIPTION=Graphical frontend to the LinuxSampler engine
-EAPI=8
-HOMEPAGE=https://qsampler.sourceforge.io/ https://www.linuxsampler.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake xdg
-IUSE=debug +libgig qt6
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/alsa-lib media-libs/liblscp:= x11-libs/libX11 libgig? ( media-libs/libgig:= ) qt6? ( dev-qt/qtbase:6[gui,network,widgets] dev-qt/qtsvg:6 ) !qt6? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) media-sound/linuxsampler
-SLOT=0
-SRC_URI=https://downloads.sourceforge.net/qsampler/0.9.12/qsampler-0.9.12.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=43d92397fd2d2f31f524184814e85053
diff --git a/metadata/md5-cache/media-sound/qtractor-0.9.39 b/metadata/md5-cache/media-sound/qtractor-0.9.39
deleted file mode 100644
index fab8caefc12a..000000000000
--- a/metadata/md5-cache/media-sound/qtractor-0.9.39
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/libsndfile media-libs/lilv media-libs/lv2 media-libs/suil virtual/jack x11-libs/libxcb:= aubio? ( media-libs/aubio:= ) dssi? ( media-libs/dssi ) ladspa? ( media-libs/ladspa-sdk ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib )
-DESCRIPTION=Audio/MIDI multi-track sequencer written in C++ with the Qt framework
-EAPI=8
-HOMEPAGE=https://qtractor.sourceforge.io https://github.com/rncbc/qtractor
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake flag-o-matic xdg
-IUSE=aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/libsndfile media-libs/lilv media-libs/lv2 media-libs/suil virtual/jack x11-libs/libxcb:= aubio? ( media-libs/aubio:= ) dssi? ( media-libs/dssi ) ladspa? ( media-libs/ladspa-sdk ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=dssi? ( ladspa )
-SLOT=0
-SRC_URI=https://downloads.sourceforge.net/qtractor/qtractor-0.9.39.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3f1b40c75b957d35720834e7dad651b4
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 0585f0df96ef..7ccc14fcf38e 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/kodi-20.3-r1 b/metadata/md5-cache/media-tv/kodi-20.3-r1
deleted file mode 100644
index d3426da04a84..000000000000
--- a/metadata/md5-cache/media-tv/kodi-20.3-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=>=dev-libs/flatbuffers-1.12.0:= >=dev-libs/lzo-2.04:2 media-libs/giflib:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= wayland? ( dev-cpp/waylandpp:= ) dev-build/cmake <dev-lang/swig-4.2.0 virtual/pkgconfig <=virtual/jre-17:* doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/flatbuffers-1.12.0:= >=dev-libs/lzo-2.04:2 media-libs/giflib:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= wayland? ( dev-cpp/waylandpp:= ) python_single_target_python3_10? ( dev-lang/python:3.10[sqlite,ssl] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite,ssl] ) >=net-misc/curl-7.68.0[http2] >=sys-libs/zlib-1.2.11 dev-db/sqlite:3 dev-libs/crossguid >=dev-libs/fribidi-1.0.5 >=dev-libs/libcdio-2.1.0:=[cxx] >=dev-libs/libfmt-6.1.2:= dev-libs/libfstrcmp dev-libs/libpcre[cxx] >=dev-libs/openssl-1.1.1k:0= >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] media-fonts/roboto media-libs/libglvnd[X?] >=media-libs/freetype-2.10.1 media-libs/harfbuzz:= >=media-libs/libass-0.13.4:= media-libs/mesa[egl(+),gbm(+)?,wayland?,X?] >=media-libs/taglib-1.9.0 sci-libs/kissfft virtual/libiconv virtual/ttf-fonts x11-libs/libdrm python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pillow[python_targets_python3_11(-)] dev-python/pycryptodome[python_targets_python3_11(-)] ) airplay? ( >=app-pda/libplist-2.0.0:= net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez:= ) bluray? ( >=media-libs/libbluray-1.1.2:= ) caps? ( sys-libs/libcap ) cec? ( >=dev-libs/libcec-4.0[-cubox] ) dbus? ( sys-apps/dbus ) gbm? ( >=dev-libs/libinput-1.10.5:= x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( || ( >=media-libs/mesa-24.1.0_rc1[opengl] <media-libs/mesa-24.1.0_rc1[gles2] ) ) ) !gles? ( media-libs/glu ) lcms? ( >=media-libs/lcms-2.10:2 ) libusb? ( virtual/libusb:1 ) lirc? ( app-misc/lirc ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) nfs? ( >=net-fs/libnfs-2.0.0:= ) pipewire? ( >=media-video/pipewire-0.3.24:= ) pulseaudio? ( media-libs/libpulse ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin >=media-libs/mesa-24.1.0_rc1[opengl,video_cards_vc4] <media-libs/mesa-24.1.0_rc1[egl(+),gles2,video_cards_vc4] ) ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) system-ffmpeg? ( >=media-video/ffmpeg-4.4.1:=[encode,postproc,vaapi?,vdpau?,X?] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 media-libs/dav1d:= ) udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/libudev:= ) vaapi? ( media-libs/libva:=[wayland?,X?] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) ) wayland? ( >=x11-libs/libxkbcommon-0.4.1[wayland] ) webserver? ( >=net-libs/libmicrohttpd-0.9.55:=[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) dev-libs/rapidjson test? ( >=dev-cpp/gtest-1.10.0 ) wayland? ( >=dev-libs/wayland-protocols-1.7 ) X? ( x11-base/xorg-proto x11-libs/libXrender ) >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=A free and open source media-player and entertainment hub
-EAPI=8
-HOMEPAGE=https://kodi.tv/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake desktop flag-o-matic java-pkg-2 linux-info optfeature pax-utils python-single-r1 xdg
-IUSE=airplay alsa bluetooth bluray caps cec +css dbus doc eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire pulseaudio raspberry-pi samba system-ffmpeg test udf udev upnp vaapi vdpau wayland webserver X +xslt zeroconf cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/flatbuffers-1.12.0:= >=dev-libs/lzo-2.04:2 media-libs/giflib:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= wayland? ( dev-cpp/waylandpp:= ) python_single_target_python3_10? ( dev-lang/python:3.10[sqlite,ssl] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite,ssl] ) >=net-misc/curl-7.68.0[http2] >=sys-libs/zlib-1.2.11 dev-db/sqlite:3 dev-libs/crossguid >=dev-libs/fribidi-1.0.5 >=dev-libs/libcdio-2.1.0:=[cxx] >=dev-libs/libfmt-6.1.2:= dev-libs/libfstrcmp dev-libs/libpcre[cxx] >=dev-libs/openssl-1.1.1k:0= >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] media-fonts/roboto media-libs/libglvnd[X?] >=media-libs/freetype-2.10.1 media-libs/harfbuzz:= >=media-libs/libass-0.13.4:= media-libs/mesa[egl(+),gbm(+)?,wayland?,X?] >=media-libs/taglib-1.9.0 sci-libs/kissfft virtual/libiconv virtual/ttf-fonts x11-libs/libdrm python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pillow[python_targets_python3_11(-)] dev-python/pycryptodome[python_targets_python3_11(-)] ) airplay? ( >=app-pda/libplist-2.0.0:= net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez:= ) bluray? ( >=media-libs/libbluray-1.1.2:= ) caps? ( sys-libs/libcap ) cec? ( >=dev-libs/libcec-4.0[-cubox] ) dbus? ( sys-apps/dbus ) gbm? ( >=dev-libs/libinput-1.10.5:= x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( || ( >=media-libs/mesa-24.1.0_rc1[opengl] <media-libs/mesa-24.1.0_rc1[gles2] ) ) ) !gles? ( media-libs/glu ) lcms? ( >=media-libs/lcms-2.10:2 ) libusb? ( virtual/libusb:1 ) lirc? ( app-misc/lirc ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) nfs? ( >=net-fs/libnfs-2.0.0:= ) pipewire? ( >=media-video/pipewire-0.3.24:= ) pulseaudio? ( media-libs/libpulse ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin >=media-libs/mesa-24.1.0_rc1[opengl,video_cards_vc4] <media-libs/mesa-24.1.0_rc1[egl(+),gles2,video_cards_vc4] ) ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) system-ffmpeg? ( >=media-video/ffmpeg-4.4.1:=[encode,postproc,vaapi?,vdpau?,X?] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 media-libs/dav1d:= ) udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/libudev:= ) vaapi? ( media-libs/libva:=[wayland?,X?] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) ) wayland? ( >=x11-libs/libxkbcommon-0.4.1[wayland] ) webserver? ( >=net-libs/libmicrohttpd-0.9.55:=[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-java/java-config-2.2.0-r3
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) gbm? ( udev ) udev? ( !libusb ) vdpau? ( X !gles !gbm ) zeroconf? ( dbus )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/xbmc/libdvdnav/archive/6.1.1-Next-Nexus-Alpha2-2.tar.gz -> libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz https://github.com/xbmc/libdvdread/archive/6.1.3-Next-Nexus-Alpha2-2.tar.gz -> libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz css? ( https://github.com/xbmc/libdvdcss/archive/1.4.3-Next-Nexus-Alpha2-2.tar.gz -> libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz ) !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.4.1-Nexus-Alpha1.tar.gz -> ffmpeg-kodi-4.4.1-Nexus-Alpha1.tar.gz ) https://github.com/xbmc/xbmc/archive/20.3-Nexus.tar.gz -> kodi-20.3-Nexus.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=82243488cdbded62144c20bebf6f96d5
diff --git a/metadata/md5-cache/media-tv/kodi-21.0-r2 b/metadata/md5-cache/media-tv/kodi-21.0-r2
new file mode 100644
index 000000000000..3adb8d472ba8
--- /dev/null
+++ b/metadata/md5-cache/media-tv/kodi-21.0-r2
@@ -0,0 +1,18 @@
+BDEPEND=>=dev-libs/flatbuffers-23.3.3:= >=dev-libs/lzo-2.04:2 media-libs/giflib:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= wayland? ( dev-cpp/waylandpp:= ) app-arch/unzip dev-build/cmake dev-lang/swig virtual/pkgconfig <=virtual/jre-17:* doc? ( app-text/doxygen ) >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3 app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/flatbuffers-23.3.3:= >=dev-libs/lzo-2.04:2 media-libs/giflib:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= wayland? ( dev-cpp/waylandpp:= ) python_single_target_python3_10? ( dev-lang/python:3.10[sqlite,ssl] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite,ssl] ) python_single_target_python3_12? ( dev-lang/python:3.12[sqlite,ssl] ) >=net-misc/curl-7.68.0[http2] >=sys-libs/zlib-1.2.11 dev-db/sqlite:3 dev-libs/crossguid >=dev-libs/fribidi-1.0.5 >=dev-libs/libcdio-2.1.0:=[cxx] >=dev-libs/libfmt-6.1.2:= dev-libs/libfstrcmp dev-libs/libpcre[cxx] >=dev-libs/openssl-1.1.1k:0= >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] dev-libs/tinyxml2:= media-fonts/roboto media-libs/libglvnd[X?] >=media-libs/freetype-2.10.1 media-libs/harfbuzz:= >=media-libs/libass-0.15.0:= media-libs/mesa[egl(+),gbm(+)?,wayland?,X?] >=media-libs/taglib-1.9.0 =media-video/ffmpeg-6*:=[encode,soc(-)?,postproc,vaapi?,vdpau?,X?] sci-libs/kissfft virtual/libiconv virtual/ttf-fonts x11-libs/libdrm python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pillow[python_targets_python3_11(-)] dev-python/pycryptodome[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pillow[python_targets_python3_12(-)] dev-python/pycryptodome[python_targets_python3_12(-)] ) airplay? ( >=app-pda/libplist-2.0.0:= net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez:= ) bluray? ( >=media-libs/libbluray-1.1.2:= ) caps? ( sys-libs/libcap ) cec? ( >=dev-libs/libcec-4.0[-cubox] ) dbus? ( sys-apps/dbus ) gbm? ( >=dev-libs/libinput-1.10.5:= media-libs/libdisplay-info x11-libs/libxkbcommon ) gles? ( || ( >=media-libs/mesa-24.1.0_rc1[opengl] <media-libs/mesa-24.1.0_rc1[gles2] ) ) !gles? ( media-libs/glu ) lcms? ( >=media-libs/lcms-2.10:2 ) libusb? ( virtual/libusb:1 ) lirc? ( app-misc/lirc ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) nfs? ( >=net-fs/libnfs-2.0.0:= ) pipewire? ( >=media-video/pipewire-0.3.50:= ) pulseaudio? ( media-libs/libpulse ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/libudev:= ) vaapi? ( media-libs/libva:=[wayland?,X?] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) ) wayland? ( >=x11-libs/libxkbcommon-0.4.1[wayland] ) webserver? ( >=net-libs/libmicrohttpd-0.9.77:=[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-libs/rapidjson-1.0.2 test? ( >=dev-cpp/gtest-1.10.0 ) wayland? ( >=dev-libs/wayland-protocols-1.7 ) X? ( x11-base/xorg-proto x11-libs/libXrender ) >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=A free and open source media-player and entertainment hub
+EAPI=8
+HOMEPAGE=https://kodi.tv/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools cmake desktop flag-o-matic java-pkg-2 libtool linux-info optfeature pax-utils python-single-r1 toolchain-funcs xdg
+IUSE=airplay alsa bluetooth bluray caps cec +css dbus doc eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire pulseaudio samba soc +system-ffmpeg test udf udev upnp vaapi vdpau wayland webserver X +xslt zeroconf cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/flatbuffers-23.3.3:= >=dev-libs/lzo-2.04:2 media-libs/giflib:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= wayland? ( dev-cpp/waylandpp:= ) python_single_target_python3_10? ( dev-lang/python:3.10[sqlite,ssl] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite,ssl] ) python_single_target_python3_12? ( dev-lang/python:3.12[sqlite,ssl] ) >=net-misc/curl-7.68.0[http2] >=sys-libs/zlib-1.2.11 dev-db/sqlite:3 dev-libs/crossguid >=dev-libs/fribidi-1.0.5 >=dev-libs/libcdio-2.1.0:=[cxx] >=dev-libs/libfmt-6.1.2:= dev-libs/libfstrcmp dev-libs/libpcre[cxx] >=dev-libs/openssl-1.1.1k:0= >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] dev-libs/tinyxml2:= media-fonts/roboto media-libs/libglvnd[X?] >=media-libs/freetype-2.10.1 media-libs/harfbuzz:= >=media-libs/libass-0.15.0:= media-libs/mesa[egl(+),gbm(+)?,wayland?,X?] >=media-libs/taglib-1.9.0 =media-video/ffmpeg-6*:=[encode,soc(-)?,postproc,vaapi?,vdpau?,X?] sci-libs/kissfft virtual/libiconv virtual/ttf-fonts x11-libs/libdrm python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pillow[python_targets_python3_11(-)] dev-python/pycryptodome[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pillow[python_targets_python3_12(-)] dev-python/pycryptodome[python_targets_python3_12(-)] ) airplay? ( >=app-pda/libplist-2.0.0:= net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez:= ) bluray? ( >=media-libs/libbluray-1.1.2:= ) caps? ( sys-libs/libcap ) cec? ( >=dev-libs/libcec-4.0[-cubox] ) dbus? ( sys-apps/dbus ) gbm? ( >=dev-libs/libinput-1.10.5:= media-libs/libdisplay-info x11-libs/libxkbcommon ) gles? ( || ( >=media-libs/mesa-24.1.0_rc1[opengl] <media-libs/mesa-24.1.0_rc1[gles2] ) ) !gles? ( media-libs/glu ) lcms? ( >=media-libs/lcms-2.10:2 ) libusb? ( virtual/libusb:1 ) lirc? ( app-misc/lirc ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) nfs? ( >=net-fs/libnfs-2.0.0:= ) pipewire? ( >=media-video/pipewire-0.3.50:= ) pulseaudio? ( media-libs/libpulse ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/libudev:= ) vaapi? ( media-libs/libva:=[wayland?,X?] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) ) wayland? ( >=x11-libs/libxkbcommon-0.4.1[wayland] ) webserver? ( >=net-libs/libmicrohttpd-0.9.77:=[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-java/java-config-2.2.0-r3
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) ^^ ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) gbm? ( udev ) soc? ( system-ffmpeg ) udev? ( !libusb ) vdpau? ( X !gles !gbm ) zeroconf? ( dbus )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/xbmc/libdvdnav/archive/6.1.1-Next-Nexus-Alpha2-2.tar.gz -> libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz https://github.com/xbmc/libdvdread/archive/6.1.3-Next-Nexus-Alpha2-2.tar.gz -> libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip https://mirrors.kodi.tv/build-deps/sources/commons-lang3-3.14.0-bin.tar.gz https://mirrors.kodi.tv/build-deps/sources/commons-text-1.11.0-bin.tar.gz css? ( https://github.com/xbmc/libdvdcss/archive/1.4.3-Next-Nexus-Alpha2-2.tar.gz -> libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz ) !system-ffmpeg? ( https://ffmpeg.org/releases/ffmpeg-6.0.1.tar.gz ) https://github.com/xbmc/xbmc/archive/21.0-Omega.tar.gz -> kodi-21.0-Omega.tar.gz
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=92b21d45fd0e372afd5747692553d751
diff --git a/metadata/md5-cache/media-tv/tvheadend-4.2.8-r2 b/metadata/md5-cache/media-tv/tvheadend-4.2.8-r2
deleted file mode 100644
index d8afe7604491..000000000000
--- a/metadata/md5-cache/media-tv/tvheadend-4.2.8-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) sys-devel/gettext virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst setup
-DEPEND=acct-user/tvheadend virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) dvben50221? ( media-tv/linuxtv-dvb-apps ) ffmpeg? ( <media-video/ffmpeg-5:= ) hdhomerun? ( media-libs/libhdhomerun ) dev-libs/openssl:0= uriparser? ( dev-libs/uriparser ) zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib ) dvb? ( sys-kernel/linux-headers )
-DESCRIPTION=Tvheadend is a TV streaming server and digital video recorder
-EAPI=8
-HOMEPAGE=https://tvheadend.org/
-INHERIT=linux-info python-any-r1 systemd toolchain-funcs
-IUSE=+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun +imagecache +inotify iptv satip systemd +timeshift uriparser xmltv zeroconf zlib
-KEYWORDS=amd64 arm arm64 x86
-LICENSE=GPL-3
-RDEPEND=acct-user/tvheadend virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) dvben50221? ( media-tv/linuxtv-dvb-apps ) ffmpeg? ( <media-video/ffmpeg-5:= ) hdhomerun? ( media-libs/libhdhomerun ) dev-libs/openssl:0= uriparser? ( dev-libs/uriparser ) zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib ) dvb? ( media-tv/dtv-scan-tables ) xmltv? ( media-tv/xmltv )
-REQUIRED_USE=dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )
-SLOT=0
-SRC_URI=https://github.com/tvheadend/tvheadend/archive/v4.2.8.tar.gz -> tvheadend-4.2.8.tar.gz
-_eclasses_=linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a2fa7c466e70716739d7aa27d8dc7c26
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 0cc624f26b3d..f9dd76ffc4f3 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/subliminal-2.1.0-r2 b/metadata/md5-cache/media-video/subliminal-2.1.0-r2
index 7b3438dbaf7a..f371359d3d5d 100644
--- a/metadata/md5-cache/media-video/subliminal-2.1.0-r2
+++ b/metadata/md5-cache/media-video/subliminal-2.1.0-r2
@@ -1,16 +1,16 @@
-BDEPEND=test? ( app-arch/unzip dev-python/sympy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/vcrpy-1.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/appdirs-1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/babelfish-0.5.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/beautifulsoup4-4.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-2.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/decorator[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dogpile-cache-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/enzyme-0.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/guessit-2.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pysrt-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2012c[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rarfile-2.7[compressed,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( app-arch/unzip dev-python/sympy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/vcrpy-1.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/appdirs-1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/babelfish-0.5.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/beautifulsoup4-4.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/chardet-2.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/click-4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/decorator[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/dogpile-cache-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/enzyme-0.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/guessit-2.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pysrt-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytz-2012c[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rarfile-2.7[compressed,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/six-1.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/stevedore-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[xml(+)] ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Python library to search and download subtitles
 EAPI=8
 HOMEPAGE=https://github.com/Diaoul/subliminal https://pypi.org/project/subliminal/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/appdirs-1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/babelfish-0.5.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/beautifulsoup4-4.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-2.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/decorator[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dogpile-cache-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/enzyme-0.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/guessit-2.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pysrt-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2012c[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rarfile-2.7[compressed,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
+RDEPEND=>=dev-python/appdirs-1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/babelfish-0.5.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/beautifulsoup4-4.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/chardet-2.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/click-4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/decorator[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/dogpile-cache-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/enzyme-0.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/guessit-2.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pysrt-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytz-2012c[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rarfile-2.7[compressed,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/six-1.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/stevedore-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[xml(+)] )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Diaoul/subliminal/archive/2.1.0.tar.gz -> subliminal-2.1.0.tar.gz test? ( https://downloads.sourceforge.net/matroska/test_files/matroska_test_w1_1.zip )
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=b9d72c91a810ce5e89406a2cfa35bda0
+_md5_=f978dd5b724ef5fd7973913a27a67778
diff --git a/metadata/md5-cache/media-video/subliminal-9999 b/metadata/md5-cache/media-video/subliminal-9999
index 7fe876c3214d..6330f1ed0c94 100644
--- a/metadata/md5-cache/media-video/subliminal-9999
+++ b/metadata/md5-cache/media-video/subliminal-9999
@@ -1,16 +1,16 @@
-BDEPEND=test? ( app-arch/unzip dev-python/sympy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/vcrpy-1.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/appdirs-1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/babelfish-0.5.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/beautifulsoup4-4.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-2.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/decorator[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dogpile-cache-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/enzyme-0.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/guessit-2.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pysrt-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2012c[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rarfile-2.7[compressed,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( app-arch/unzip dev-python/sympy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/vcrpy-1.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/appdirs-1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/babelfish-0.5.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/beautifulsoup4-4.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/chardet-2.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/click-4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/decorator[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/dogpile-cache-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/enzyme-0.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/guessit-2.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pysrt-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytz-2012c[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rarfile-2.7[compressed,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/six-1.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/stevedore-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[xml(+)] ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Python library to search and download subtitles
 EAPI=8
 HOMEPAGE=https://github.com/Diaoul/subliminal https://pypi.org/project/subliminal/
 INHERIT=distutils-r1 git-r3
-IUSE=test python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=>=dev-python/appdirs-1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/babelfish-0.5.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/beautifulsoup4-4.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-2.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/decorator[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dogpile-cache-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/enzyme-0.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/guessit-2.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pysrt-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2012c[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rarfile-2.7[compressed,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
+RDEPEND=>=dev-python/appdirs-1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/babelfish-0.5.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/beautifulsoup4-4.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/chardet-2.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/click-4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/decorator[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/dogpile-cache-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/enzyme-0.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/guessit-2.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pysrt-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytz-2012c[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rarfile-2.7[compressed,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/six-1.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/stevedore-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[xml(+)] )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=test? ( https://downloads.sourceforge.net/matroska/test_files/matroska_test_w1_1.zip )
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=abfab71fac0f02075af2ae79ddf00996
+_md5_=16d11ab837640c2aa07eff40ac33dd77
diff --git a/metadata/md5-cache/media-video/wireplumber-0.5.3 b/metadata/md5-cache/media-video/wireplumber-0.5.3
new file mode 100644
index 000000000000..26e2ea8e3d73
--- /dev/null
+++ b/metadata/md5-cache/media-video/wireplumber-0.5.3
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/glib dev-util/gdbus-codegen dev-util/glib-utils sys-devel/gettext test? ( sys-apps/dbus ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst setup test
+DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.68 >=media-video/pipewire-1.0.5-r1:= virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
+DESCRIPTION=Replacement for pipewire-media-session
+EAPI=8
+HOMEPAGE=https://gitlab.freedesktop.org/pipewire/wireplumber
+INHERIT=lua-single meson systemd
+IUSE=elogind system-service systemd test lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.68 >=media-video/pipewire-1.0.5-r1:= virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire )
+REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( elogind systemd ) system-service? ( systemd )
+RESTRICT=!test? ( test )
+SLOT=0/0.5
+SRC_URI=https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.5.3/wireplumber-0.5.3.tar.bz2
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=454307805d879eb9f5fee61df308232e
diff --git a/metadata/md5-cache/media-video/wireplumber-9999 b/metadata/md5-cache/media-video/wireplumber-9999
index 3032ddc1409f..348edf163bd2 100644
--- a/metadata/md5-cache/media-video/wireplumber-9999
+++ b/metadata/md5-cache/media-video/wireplumber-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( elogi
 RESTRICT=!test? ( test )
 SLOT=0/0.5
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=ae3fc8e919d5ef191b9223b56092f4ee
+_md5_=454307805d879eb9f5fee61df308232e
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 7ed9ef9e7f06..37b5515a5cad 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.9.3-r3 b/metadata/md5-cache/net-analyzer/net-snmp-5.9.3-r3
index 037916078426..1d5d08e4208e 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.9.3-r3
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.9.3-r3
@@ -1,17 +1,17 @@
 BDEPEND=doc? ( app-text/doxygen ) >=app-portage/elt-patches-20240116 sys-devel/gnuconfig dev-build/automake || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3 virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) valgrind? ( dev-debug/valgrind )
+DEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/setuptools[python_targets_python3_12(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) valgrind? ( dev-debug/valgrind )
 DESCRIPTION=Software for generating and retrieving SNMP data
 EAPI=8
 HOMEPAGE=https://www.net-snmp.org/
 INHERIT=autotools distutils-r1 libtool perl-module systemd
-IUSE=X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql netlink pcap pci pcre perl python rpm selinux smux ssl tcpd ucd-compat valgrind zlib python_single_target_python3_10 python_single_target_python3_11
+IUSE=X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql netlink pcap pci pcre perl python rpm selinux smux ssl tcpd ucd-compat valgrind zlib python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=HPND BSD GPL-2
-RDEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Getopt-Long dev-perl/JSON dev-perl/Mail-Sender dev-perl/TermReadKey virtual/perl-Term-ReadLine ) ) selinux? ( sec-policy/selinux-snmp )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ) rpm? ( bzip2 zlib )
+RDEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/setuptools[python_targets_python3_12(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Getopt-Long dev-perl/JSON dev-perl/Mail-Sender dev-perl/TermReadKey virtual/perl-Term-ReadLine ) ) selinux? ( sec-policy/selinux-snmp )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) ) rpm? ( bzip2 zlib )
 RESTRICT=test
 SLOT=0/40
 SRC_URI=https://downloads.sourceforge.net/net-snmp/5.9.3/net-snmp-5.9.3.tar.gz https://dev.gentoo.org/~jsmolic/distfiles/net-snmp-5.7.3-patches-3.tar.xz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	07f7f317d867e5d5aa30fdeb6e873138	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=bcf39b2c4683dfb7ae3570e6eadcd980
+_md5_=f675399729b60f122be97ef09d609629
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.9.4 b/metadata/md5-cache/net-analyzer/net-snmp-5.9.4
index 393eb8a816ad..0cba70b4d6d9 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.9.4
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.9.4
@@ -1,17 +1,17 @@
 BDEPEND=doc? ( app-text/doxygen ) >=app-portage/elt-patches-20240116 sys-devel/gnuconfig dev-build/automake || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3 virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) valgrind? ( dev-debug/valgrind )
+DEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/setuptools[python_targets_python3_12(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) valgrind? ( dev-debug/valgrind )
 DESCRIPTION=Software for generating and retrieving SNMP data
 EAPI=8
 HOMEPAGE=https://www.net-snmp.org/
 INHERIT=autotools distutils-r1 libtool perl-module systemd
-IUSE=X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql netlink pcap pci pcre perl python rpm selinux smux ssl tcpd ucd-compat valgrind zlib python_single_target_python3_10 python_single_target_python3_11
+IUSE=X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql netlink pcap pci pcre perl python rpm selinux smux ssl tcpd ucd-compat valgrind zlib python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=HPND BSD GPL-2
-RDEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Getopt-Long dev-perl/JSON dev-perl/Mail-Sender dev-perl/TermReadKey virtual/perl-Term-ReadLine ) ) selinux? ( sec-policy/selinux-snmp )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ) rpm? ( bzip2 zlib )
+RDEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/setuptools[python_targets_python3_12(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Getopt-Long dev-perl/JSON dev-perl/Mail-Sender dev-perl/TermReadKey virtual/perl-Term-ReadLine ) ) selinux? ( sec-policy/selinux-snmp )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) ) rpm? ( bzip2 zlib )
 RESTRICT=test
 SLOT=0/40
 SRC_URI=https://downloads.sourceforge.net/net-snmp/net-snmp/5.9.4/net-snmp-5.9.4.tar.gz https://dev.gentoo.org/~jsmolic/distfiles/net-snmp-5.7.3-patches-3.tar.xz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	07f7f317d867e5d5aa30fdeb6e873138	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=87f26492a088af7ba6ac98fe5b79c4ad
+_md5_=a8dffe7b0fb46294f07c9cf0621f6ed7
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.9.4-r1 b/metadata/md5-cache/net-analyzer/net-snmp-5.9.4-r1
index 4531e4ded124..d02309bf82bf 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.9.4-r1
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.9.4-r1
@@ -1,17 +1,17 @@
 BDEPEND=doc? ( app-text/doxygen ) >=app-portage/elt-patches-20240116 sys-devel/gnuconfig dev-build/automake || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3 virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) valgrind? ( dev-debug/valgrind )
+DEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/setuptools[python_targets_python3_12(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) valgrind? ( dev-debug/valgrind )
 DESCRIPTION=Software for generating and retrieving SNMP data
 EAPI=8
 HOMEPAGE=https://www.net-snmp.org/
 INHERIT=autotools distutils-r1 libtool perl-module systemd
-IUSE=X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql netlink pcap pci pcre perl python rpm selinux smux ssl tcpd ucd-compat valgrind zlib python_single_target_python3_10 python_single_target_python3_11
+IUSE=X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql netlink pcap pci pcre perl python rpm selinux smux ssl tcpd ucd-compat valgrind zlib python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=HPND BSD GPL-2
-RDEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Getopt-Long dev-perl/JSON dev-perl/Mail-Sender dev-perl/TermReadKey virtual/perl-Term-ReadLine ) ) selinux? ( sec-policy/selinux-snmp )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ) rpm? ( bzip2 zlib )
+RDEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/setuptools[python_targets_python3_12(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Getopt-Long dev-perl/JSON dev-perl/Mail-Sender dev-perl/TermReadKey virtual/perl-Term-ReadLine ) ) selinux? ( sec-policy/selinux-snmp )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) ) rpm? ( bzip2 zlib )
 RESTRICT=test
 SLOT=0/40
 SRC_URI=https://downloads.sourceforge.net/net-snmp/net-snmp/5.9.4/net-snmp-5.9.4.tar.gz https://dev.gentoo.org/~jsmolic/distfiles/net-snmp-5.7.3-patches-3.tar.xz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	07f7f317d867e5d5aa30fdeb6e873138	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=6af874fd8420f2da15f0578bc03dcf68
+_md5_=fe0b964b7e809b9fcc3b0267043411d5
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-9999 b/metadata/md5-cache/net-analyzer/net-snmp-9999
index 5a78a15551db..f85b26eac61f 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-9999
+++ b/metadata/md5-cache/net-analyzer/net-snmp-9999
@@ -1,17 +1,17 @@
 BDEPEND=doc? ( app-text/doxygen ) >=app-portage/elt-patches-20240116 sys-devel/gnuconfig dev-build/automake || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) pcre? ( dev-libs/libpcre2 ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) valgrind? ( dev-debug/valgrind )
+DEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) pcre? ( dev-libs/libpcre2 ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/setuptools[python_targets_python3_12(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) valgrind? ( dev-debug/valgrind )
 DESCRIPTION=Software for generating and retrieving SNMP data
 EAPI=8
 HOMEPAGE=https://www.net-snmp.org/
 INHERIT=autotools distutils-r1 perl-module systemd git-r3
-IUSE=X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql netlink pcap pci pcre perl python rpm selinux smux ssl tcpd ucd-compat valgrind zlib python_single_target_python3_10 python_single_target_python3_11
+IUSE=X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql netlink pcap pci pcre perl python rpm selinux smux ssl tcpd ucd-compat valgrind zlib python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
 LICENSE=HPND BSD GPL-2
 PROPERTIES=live
-RDEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) pcre? ( dev-libs/libpcre2 ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Getopt-Long dev-perl/JSON dev-perl/Mail-Sender dev-perl/TermReadKey virtual/perl-Term-ReadLine ) ) selinux? ( sec-policy/selinux-snmp )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ) rpm? ( bzip2 zlib )
+RDEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) pcre? ( dev-libs/libpcre2 ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/setuptools[python_targets_python3_12(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Getopt-Long dev-perl/JSON dev-perl/Mail-Sender dev-perl/TermReadKey virtual/perl-Term-ReadLine ) ) selinux? ( sec-policy/selinux-snmp )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) ) rpm? ( bzip2 zlib )
 RESTRICT=test
 SLOT=0/40
 SRC_URI=https://dev.gentoo.org/~jsmolic/distfiles/net-snmp-5.7.3-patches-3.tar.xz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	07f7f317d867e5d5aa30fdeb6e873138	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=dfffa763e1222501979978a9c35d2dd5
+_md5_=5cebbbbc82dd7ec6e9a3f6add29daf04
diff --git a/metadata/md5-cache/net-analyzer/wtfis-0.8.0 b/metadata/md5-cache/net-analyzer/wtfis-0.8.0
index 026a69a5cd10..28817a7f7aae 100644
--- a/metadata/md5-cache/net-analyzer/wtfis-0.8.0
+++ b/metadata/md5-cache/net-analyzer/wtfis-0.8.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pydantic-2.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dotenv-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.31.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rich-13.4.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/rich-13.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=net-analyzer/shodan-1.29.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.21.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/pydantic-2.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dotenv-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.31.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rich-13.4.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/rich-13.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=net-analyzer/shodan-1.29.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.21.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Passive hostname, domain and IP lookup tool for non-robots
 EAPI=8
 HOMEPAGE=https://github.com/pirxthepilot/wtfis
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=amd64 ~loong x86
 LICENSE=MIT
-RDEPEND=>=dev-python/pydantic-2.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dotenv-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.31.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rich-13.4.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/rich-13.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=net-analyzer/shodan-1.29.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=>=dev-python/pydantic-2.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dotenv-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.31.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rich-13.4.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/rich-13.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=net-analyzer/shodan-1.29.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pirxthepilot/wtfis/archive/refs/tags/v0.8.0.tar.gz -> wtfis-0.8.0.gh.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a303b832754c3930693bc00424c29d17
+_md5_=6eeed023ff36d1202bc163d9a55c2bc9
diff --git a/metadata/md5-cache/net-analyzer/wtfis-0.9.1 b/metadata/md5-cache/net-analyzer/wtfis-0.9.1
new file mode 100644
index 000000000000..f93c0a0315f7
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/wtfis-0.9.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/pydantic-2.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dotenv-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.31.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rich-13.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=net-analyzer/shodan-1.31.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.21.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Passive hostname, domain and IP lookup tool for non-robots
+EAPI=8
+HOMEPAGE=https://github.com/pirxthepilot/wtfis
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~loong ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/pydantic-2.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dotenv-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.31.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rich-13.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=net-analyzer/shodan-1.31.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pirxthepilot/wtfis/archive/refs/tags/v0.9.1.tar.gz -> wtfis-0.9.1.gh.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=a7caebc2c1d93866a469b38af82896f5
diff --git a/metadata/md5-cache/net-analyzer/wtfis-9999 b/metadata/md5-cache/net-analyzer/wtfis-9999
index 110b8a9da8d7..0633143ea7e5 100644
--- a/metadata/md5-cache/net-analyzer/wtfis-9999
+++ b/metadata/md5-cache/net-analyzer/wtfis-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/pydantic-2.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dotenv-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.31.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rich-13.4.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/rich-13.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=net-analyzer/shodan-1.29.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.21.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/pydantic-2.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dotenv-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.31.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rich-13.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=net-analyzer/shodan-1.31.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.21.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Passive hostname, domain and IP lookup tool for non-robots
 EAPI=8
@@ -7,9 +7,9 @@ INHERIT=distutils-r1 git-r3
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=>=dev-python/pydantic-2.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dotenv-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.31.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rich-13.4.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/rich-13.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=net-analyzer/shodan-1.29.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+RDEPEND=>=dev-python/pydantic-2.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dotenv-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.31.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rich-13.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=net-analyzer/shodan-1.31.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=674f0df1fd75c6510d18b445d660343b
+_md5_=a7caebc2c1d93866a469b38af82896f5
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 892d3d7a2679..9bfa1ef37281 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/dnsviz-0.10.0 b/metadata/md5-cache/net-dns/dnsviz-0.10.0
index 4aeaae6fbcbe..860341417d13 100644
--- a/metadata/md5-cache/net-dns/dnsviz-0.10.0
+++ b/metadata/md5-cache/net-dns/dnsviz-0.10.0
@@ -1,16 +1,16 @@
-BDEPEND=media-gfx/graphviz test? ( >=dev-python/dnspython-1.13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/m2crypto-0.37.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygraphviz-1.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-dns/bind ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=media-gfx/graphviz test? ( >=dev-python/dnspython-1.13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/m2crypto-0.37.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pygraphviz-1.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] net-dns/bind ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Tool suite for analysis and visualization of DNS and DNSSEC
 EAPI=8
 HOMEPAGE=https://dnsviz.net/ https://github.com/dnsviz/dnsviz/ https://pypi.org/project/dnsviz/
 INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-python/dnspython-1.13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/m2crypto-0.37.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygraphviz-1.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=>=dev-python/dnspython-1.13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/m2crypto-0.37.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pygraphviz-1.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dnsviz/dnsviz/archive/86ceba56e8ed23df0ec091b8750025ac374f3916.tar.gz -> dnsviz-0.10.0.gh.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=48d8d7dc0731425a4b884a403ebd7ca7
+_md5_=72fcf351923857d8cbcfa6a7bbeb98b3
diff --git a/metadata/md5-cache/net-dns/dnsviz-0.9.4-r1 b/metadata/md5-cache/net-dns/dnsviz-0.9.4-r1
deleted file mode 100644
index 5d10f48be0c1..000000000000
--- a/metadata/md5-cache/net-dns/dnsviz-0.9.4-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=media-gfx/graphviz test? ( >=dev-python/dnspython-1.13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/m2crypto-0.37.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygraphviz-1.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-dns/bind ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Tool suite for analysis and visualization of DNS and DNSSEC
-EAPI=8
-HOMEPAGE=https://dnsviz.net/ https://github.com/dnsviz/dnsviz/ https://pypi.org/project/dnsviz/
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/dnspython-1.13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/m2crypto-0.37.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygraphviz-1.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/dnsviz/dnsviz/archive/v0.9.4.tar.gz -> dnsviz-0.9.4.gh.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=1b0ac5e1c7769e13fd8825c0baf13adf
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 1eac73c27dbc..3f408ba209ec 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/rtsp-conntrack-5.3-r2 b/metadata/md5-cache/net-firewall/rtsp-conntrack-5.3-r2
new file mode 100644
index 000000000000..26982d097171
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/rtsp-conntrack-5.3-r2
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig )
+DEFINED_PHASES=compile install postinst setup
+DEPEND=virtual/linux-sources
+DESCRIPTION=RTSP conntrack module for Netfilter
+EAPI=8
+HOMEPAGE=https://mike.it-loops.com/rtsp
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=linux-mod-r1
+IUSE=dist-kernel modules-compress modules-sign +strip
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+SLOT=0
+SRC_URI=https://github.com/maru-sama/rtsp-linux/archive/5.3.tar.gz -> rtsp-conntrack-5.3.tar.gz
+_eclasses_=dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	367e103a74bf77e6a8da7894d999fa3c	linux-info	e967b81f54be6f49f4219a57ce7db437	linux-mod-r1	9ccd2b29cd75bd48092f8f46b07fc935	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=fb70c9a0cd92b5dbdd3101e5c357539d
diff --git a/metadata/md5-cache/net-firewall/ufw-0.36.1 b/metadata/md5-cache/net-firewall/ufw-0.36.1
index 3b79cc424b3b..e1cb57f3e03f 100644
--- a/metadata/md5-cache/net-firewall/ufw-0.36.1
+++ b/metadata/md5-cache/net-firewall/ufw-0.36.1
@@ -1,15 +1,15 @@
-BDEPEND=sys-devel/gettext python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) virtual/pkgconfig
+BDEPEND=sys-devel/gettext python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
 DESCRIPTION=A program used to manage a netfilter firewall
 EAPI=8
 HOMEPAGE=https://launchpad.net/ufw
 INHERIT=bash-completion-r1 distutils-r1 linux-info systemd
-IUSE=examples ipv6 python_targets_python3_10 python_targets_python3_11
+IUSE=examples ipv6 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3
-RDEPEND=net-firewall/iptables[ipv6(+)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=net-firewall/iptables[ipv6(+)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 SLOT=0
 SRC_URI=https://launchpad.net/ufw/0.36/0.36.1/+download/ufw-0.36.1.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=268050de24f379e63e6b93f47f896fa0
+_md5_=6f972033bc4e6a4f3cba7a946c878bd0
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 4374178f5918..158b70214ecf 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/btfs-2.24 b/metadata/md5-cache/net-fs/btfs-2.24
index 289467e02faa..511d7da5fc52 100644
--- a/metadata/md5-cache/net-fs/btfs-2.24
+++ b/metadata/md5-cache/net-fs/btfs-2.24
@@ -5,12 +5,12 @@ DESCRIPTION=a bittorrent filesystem based on FUSE
 EAPI=8
 HOMEPAGE=https://github.com/johang/btfs
 INHERIT=autotools python-r1
-IUSE=python_targets_python3_10 python_targets_python3_11
+IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=sys-fs/fuse-2.8.0:0 >=net-misc/curl-7.22.0 dev-libs/boost:= >=net-libs/libtorrent-rasterbar-0.16.0:= python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=>=sys-fs/fuse-2.8.0:0 >=net-misc/curl-7.22.0 dev-libs/boost:= >=net-libs/libtorrent-rasterbar-0.16.0:= python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 SLOT=0
 SRC_URI=https://github.com/johang/btfs/archive/v2.24.tar.gz -> btfs-2.24.tar.gz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=905b05175885d5228dcb636b1b17078b
+_md5_=56f0f855579bbddfab30726c8784c4d8
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 6ae9ed67aa93..e7e2ec507e2f 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/ncftp-3.2.7-r2 b/metadata/md5-cache/net-ftp/ncftp-3.2.7-r2
index e08c503cf9eb..865dc5774aa1 100644
--- a/metadata/md5-cache/net-ftp/ncftp-3.2.7-r2
+++ b/metadata/md5-cache/net-ftp/ncftp-3.2.7-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.ncftp.com/
 INHERIT=autotools toolchain-funcs
 IUSE=pch
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos
 LICENSE=Clarified-Artistic
 RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=https://www.ncftp.com/public_ftp/ncftp/ncftp-3.2.7-src.tar.xz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=23dac52d27b846ac174f72423f75de91
+_md5_=652e651496cef0eed210f72cc930c56f
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index f36663a1393f..d9586c0c49fe 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/serf-1.3.10 b/metadata/md5-cache/net-libs/serf-1.3.10
index 9f047affdc42..58760180bc65 100644
--- a/metadata/md5-cache/net-libs/serf-1.3.10
+++ b/metadata/md5-cache/net-libs/serf-1.3.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://serf.apache.org/
 INHERIT=flag-o-matic python-any-r1 scons-utils toolchain-funcs
 IUSE=kerberos
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1= dev-libs/apr-util:1= dev-libs/openssl:0= sys-libs/zlib:0= kerberos? ( virtual/krb5 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://apache/serf/serf-1.3.10.tar.bz2
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	scons-utils	b3544637c85286a19000d59461d3a7a5	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=6d3dbe10c9288098ace740bd1a249c03
+_md5_=1de8d4fd292e288058b0e7734aa8aa57
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 747fbee7f213..cec865d96ec7 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/automx2-2022.1-r1 b/metadata/md5-cache/net-mail/automx2-2022.1-r1
new file mode 100644
index 000000000000..b8eef3f0835c
--- /dev/null
+++ b/metadata/md5-cache/net-mail/automx2-2022.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( acct-user/automx2 dev-python/flask[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flask-migrate[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flask-sqlalchemy[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/ldap3[python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_11(-)?] ) ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Email client autoconfiguration service
+EAPI=8
+HOMEPAGE=https://rseichter.github.io/automx2/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=acct-user/automx2 dev-python/flask[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flask-migrate[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flask-sqlalchemy[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/ldap3[python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/rseichter/automx2/archive/2022.1.tar.gz -> automx2-2022.1.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=0b3f69e1b7ac5b078e96d08a43baaef7
diff --git a/metadata/md5-cache/net-mail/b4-0.12.1 b/metadata/md5-cache/net-mail/b4-0.12.1
deleted file mode 100644
index 35120ca8a65a..000000000000
--- a/metadata/md5-cache/net-mail/b4-0.12.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/dkimpy-1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dnspython-2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/patatt-0.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.24[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-filter-repo-2.30[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Utility for fetching patchsets from public-inbox
-EAPI=8
-HOMEPAGE=https://pypi.org/project/b4/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-python/dkimpy-1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dnspython-2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/patatt-0.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.24[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-filter-repo-2.30[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://git.kernel.org/pub/scm/utils/b4/b4.git/snapshot/b4-0.12.1.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f39597abdb3e42ee471f70978bc197f3
diff --git a/metadata/md5-cache/net-mail/b4-0.13.0 b/metadata/md5-cache/net-mail/b4-0.13.0
index f5c7f6932f9b..e78dde637fb2 100644
--- a/metadata/md5-cache/net-mail/b4-0.13.0
+++ b/metadata/md5-cache/net-mail/b4-0.13.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/dkimpy-1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dnspython-2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/patatt-0.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.24[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-filter-repo-2.30[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( >=dev-python/dkimpy-1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/dnspython-2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/patatt-0.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.24[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-vcs/git-filter-repo-2.30[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Utility for fetching patchsets from public-inbox
 EAPI=8
 HOMEPAGE=https://pypi.org/project/b4/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-python/dkimpy-1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dnspython-2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/patatt-0.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.24[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-filter-repo-2.30[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=>=dev-python/dkimpy-1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/dnspython-2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/patatt-0.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.24[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-vcs/git-filter-repo-2.30[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://git.kernel.org/pub/scm/utils/b4/b4.git/snapshot/b4-0.13.0.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=fa671b38b6e319350cca5c94423f8f9f
+_md5_=d787899011fe2e8a82acd361b5c65f93
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index aa801ebc917b..fbe3c0275571 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/gallery-dl-1.27.0 b/metadata/md5-cache/net-misc/gallery-dl-1.27.0
new file mode 100644
index 000000000000..34d17857ff47
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gallery-dl-1.27.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/requests-2.11.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite,ssl,xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite,ssl,xml(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[sqlite,ssl,xml(+)] ) python_targets_python3_13? ( dev-lang/python:3.13[sqlite,ssl,xml(+)] ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Download image galleries and collections from several image hosting sites
+EAPI=8
+HOMEPAGE=https://github.com/mikf/gallery-dl/
+INHERIT=distutils-r1 optfeature
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-python/requests-2.11.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_10? ( dev-lang/python:3.10[sqlite,ssl,xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite,ssl,xml(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[sqlite,ssl,xml(+)] ) python_targets_python3_13? ( dev-lang/python:3.13[sqlite,ssl,xml(+)] )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mikf/gallery-dl/archive/v1.27.0.tar.gz -> gallery-dl-1.27.0.gh.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=13783f4572fe937cb0f34333530ede10
diff --git a/metadata/md5-cache/net-misc/gallery-dl-9999 b/metadata/md5-cache/net-misc/gallery-dl-9999
index bfe4282328e8..a8fc762f9183 100644
--- a/metadata/md5-cache/net-misc/gallery-dl-9999
+++ b/metadata/md5-cache/net-misc/gallery-dl-9999
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/requests-2.11.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite,ssl,xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite,ssl,xml(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[sqlite,ssl,xml(+)] ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( >=dev-python/requests-2.11.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite,ssl,xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite,ssl,xml(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[sqlite,ssl,xml(+)] ) python_targets_python3_13? ( dev-lang/python:3.13[sqlite,ssl,xml(+)] ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
 DESCRIPTION=Download image galleries and collections from several image hosting sites
 EAPI=8
 HOMEPAGE=https://github.com/mikf/gallery-dl/
 INHERIT=distutils-r1 optfeature git-r3
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=>=dev-python/requests-2.11.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10[sqlite,ssl,xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite,ssl,xml(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[sqlite,ssl,xml(+)] )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RDEPEND=>=dev-python/requests-2.11.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_10? ( dev-lang/python:3.10[sqlite,ssl,xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite,ssl,xml(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[sqlite,ssl,xml(+)] ) python_targets_python3_13? ( dev-lang/python:3.13[sqlite,ssl,xml(+)] )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=ef4327b26960a657f191c701b8f12f84
+_md5_=13783f4572fe937cb0f34333530ede10
diff --git a/metadata/md5-cache/net-misc/s3cmd-2.4.0 b/metadata/md5-cache/net-misc/s3cmd-2.4.0
index 0d32922e165a..6015d9ab5e53 100644
--- a/metadata/md5-cache/net-misc/s3cmd-2.4.0
+++ b/metadata/md5-cache/net-misc/s3cmd-2.4.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[xml(+)] ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Command line client for Amazon S3
 EAPI=8
 HOMEPAGE=https://s3tools.org/s3cmd
 INHERIT=distutils-r1
-IUSE=python_targets_python3_10 python_targets_python3_11
+IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~amd64 ~ia64 ~loong ~x86 ~amd64-linux ~x64-macos
 LICENSE=GPL-2
-RDEPEND=|| ( dev-python/python-magic[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/file[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=|| ( dev-python/python-magic[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sys-apps/file[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[xml(+)] )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/s3tools/s3cmd-2.4.0.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=cdf3800d2f95a23afca43c4df4519736
+_md5_=ed0cac2dc9bc35adad46ebdea2557563
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 3c556c4d11e0..071db5b98d13 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1497 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1497-r1
index 22d1469b9042..6bebad33099d 100644
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1497
+++ b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1497-r1
@@ -1,6 +1,6 @@
 BDEPEND=app-arch/unzip verify-sig? ( sec-keys/openpgp-keys-freenet ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.8:* dev-java/bcprov:0 dev-java/commons-compress:0 dev-java/fec:0 dev-java/freenet-ext:29 dev-java/jbitcollider-core:0 dev-java/jna:4 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 dev-java/java-service-wrapper:0 dev-java/unbescape:0 test? ( dev-java/hamcrest:0 dev-java/mockito:0 dev-java/objenesis:0 net-libs/NativeThread:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DEPEND=>=virtual/jdk-1.8:* dev-java/bcprov:0 dev-java/commons-compress:0 dev-java/commons-io:1 dev-java/fec:0 dev-java/freenet-ext:29 dev-java/jbitcollider-core:0 dev-java/jna:4 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 dev-java/java-service-wrapper:0 dev-java/unbescape:0 test? ( dev-java/hamcrest:0 dev-java/mockito:0 dev-java/objenesis:0 net-libs/NativeThread:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
 DESCRIPTION=An encrypted network without censorship
 EAPI=8
 HOMEPAGE=https://freenetproject.org/
@@ -9,9 +9,9 @@ IUSE=+nss doc source test verify-sig
 KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2+ GPL-2 MIT BSD-2 BSD Apache-2.0
 PDEPEND=net-libs/NativeThread:0
-RDEPEND=acct-user/freenet acct-group/freenet >=virtual/jre-1.8:* dev-java/bcprov:0 dev-java/commons-compress:0 dev-java/fec:0 dev-java/freenet-ext:29 dev-java/jbitcollider-core:0 dev-java/jna:4 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 dev-java/java-service-wrapper:0 dev-java/unbescape:0 nss? ( dev-libs/nss ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=acct-user/freenet acct-group/freenet >=virtual/jre-1.8:* dev-java/bcprov:0 dev-java/commons-compress:0 dev-java/commons-io:1 dev-java/fec:0 dev-java/freenet-ext:29 dev-java/jbitcollider-core:0 dev-java/jna:4 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 dev-java/java-service-wrapper:0 dev-java/unbescape:0 nss? ( dev-libs/nss ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hyphanet/fred/releases/download/build01497/freenet-build01497-source.tar.bz2 https://github.com/hyphanet/seedrefs/archive/build01480.tar.gz -> seednodes-0.7.5_p1480.tar.gz https://repo1.maven.org/maven2/io/pebbletemplates/pebble/3.1.6/pebble-3.1.6.jar mirror://gentoo/freenet-ant-1.7.1.jar verify-sig? ( https://github.com/hyphanet/fred/releases/download/build01497/freenet-build01497-source.tar.bz2.sig )
 _eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=358a94e5237dc79f2acccd5cae752c13
+_md5_=195a86dfd11dd83f1a6321710f8cc714
diff --git a/metadata/md5-cache/net-p2p/nicotine+-3.2.9-r1 b/metadata/md5-cache/net-p2p/nicotine+-3.2.9-r1
index 99a74ae5155e..e5cca2bb0755 100644
--- a/metadata/md5-cache/net-p2p/nicotine+-3.2.9-r1
+++ b/metadata/md5-cache/net-p2p/nicotine+-3.2.9-r1
@@ -7,7 +7,7 @@ HOMEPAGE=https://nicotine-plus.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=distutils-r1 xdg
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3+
 RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10[gdbm] ) python_targets_python3_11? ( dev-lang/python:3.11[gdbm] ) python_targets_python3_12? ( dev-lang/python:3.12[gdbm] ) dev-python/pygobject:3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] x11-libs/gtk+:3[introspection] python_targets_python3_10? ( dev-lang/python:3.10[gdbm] ) python_targets_python3_11? ( dev-lang/python:3.11[gdbm] ) python_targets_python3_12? ( dev-lang/python:3.12[gdbm] )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Nicotine-Plus/nicotine-plus/archive/3.2.9.tar.gz -> nicotine+-3.2.9.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5d5d1c35d8a5194613892a947ad38f4d
+_md5_=00748f068e46c309a45945b6d277fdbb
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index e1bcdcabf88a..35a1161300a3 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.10.9.2-r2 b/metadata/md5-cache/net-wireless/gnuradio-3.10.9.2-r4
index 262c462d5628..f913b5094603 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.10.9.2-r2
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.10.9.2-r4
@@ -1,6 +1,6 @@
 BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] ) dev-libs/gmp:= dev-libs/log4cpp:= python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/jsonschema[python_targets_python3_11(-)] ) dev-libs/spdlog:= dev-libs/libfmt:= sci-libs/fftw:3.0= sci-libs/volk:= media-libs/libsndfile sys-libs/libunwind alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_10? ( dev-python/thrift[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/thrift[python_targets_python3_11(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy python_single_target_python3_10? ( dev-python/pyqtgraph[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyqtgraph[python_targets_python3_11(-)] ) ) grc? ( python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/numpy[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/mako[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) iio? ( net-libs/libiio:= net-libs/libad9361-iio:= !net-wireless/gr-iio ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_10? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[opengl,python_targets_python3_11(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6=[qt5(+)] dev-qt/qtwidgets:5 ) soapy? ( python_single_target_python3_10? ( net-wireless/soapysdr:=[python_targets_python3_10(-)] ) python_single_target_python3_11? ( net-wireless/soapysdr:=[python_targets_python3_11(-)] ) ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( python_single_target_python3_10? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_10(-)] ) python_single_target_python3_11? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_11(-)] ) ) utils? ( python_single_target_python3_10? ( dev-python/click[python_targets_python3_10(-)] dev-python/click-plugins[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/click[python_targets_python3_11(-)] dev-python/click-plugins[python_targets_python3_11(-)] dev-python/mako[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= ) app-text/docbook-xml-dtd:4.2 python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pybind11[python_targets_python3_11(-)] ) virtual/pkgconfig doc? ( >=app-text/doxygen-1.5.7.1 <dev-libs/mathjax-3 ) grc? ( x11-misc/xdg-utils ) modtool? ( python_single_target_python3_10? ( dev-python/pygccxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygccxml[python_targets_python3_11(-)] ) ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq )
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] ) dev-libs/gmp:= dev-libs/log4cpp:= python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/jsonschema[python_targets_python3_11(-)] ) dev-libs/spdlog:= dev-libs/libfmt:= sci-libs/fftw:3.0= sci-libs/volk:= media-libs/libsndfile sys-libs/libunwind alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_10? ( dev-python/thrift[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/thrift[python_targets_python3_11(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy python_single_target_python3_10? ( dev-python/pyqtgraph[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyqtgraph[python_targets_python3_11(-)] ) ) grc? ( python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/numpy[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/mako[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) iio? ( net-libs/libiio:= net-libs/libad9361-iio:= !net-wireless/gr-iio ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_10? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[opengl,python_targets_python3_11(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6=[qt5(+)] dev-qt/qtwidgets:5 ) soapy? ( net-wireless/soapysdr:=[python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) utils? ( python_single_target_python3_10? ( dev-python/click[python_targets_python3_10(-)] dev-python/click-plugins[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/click[python_targets_python3_11(-)] dev-python/click-plugins[python_targets_python3_11(-)] dev-python/mako[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= ) app-text/docbook-xml-dtd:4.2 python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pybind11[python_targets_python3_11(-)] ) virtual/pkgconfig doc? ( >=app-text/doxygen-1.5.7.1 <dev-libs/mathjax-3 ) grc? ( x11-misc/xdg-utils ) modtool? ( python_single_target_python3_10? ( dev-python/pygccxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygccxml[python_targets_python3_11(-)] ) ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq )
 DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
 EAPI=8
 HOMEPAGE=https://www.gnuradio.org/
@@ -8,10 +8,10 @@ INHERIT=cmake desktop python-single-r1 virtualx xdg-utils
 IUSE=+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc iio jack modtool network oss performance-counters portaudio +qt5 sdl soapy test trellis uhd vocoder +utils wavelet zeromq python_single_target_python3_10 python_single_target_python3_11 test
 KEYWORDS=amd64 ~arm ~riscv ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] ) dev-libs/gmp:= dev-libs/log4cpp:= python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/jsonschema[python_targets_python3_11(-)] ) dev-libs/spdlog:= dev-libs/libfmt:= sci-libs/fftw:3.0= sci-libs/volk:= media-libs/libsndfile sys-libs/libunwind alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_10? ( dev-python/thrift[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/thrift[python_targets_python3_11(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy python_single_target_python3_10? ( dev-python/pyqtgraph[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyqtgraph[python_targets_python3_11(-)] ) ) grc? ( python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/numpy[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/mako[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) iio? ( net-libs/libiio:= net-libs/libad9361-iio:= !net-wireless/gr-iio ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_10? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[opengl,python_targets_python3_11(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6=[qt5(+)] dev-qt/qtwidgets:5 ) soapy? ( python_single_target_python3_10? ( net-wireless/soapysdr:=[python_targets_python3_10(-)] ) python_single_target_python3_11? ( net-wireless/soapysdr:=[python_targets_python3_11(-)] ) ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( python_single_target_python3_10? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_10(-)] ) python_single_target_python3_11? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_11(-)] ) ) utils? ( python_single_target_python3_10? ( dev-python/click[python_targets_python3_10(-)] dev-python/click-plugins[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/click[python_targets_python3_11(-)] dev-python/click-plugins[python_targets_python3_11(-)] dev-python/mako[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] ) dev-libs/gmp:= dev-libs/log4cpp:= python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/jsonschema[python_targets_python3_11(-)] ) dev-libs/spdlog:= dev-libs/libfmt:= sci-libs/fftw:3.0= sci-libs/volk:= media-libs/libsndfile sys-libs/libunwind alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_10? ( dev-python/thrift[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/thrift[python_targets_python3_11(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy python_single_target_python3_10? ( dev-python/pyqtgraph[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyqtgraph[python_targets_python3_11(-)] ) ) grc? ( python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/numpy[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/mako[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) iio? ( net-libs/libiio:= net-libs/libad9361-iio:= !net-wireless/gr-iio ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_10? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[opengl,python_targets_python3_11(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6=[qt5(+)] dev-qt/qtwidgets:5 ) soapy? ( net-wireless/soapysdr:=[python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) utils? ( python_single_target_python3_10? ( dev-python/click[python_targets_python3_10(-)] dev-python/click-plugins[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/click[python_targets_python3_11(-)] dev-python/click-plugins[python_targets_python3_11(-)] dev-python/mako[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) jack? ( audio ) oss? ( audio ) portaudio? ( audio ) analog? ( filter ) channels? ( filter analog qt5 ) digital? ( filter analog ) dtv? ( filter analog fec ) modtool? ( utils ) qt5? ( filter ) trellis? ( analog digital ) uhd? ( filter analog ) vocoder? ( filter analog ) wavelet? ( analog )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0/3.10.9.2
 SRC_URI=https://github.com/gnuradio/gnuradio/archive/refs/tags/v3.10.9.2.tar.gz -> gnuradio-3.10.9.2.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6d3cbff0a82bcd9bfc85b7401af7de8b
+_md5_=ff4747dac26ef22c063495f839125715
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.10.9.2-r3 b/metadata/md5-cache/net-wireless/gnuradio-3.10.9.2-r5
index bd63807710a5..41251325e276 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.10.9.2-r3
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.10.9.2-r5
@@ -1,6 +1,6 @@
 BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-libs/boost:=[python,python_targets_python3_12(-)] ) dev-libs/gmp:= dev-libs/log4cpp:= python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/jsonschema[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/jsonschema[python_targets_python3_12(-)] ) dev-libs/spdlog:= dev-libs/libfmt:= sci-libs/fftw:3.0= sci-libs/volk:= media-libs/libsndfile sys-libs/libunwind alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_10? ( dev-python/thrift[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/thrift[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/thrift[python_targets_python3_12(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy python_single_target_python3_10? ( dev-python/pyqtgraph[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyqtgraph[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pyqtgraph[python_targets_python3_12(-)] ) ) grc? ( python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/numpy[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/mako[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/mako[python_targets_python3_12(-)] dev-python/numpy[python_targets_python3_12(-)] dev-python/pygobject:3[python_targets_python3_12(-)] dev-python/pyyaml[python_targets_python3_12(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) iio? ( net-libs/libiio:= net-libs/libad9361-iio:= ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_10? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[opengl,python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/PyQt5[opengl,python_targets_python3_12(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6=[qt5(+)] dev-qt/qtwidgets:5 ) soapy? ( python_single_target_python3_10? ( net-wireless/soapysdr:=[python_targets_python3_10(-)] ) python_single_target_python3_11? ( net-wireless/soapysdr:=[python_targets_python3_11(-)] ) python_single_target_python3_12? ( net-wireless/soapysdr:=[python_targets_python3_12(-)] ) ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( python_single_target_python3_10? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_10(-)] ) python_single_target_python3_11? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_11(-)] ) python_single_target_python3_12? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_12(-)] ) ) utils? ( python_single_target_python3_10? ( dev-python/click[python_targets_python3_10(-)] dev-python/click-plugins[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/click[python_targets_python3_11(-)] dev-python/click-plugins[python_targets_python3_11(-)] dev-python/mako[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/click[python_targets_python3_12(-)] dev-python/click-plugins[python_targets_python3_12(-)] dev-python/mako[python_targets_python3_12(-)] dev-python/matplotlib[python_targets_python3_12(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= ) app-text/docbook-xml-dtd:4.2 python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pybind11[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pybind11[python_targets_python3_12(-)] ) virtual/pkgconfig doc? ( >=app-text/doxygen-1.5.7.1 <dev-libs/mathjax-3 ) grc? ( x11-misc/xdg-utils ) modtool? ( python_single_target_python3_10? ( dev-python/pygccxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygccxml[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pygccxml[python_targets_python3_12(-)] ) ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 dev-python/pyzmq ) zeromq? ( net-libs/cppzmq )
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-libs/boost:=[python,python_targets_python3_12(-)] ) dev-libs/gmp:= dev-libs/log4cpp:= python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/jsonschema[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/jsonschema[python_targets_python3_12(-)] ) dev-libs/spdlog:= dev-libs/libfmt:= sci-libs/fftw:3.0= sci-libs/volk:= media-libs/libsndfile sys-libs/libunwind alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_10? ( dev-python/thrift[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/thrift[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/thrift[python_targets_python3_12(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy python_single_target_python3_10? ( dev-python/pyqtgraph[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyqtgraph[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pyqtgraph[python_targets_python3_12(-)] ) ) grc? ( python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/numpy[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/mako[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/mako[python_targets_python3_12(-)] dev-python/numpy[python_targets_python3_12(-)] dev-python/pygobject:3[python_targets_python3_12(-)] dev-python/pyyaml[python_targets_python3_12(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) iio? ( net-libs/libiio:= net-libs/libad9361-iio:= ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_10? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[opengl,python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/PyQt5[opengl,python_targets_python3_12(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6=[qt5(+)] dev-qt/qtwidgets:5 ) soapy? ( net-wireless/soapysdr:=[python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?] ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?] ) utils? ( python_single_target_python3_10? ( dev-python/click[python_targets_python3_10(-)] dev-python/click-plugins[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/click[python_targets_python3_11(-)] dev-python/click-plugins[python_targets_python3_11(-)] dev-python/mako[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/click[python_targets_python3_12(-)] dev-python/click-plugins[python_targets_python3_12(-)] dev-python/mako[python_targets_python3_12(-)] dev-python/matplotlib[python_targets_python3_12(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= ) app-text/docbook-xml-dtd:4.2 python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pybind11[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pybind11[python_targets_python3_12(-)] ) virtual/pkgconfig doc? ( >=app-text/doxygen-1.5.7.1 <dev-libs/mathjax-3 ) grc? ( x11-misc/xdg-utils ) modtool? ( python_single_target_python3_10? ( dev-python/pygccxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygccxml[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pygccxml[python_targets_python3_12(-)] ) ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 dev-python/pyzmq ) zeromq? ( net-libs/cppzmq )
 DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
 EAPI=8
 HOMEPAGE=https://www.gnuradio.org/
@@ -8,10 +8,10 @@ INHERIT=cmake desktop python-single-r1 virtualx xdg-utils
 IUSE=+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc iio jack modtool network oss performance-counters portaudio +qt5 sdl soapy test trellis uhd vocoder +utils wavelet zeromq python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 test
 KEYWORDS=~amd64 ~arm ~riscv ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-libs/boost:=[python,python_targets_python3_12(-)] ) dev-libs/gmp:= dev-libs/log4cpp:= python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/jsonschema[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/jsonschema[python_targets_python3_12(-)] ) dev-libs/spdlog:= dev-libs/libfmt:= sci-libs/fftw:3.0= sci-libs/volk:= media-libs/libsndfile sys-libs/libunwind alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_10? ( dev-python/thrift[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/thrift[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/thrift[python_targets_python3_12(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy python_single_target_python3_10? ( dev-python/pyqtgraph[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyqtgraph[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pyqtgraph[python_targets_python3_12(-)] ) ) grc? ( python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/numpy[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/mako[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/mako[python_targets_python3_12(-)] dev-python/numpy[python_targets_python3_12(-)] dev-python/pygobject:3[python_targets_python3_12(-)] dev-python/pyyaml[python_targets_python3_12(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) iio? ( net-libs/libiio:= net-libs/libad9361-iio:= ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_10? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[opengl,python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/PyQt5[opengl,python_targets_python3_12(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6=[qt5(+)] dev-qt/qtwidgets:5 ) soapy? ( python_single_target_python3_10? ( net-wireless/soapysdr:=[python_targets_python3_10(-)] ) python_single_target_python3_11? ( net-wireless/soapysdr:=[python_targets_python3_11(-)] ) python_single_target_python3_12? ( net-wireless/soapysdr:=[python_targets_python3_12(-)] ) ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( python_single_target_python3_10? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_10(-)] ) python_single_target_python3_11? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_11(-)] ) python_single_target_python3_12? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_12(-)] ) ) utils? ( python_single_target_python3_10? ( dev-python/click[python_targets_python3_10(-)] dev-python/click-plugins[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/click[python_targets_python3_11(-)] dev-python/click-plugins[python_targets_python3_11(-)] dev-python/mako[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/click[python_targets_python3_12(-)] dev-python/click-plugins[python_targets_python3_12(-)] dev-python/mako[python_targets_python3_12(-)] dev-python/matplotlib[python_targets_python3_12(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-libs/boost:=[python,python_targets_python3_12(-)] ) dev-libs/gmp:= dev-libs/log4cpp:= python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/jsonschema[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/jsonschema[python_targets_python3_12(-)] ) dev-libs/spdlog:= dev-libs/libfmt:= sci-libs/fftw:3.0= sci-libs/volk:= media-libs/libsndfile sys-libs/libunwind alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_10? ( dev-python/thrift[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/thrift[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/thrift[python_targets_python3_12(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy python_single_target_python3_10? ( dev-python/pyqtgraph[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyqtgraph[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pyqtgraph[python_targets_python3_12(-)] ) ) grc? ( python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/numpy[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/mako[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/mako[python_targets_python3_12(-)] dev-python/numpy[python_targets_python3_12(-)] dev-python/pygobject:3[python_targets_python3_12(-)] dev-python/pyyaml[python_targets_python3_12(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) iio? ( net-libs/libiio:= net-libs/libad9361-iio:= ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_10? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[opengl,python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/PyQt5[opengl,python_targets_python3_12(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6=[qt5(+)] dev-qt/qtwidgets:5 ) soapy? ( net-wireless/soapysdr:=[python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?] ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?] ) utils? ( python_single_target_python3_10? ( dev-python/click[python_targets_python3_10(-)] dev-python/click-plugins[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/click[python_targets_python3_11(-)] dev-python/click-plugins[python_targets_python3_11(-)] dev-python/mako[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/click[python_targets_python3_12(-)] dev-python/click-plugins[python_targets_python3_12(-)] dev-python/mako[python_targets_python3_12(-)] dev-python/matplotlib[python_targets_python3_12(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) jack? ( audio ) oss? ( audio ) portaudio? ( audio ) analog? ( filter ) channels? ( filter analog qt5 ) digital? ( filter analog ) dtv? ( filter analog fec ) modtool? ( utils ) qt5? ( filter ) test? ( channels ) trellis? ( analog digital ) uhd? ( filter analog ) vocoder? ( filter analog ) wavelet? ( analog )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0/3.10.9.2
 SRC_URI=https://github.com/gnuradio/gnuradio/archive/refs/tags/v3.10.9.2.tar.gz -> gnuradio-3.10.9.2.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a37cc9f95f002c4292671aa7eb60607f
+_md5_=894521dc421ab15e1edbb7cf4b1cab3c
diff --git a/metadata/md5-cache/net-wireless/gnuradio-9999 b/metadata/md5-cache/net-wireless/gnuradio-9999
index 2b692aaabcf9..8e056f91af56 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-9999
+++ b/metadata/md5-cache/net-wireless/gnuradio-9999
@@ -1,6 +1,6 @@
 BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] ) dev-libs/gmp:= dev-libs/log4cpp:= python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/jsonschema[python_targets_python3_11(-)] ) dev-libs/spdlog:= dev-libs/libfmt:= sci-libs/fftw:3.0= sci-libs/volk:= media-libs/libsndfile sys-libs/libunwind alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_10? ( dev-python/thrift[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/thrift[python_targets_python3_11(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy python_single_target_python3_10? ( dev-python/pyqtgraph[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyqtgraph[python_targets_python3_11(-)] ) ) grc? ( python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/numpy[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/mako[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) iio? ( net-libs/libiio:= net-libs/libad9361-iio:= !net-wireless/gr-iio ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_10? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[opengl,python_targets_python3_11(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6=[qt5(+)] dev-qt/qtwidgets:5 ) soapy? ( python_single_target_python3_10? ( net-wireless/soapysdr:=[python_targets_python3_10(-)] ) python_single_target_python3_11? ( net-wireless/soapysdr:=[python_targets_python3_11(-)] ) ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( python_single_target_python3_10? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_10(-)] ) python_single_target_python3_11? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_11(-)] ) ) utils? ( python_single_target_python3_10? ( dev-python/click[python_targets_python3_10(-)] dev-python/click-plugins[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/click[python_targets_python3_11(-)] dev-python/click-plugins[python_targets_python3_11(-)] dev-python/mako[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= ) app-text/docbook-xml-dtd:4.2 python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pybind11[python_targets_python3_11(-)] ) virtual/pkgconfig doc? ( >=app-text/doxygen-1.5.7.1 <dev-libs/mathjax-3 ) grc? ( x11-misc/xdg-utils ) modtool? ( python_single_target_python3_10? ( dev-python/pygccxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygccxml[python_targets_python3_11(-)] ) ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq )
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] ) dev-libs/gmp:= dev-libs/log4cpp:= python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/jsonschema[python_targets_python3_11(-)] ) dev-libs/spdlog:= dev-libs/libfmt:= sci-libs/fftw:3.0= sci-libs/volk:= media-libs/libsndfile sys-libs/libunwind alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_10? ( dev-python/thrift[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/thrift[python_targets_python3_11(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy python_single_target_python3_10? ( dev-python/pyqtgraph[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyqtgraph[python_targets_python3_11(-)] ) ) grc? ( python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/numpy[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/mako[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) iio? ( net-libs/libiio:= net-libs/libad9361-iio:= !net-wireless/gr-iio ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_10? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[opengl,python_targets_python3_11(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6=[qt5(+)] dev-qt/qtwidgets:5 ) soapy? ( net-wireless/soapysdr:=[python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) utils? ( python_single_target_python3_10? ( dev-python/click[python_targets_python3_10(-)] dev-python/click-plugins[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/click[python_targets_python3_11(-)] dev-python/click-plugins[python_targets_python3_11(-)] dev-python/mako[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= ) app-text/docbook-xml-dtd:4.2 python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pybind11[python_targets_python3_11(-)] ) virtual/pkgconfig doc? ( >=app-text/doxygen-1.5.7.1 <dev-libs/mathjax-3 ) grc? ( x11-misc/xdg-utils ) modtool? ( python_single_target_python3_10? ( dev-python/pygccxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygccxml[python_targets_python3_11(-)] ) ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq )
 DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
 EAPI=8
 HOMEPAGE=https://www.gnuradio.org/
@@ -8,9 +8,9 @@ INHERIT=cmake desktop python-single-r1 virtualx xdg-utils git-r3
 IUSE=+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc iio jack modtool network oss performance-counters portaudio +qt5 sdl soapy test trellis uhd vocoder +utils wavelet zeromq python_single_target_python3_10 python_single_target_python3_11 test
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] ) dev-libs/gmp:= dev-libs/log4cpp:= python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/jsonschema[python_targets_python3_11(-)] ) dev-libs/spdlog:= dev-libs/libfmt:= sci-libs/fftw:3.0= sci-libs/volk:= media-libs/libsndfile sys-libs/libunwind alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_10? ( dev-python/thrift[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/thrift[python_targets_python3_11(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy python_single_target_python3_10? ( dev-python/pyqtgraph[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyqtgraph[python_targets_python3_11(-)] ) ) grc? ( python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/numpy[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/mako[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) iio? ( net-libs/libiio:= net-libs/libad9361-iio:= !net-wireless/gr-iio ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_10? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[opengl,python_targets_python3_11(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6=[qt5(+)] dev-qt/qtwidgets:5 ) soapy? ( python_single_target_python3_10? ( net-wireless/soapysdr:=[python_targets_python3_10(-)] ) python_single_target_python3_11? ( net-wireless/soapysdr:=[python_targets_python3_11(-)] ) ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( python_single_target_python3_10? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_10(-)] ) python_single_target_python3_11? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_11(-)] ) ) utils? ( python_single_target_python3_10? ( dev-python/click[python_targets_python3_10(-)] dev-python/click-plugins[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/click[python_targets_python3_11(-)] dev-python/click-plugins[python_targets_python3_11(-)] dev-python/mako[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] ) dev-libs/gmp:= dev-libs/log4cpp:= python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/jsonschema[python_targets_python3_11(-)] ) dev-libs/spdlog:= dev-libs/libfmt:= sci-libs/fftw:3.0= sci-libs/volk:= media-libs/libsndfile sys-libs/libunwind alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_10? ( dev-python/thrift[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/thrift[python_targets_python3_11(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy python_single_target_python3_10? ( dev-python/pyqtgraph[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyqtgraph[python_targets_python3_11(-)] ) ) grc? ( python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/numpy[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/mako[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) iio? ( net-libs/libiio:= net-libs/libad9361-iio:= !net-wireless/gr-iio ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_10? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[opengl,python_targets_python3_11(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6=[qt5(+)] dev-qt/qtwidgets:5 ) soapy? ( net-wireless/soapysdr:=[python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) utils? ( python_single_target_python3_10? ( dev-python/click[python_targets_python3_10(-)] dev-python/click-plugins[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/click[python_targets_python3_11(-)] dev-python/click-plugins[python_targets_python3_11(-)] dev-python/mako[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) jack? ( audio ) oss? ( audio ) portaudio? ( audio ) analog? ( filter ) channels? ( filter analog qt5 ) digital? ( filter analog ) dtv? ( filter analog fec ) modtool? ( utils ) qt5? ( filter ) trellis? ( analog digital ) uhd? ( filter analog ) vocoder? ( filter analog ) wavelet? ( analog )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0/9999
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=befb1b44926b1766a089097e9aea4ac7
+_md5_=7410b7d8beac445e48e636be32fa2d56
diff --git a/metadata/md5-cache/net-wireless/soapysdr-0.8.1 b/metadata/md5-cache/net-wireless/soapysdr-0.8.1
deleted file mode 100644
index 0298a0547272..000000000000
--- a/metadata/md5-cache/net-wireless/soapysdr-0.8.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) python? ( dev-lang/swig:0 )
-DESCRIPTION=vendor and platform neutral SDR support library
-EAPI=8
-HOMEPAGE=https://github.com/pothosware/SoapySDR
-INHERIT=cmake python-r1
-IUSE=bladerf hackrf python rtlsdr plutosdr uhd python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 ~arm ~riscv ~x86
-LICENSE=Boost-1.0
-PDEPEND=bladerf? ( net-wireless/soapybladerf ) hackrf? ( net-wireless/soapyhackrf ) rtlsdr? ( net-wireless/soapyrtlsdr ) plutosdr? ( net-wireless/soapyplutosdr ) uhd? ( net-wireless/soapyuhd )
-RDEPEND=python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) )
-SLOT=0/0.8.1
-SRC_URI=https://github.com/pothosware/SoapySDR/archive/soapy-sdr-0.8.1.tar.gz -> soapysdr-0.8.1.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d5122dd47d6a118b068cde6033bc546b
diff --git a/metadata/md5-cache/net-wireless/soapysdr-0.8.1-r1 b/metadata/md5-cache/net-wireless/soapysdr-0.8.1-r1
new file mode 100644
index 000000000000..b31c7e935972
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/soapysdr-0.8.1-r1
@@ -0,0 +1,17 @@
+BDEPEND=python? ( dev-lang/swig:0 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) )
+DESCRIPTION=vendor and platform neutral SDR support library
+EAPI=8
+HOMEPAGE=https://github.com/pothosware/SoapySDR
+INHERIT=cmake python-single-r1
+IUSE=bladerf hackrf python rtlsdr plutosdr uhd python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=amd64 ~arm ~riscv ~x86
+LICENSE=Boost-1.0
+PDEPEND=bladerf? ( net-wireless/soapybladerf ) hackrf? ( net-wireless/soapyhackrf ) rtlsdr? ( net-wireless/soapyrtlsdr ) plutosdr? ( net-wireless/soapyplutosdr ) uhd? ( net-wireless/soapyuhd )
+RDEPEND=python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) )
+SLOT=0/0.8.1
+SRC_URI=https://github.com/pothosware/SoapySDR/archive/soapy-sdr-0.8.1.tar.gz -> soapysdr-0.8.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=fb437143df94d32f5c439d6db9496ec8
diff --git a/metadata/md5-cache/net-wireless/soapysdr-9999 b/metadata/md5-cache/net-wireless/soapysdr-9999
index dc41f44eb5c8..fc6cf4f350d5 100644
--- a/metadata/md5-cache/net-wireless/soapysdr-9999
+++ b/metadata/md5-cache/net-wireless/soapysdr-9999
@@ -1,16 +1,16 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) python? ( dev-lang/swig:0 )
+BDEPEND=python? ( dev-lang/swig:0 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) )
 DESCRIPTION=vendor and platform neutral SDR support library
 EAPI=8
 HOMEPAGE=https://github.com/pothosware/SoapySDR
-INHERIT=cmake python-r1 git-r3
-IUSE=bladerf hackrf python rtlsdr plutosdr uhd python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+INHERIT=cmake python-single-r1 git-r3
+IUSE=bladerf hackrf python rtlsdr plutosdr uhd python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
 LICENSE=Boost-1.0
 PDEPEND=bladerf? ( net-wireless/soapybladerf ) hackrf? ( net-wireless/soapyhackrf ) rtlsdr? ( net-wireless/soapyrtlsdr ) plutosdr? ( net-wireless/soapyplutosdr ) uhd? ( net-wireless/soapyuhd )
 PROPERTIES=live
-RDEPEND=python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) )
+RDEPEND=python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) )
 SLOT=0/9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=90d0e5854f71f41248da1219a77c0208
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=ae60021dd4422fbe10fa2333aa29fd7e
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index b85c69a8b4ef..61ccb0e36aa0 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/siril-1.2.1-r1 b/metadata/md5-cache/sci-astronomy/siril-1.2.1-r1
new file mode 100644
index 000000000000..66bfe349fd39
--- /dev/null
+++ b/metadata/md5-cache/sci-astronomy/siril-1.2.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-build/cmake x11-base/xorg-proto >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst pretend setup test
+DEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/json-glib-1.2.6 media-libs/librtprocess >=media-libs/opencv-4.4.0:= sci-libs/cfitsio:= sci-libs/fftw:3.0= sci-libs/gsl:= x11-libs/gdk-pixbuf:2 x11-libs/cairo x11-libs/pango >=x11-libs/gtk+-3.20.0:3 curl? ( net-misc/curl ) exif? ( >=media-gfx/exiv2-0.25:= ) ffmpeg? ( media-video/ffmpeg:= ) heif? ( media-libs/libheif:= ) jpeg? ( media-libs/libjpeg-turbo:= ) libconfig? ( >=dev-libs/libconfig-1.4:=[cxx] ) png? ( >=media-libs/libpng-1.6.0:= ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:= ) wcs? ( >=sci-astronomy/wcslib-7.7:= )
+DESCRIPTION=A free astronomical image processing software
+EAPI=8
+HOMEPAGE=https://siril.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=meson optfeature toolchain-funcs xdg
+IUSE=curl exif ffmpeg heif jpeg libconfig openmp png raw tiff wcs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ Boost-1.0
+RDEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/json-glib-1.2.6 media-libs/librtprocess >=media-libs/opencv-4.4.0:= sci-libs/cfitsio:= sci-libs/fftw:3.0= sci-libs/gsl:= x11-libs/gdk-pixbuf:2 x11-libs/cairo x11-libs/pango >=x11-libs/gtk+-3.20.0:3 curl? ( net-misc/curl ) exif? ( >=media-gfx/exiv2-0.25:= ) ffmpeg? ( media-video/ffmpeg:= ) heif? ( media-libs/libheif:= ) jpeg? ( media-libs/libjpeg-turbo:= ) libconfig? ( >=dev-libs/libconfig-1.4:=[cxx] ) png? ( >=media-libs/libpng-1.6.0:= ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:= ) wcs? ( >=sci-astronomy/wcslib-7.7:= )
+SLOT=0
+SRC_URI=https://gitlab.com/free-astro/siril/-/archive/1.2.1/siril-1.2.1.tar.bz2
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=8be3764fe192b2527b61d70c695476e6
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 016461d56d5c..30afffbd136f 100644
--- a/metadata/md5-cache/sci-biology/Manifest.gz
+++ b/metadata/md5-cache/sci-biology/Manifest.gz
diff --git a/metadata/md5-cache/sci-biology/ucsc-genome-browser-260-r1 b/metadata/md5-cache/sci-biology/ucsc-genome-browser-260-r1
deleted file mode 100644
index 56b6da8f640d..000000000000
--- a/metadata/md5-cache/sci-biology/ucsc-genome-browser-260-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare prerm setup
-DEPEND=dev-libs/openssl:0= media-libs/libpng:0= !<sci-biology/ucsc-genome-browser-223 mysql? ( dev-db/mysql-connector-c:0= ) server? ( virtual/httpd-cgi ) app-arch/unzip app-admin/webapp-config
-DESCRIPTION=The UCSC genome browser suite, also known as Jim Kent's library and GoldenPath
-EAPI=6
-HOMEPAGE=http://genome.ucsc.edu/
-INHERIT=toolchain-funcs flag-o-matic webapp
-IUSE=+mysql +server static-libs vhosts
-KEYWORDS=~amd64 ~x86
-LICENSE=blat
-RDEPEND=dev-libs/openssl:0= media-libs/libpng:0= !<sci-biology/ucsc-genome-browser-223 mysql? ( dev-db/mysql-connector-c:0= ) server? ( virtual/httpd-cgi ) app-admin/webapp-config
-REQUIRED_USE=server? ( mysql )
-SLOT=0
-SRC_URI=http://hgdownload.cse.ucsc.edu/admin/jksrc.v260.zip
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	webapp	de2d3d345b44597c10d7104a7bcdf7b2
-_md5_=35cb93e40ad2d78c190e860dd3944557
diff --git a/metadata/md5-cache/sci-biology/ucsc-genome-browser-260-r2 b/metadata/md5-cache/sci-biology/ucsc-genome-browser-260-r2
new file mode 100644
index 000000000000..ed4351d697d1
--- /dev/null
+++ b/metadata/md5-cache/sci-biology/ucsc-genome-browser-260-r2
@@ -0,0 +1,16 @@
+BDEPEND=app-alternatives/cpio app-arch/unzip
+DEFINED_PHASES=compile install postinst prepare prerm setup
+DEPEND=dev-libs/openssl:= media-libs/libpng:= !<sci-biology/ucsc-genome-browser-223 mysql? ( dev-db/mysql-connector-c:= ) server? ( virtual/httpd-cgi ) app-admin/webapp-config
+DESCRIPTION=The UCSC genome browser suite, also known as Jim Kent's library and GoldenPath
+EAPI=8
+HOMEPAGE=http://genome.ucsc.edu/
+INHERIT=toolchain-funcs flag-o-matic webapp
+IUSE=+mysql +server static-libs vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=blat
+RDEPEND=dev-libs/openssl:= media-libs/libpng:= !<sci-biology/ucsc-genome-browser-223 mysql? ( dev-db/mysql-connector-c:= ) server? ( virtual/httpd-cgi ) app-admin/webapp-config
+REQUIRED_USE=server? ( mysql )
+SLOT=0
+SRC_URI=http://hgdownload.cse.ucsc.edu/admin/jksrc.v260.zip
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	webapp	de2d3d345b44597c10d7104a7bcdf7b2
+_md5_=564b1da6740e56376a048a72b00d1f1a
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 787e70f7f756..57e0318ee67a 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.23.1-r2 b/metadata/md5-cache/sci-geosciences/gpsd-3.23.1-r2
deleted file mode 100644
index 5437f8245d6b..000000000000
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.23.1-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig || ( ( dev-lang/python:3.10 dev-build/scons[python_targets_python3_10(-)] ) ) test? ( app-alternatives/bc ) virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare
-DEPEND=acct-user/gpsd acct-group/dialout >=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez:= ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/ntpsec net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) ) gpsd_protocols_ublox? ( dev-python/pyserial ) gpsd_protocols_greis? ( dev-python/pyserial ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)?] )
-DESCRIPTION=GPS daemon and library for USB/serial GPS devices and GPS/mapping clients
-EAPI=7
-HOMEPAGE=https://gpsd.gitlab.io/gpsd/
-INHERIT=udev distutils-r1 scons-utils systemd toolchain-funcs
-IUSE=+gpsd_protocols_aivdm +gpsd_protocols_ashtech +gpsd_protocols_earthmate +gpsd_protocols_evermore +gpsd_protocols_fury +gpsd_protocols_fv18 +gpsd_protocols_garmin +gpsd_protocols_garmintxt +gpsd_protocols_geostar +gpsd_protocols_gpsclock +gpsd_protocols_greis +gpsd_protocols_isync +gpsd_protocols_itrax +gpsd_protocols_mtk3301 +gpsd_protocols_navcom +gpsd_protocols_nmea0183 +gpsd_protocols_nmea2000 +gpsd_protocols_ntrip +gpsd_protocols_oceanserver +gpsd_protocols_oncore +gpsd_protocols_passthrough +gpsd_protocols_rtcm104v2 +gpsd_protocols_rtcm104v3 +gpsd_protocols_sirf +gpsd_protocols_skytraq +gpsd_protocols_superstar2 +gpsd_protocols_tnt +gpsd_protocols_tripmate +gpsd_protocols_tsip +gpsd_protocols_ublox bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 +shm +sockets static systemd test udev usb X python_targets_python3_10
-KEYWORDS=amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86
-LICENSE=BSD
-RDEPEND=acct-user/gpsd acct-group/dialout >=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez:= ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/ntpsec net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) ) gpsd_protocols_ublox? ( dev-python/pyserial ) gpsd_protocols_greis? ( dev-python/pyserial ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)?] )
-REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gpsd_protocols_isync? ( gpsd_protocols_ublox ) gpsd_protocols_ublox? ( python ) gpsd_protocols_greis? ( python ) python? ( || ( python_targets_python3_10 ) ) qt5? ( cxx )
-RESTRICT=!test? ( test )
-SLOT=0/29
-SRC_URI=mirror://nongnu/gpsd/gpsd-3.23.1.tar.xz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	scons-utils	b3544637c85286a19000d59461d3a7a5	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=c6c7e2d78bd4d5709a24326eced424ca
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.24 b/metadata/md5-cache/sci-geosciences/gpsd-3.24
deleted file mode 100644
index 78849da5ac9d..000000000000
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.24
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig || ( ( dev-lang/python:3.10 dev-build/scons[python_targets_python3_10(-)] ) ) test? ( app-alternatives/bc ) virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=acct-user/gpsd acct-group/dialout >=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez:= ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/ntpsec net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) ) gpsd_protocols_ublox? ( dev-python/pyserial ) gpsd_protocols_greis? ( dev-python/pyserial ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)?] )
-DESCRIPTION=GPS daemon and library for USB/serial GPS devices and GPS/mapping clients
-EAPI=7
-HOMEPAGE=https://gpsd.gitlab.io/gpsd/
-INHERIT=distutils-r1 scons-utils systemd toolchain-funcs udev
-IUSE=+gpsd_protocols_aivdm +gpsd_protocols_ashtech +gpsd_protocols_earthmate +gpsd_protocols_evermore +gpsd_protocols_fury +gpsd_protocols_fv18 +gpsd_protocols_garmin +gpsd_protocols_garmintxt +gpsd_protocols_geostar +gpsd_protocols_gpsclock +gpsd_protocols_greis +gpsd_protocols_isync +gpsd_protocols_itrax +gpsd_protocols_navcom +gpsd_protocols_nmea2000 +gpsd_protocols_oceanserver +gpsd_protocols_oncore +gpsd_protocols_rtcm104v2 +gpsd_protocols_rtcm104v3 +gpsd_protocols_sirf +gpsd_protocols_skytraq +gpsd_protocols_superstar2 +gpsd_protocols_tnt +gpsd_protocols_tripmate +gpsd_protocols_tsip +gpsd_protocols_ublox bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 +shm +sockets static systemd test udev usb X python_targets_python3_10
-KEYWORDS=amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86
-LICENSE=BSD
-RDEPEND=acct-user/gpsd acct-group/dialout >=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez:= ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/ntpsec net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) ) gpsd_protocols_ublox? ( dev-python/pyserial ) gpsd_protocols_greis? ( dev-python/pyserial ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)?] )
-REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gpsd_protocols_isync? ( gpsd_protocols_ublox ) gpsd_protocols_ublox? ( python ) gpsd_protocols_greis? ( python ) python? ( || ( python_targets_python3_10 ) ) qt5? ( cxx )
-RESTRICT=!test? ( test )
-SLOT=0/29
-SRC_URI=mirror://nongnu/gpsd/gpsd-3.24.tar.xz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	scons-utils	b3544637c85286a19000d59461d3a7a5	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=7da352d1553d3104c3ea3f3fad2b46de
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.25 b/metadata/md5-cache/sci-geosciences/gpsd-3.25
index 22a2bbae9a2d..005413df45ab 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.25
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.25
@@ -7,11 +7,11 @@ HOMEPAGE=https://gpsd.gitlab.io/gpsd/
 INHERIT=distutils-r1 scons-utils systemd toolchain-funcs udev
 IUSE=+gpsd_protocols_aivdm +gpsd_protocols_ashtech +gpsd_protocols_earthmate +gpsd_protocols_evermore +gpsd_protocols_fury +gpsd_protocols_fv18 +gpsd_protocols_garmin +gpsd_protocols_garmintxt +gpsd_protocols_geostar +gpsd_protocols_gpsclock +gpsd_protocols_greis +gpsd_protocols_isync +gpsd_protocols_itrax +gpsd_protocols_navcom +gpsd_protocols_nmea2000 +gpsd_protocols_oceanserver +gpsd_protocols_oncore +gpsd_protocols_rtcm104v2 +gpsd_protocols_rtcm104v3 +gpsd_protocols_sirf +gpsd_protocols_skytraq +gpsd_protocols_superstar2 +gpsd_protocols_tnt +gpsd_protocols_tripmate +gpsd_protocols_tsip +gpsd_protocols_ublox bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 selinux +shm +sockets static systemd test udev usb X python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86
-LICENSE=BSD
+LICENSE=BSD-2
 RDEPEND=acct-user/gpsd acct-group/dialout >=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez:= ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/ntpsec net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) ) gpsd_protocols_ublox? ( dev-python/pyserial ) gpsd_protocols_greis? ( dev-python/pyserial ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) selinux? ( sec-policy/selinux-gpsd )
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gpsd_protocols_isync? ( gpsd_protocols_ublox ) gpsd_protocols_ublox? ( python ) gpsd_protocols_greis? ( python ) python? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) qt5? ( cxx )
 RESTRICT=!test? ( test )
 SLOT=0/30
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.25.tar.xz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	scons-utils	b3544637c85286a19000d59461d3a7a5	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=2f0fc7f3fa5069def09994f9635cfef2
+_md5_=c70ed821511515b0c63d29be6c5248c6
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.25-r1 b/metadata/md5-cache/sci-geosciences/gpsd-3.25-r1
new file mode 100644
index 000000000000..9e2be05e4b6a
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.25-r1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig || ( ( dev-lang/python:3.12 dev-build/scons[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-build/scons[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-build/scons[python_targets_python3_10(-)] ) ) python? ( >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( app-alternatives/bc ) virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=acct-user/gpsd acct-group/dialout >=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez:= ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/ntpsec net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) gpsd_protocols_ublox? ( dev-python/pyserial[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) gpsd_protocols_greis? ( dev-python/pyserial[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] )
+DESCRIPTION=GPS daemon and library for USB/serial GPS devices and GPS/mapping clients
+EAPI=8
+HOMEPAGE=https://gpsd.gitlab.io/gpsd/
+INHERIT=distutils-r1 scons-utils systemd toolchain-funcs udev
+IUSE=+gpsd_protocols_aivdm +gpsd_protocols_ashtech +gpsd_protocols_earthmate +gpsd_protocols_evermore +gpsd_protocols_fury +gpsd_protocols_fv18 +gpsd_protocols_garmin +gpsd_protocols_garmintxt +gpsd_protocols_geostar +gpsd_protocols_gpsclock +gpsd_protocols_greis +gpsd_protocols_isync +gpsd_protocols_itrax +gpsd_protocols_navcom +gpsd_protocols_nmea2000 +gpsd_protocols_oceanserver +gpsd_protocols_oncore +gpsd_protocols_rtcm104v2 +gpsd_protocols_rtcm104v3 +gpsd_protocols_sirf +gpsd_protocols_skytraq +gpsd_protocols_superstar2 +gpsd_protocols_tnt +gpsd_protocols_tripmate +gpsd_protocols_tsip +gpsd_protocols_ublox bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 selinux +shm static systemd test udev usb X python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=acct-user/gpsd acct-group/dialout >=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez:= ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/ntpsec net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) gpsd_protocols_ublox? ( dev-python/pyserial[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) gpsd_protocols_greis? ( dev-python/pyserial[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) selinux? ( sec-policy/selinux-gpsd )
+REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gpsd_protocols_isync? ( gpsd_protocols_ublox ) gpsd_protocols_ublox? ( python ) gpsd_protocols_greis? ( python ) python? ( || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) ) qt5? ( cxx )
+RESTRICT=!test? ( test )
+SLOT=0/30
+SRC_URI=mirror://nongnu/gpsd/gpsd-3.25.tar.xz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	scons-utils	b3544637c85286a19000d59461d3a7a5	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=939ad8be4db628de0b1a77bcadcf3f86
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-9999 b/metadata/md5-cache/sci-geosciences/gpsd-9999
index c17e96f2eb50..f4a6df951fc4 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-9999
+++ b/metadata/md5-cache/sci-geosciences/gpsd-9999
@@ -1,16 +1,16 @@
-BDEPEND=virtual/pkgconfig || ( ( dev-lang/python:3.11 dev-build/scons[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-build/scons[python_targets_python3_10(-)] ) ) test? ( app-alternatives/bc ) dev-ruby/asciidoctor virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig || ( ( dev-lang/python:3.12 dev-build/scons[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-build/scons[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-build/scons[python_targets_python3_10(-)] ) ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( app-alternatives/bc ) dev-ruby/asciidoctor virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=acct-user/gpsd acct-group/dialout >=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez:= ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/ntpsec net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) ) gpsd_protocols_ublox? ( dev-python/pyserial ) gpsd_protocols_greis? ( dev-python/pyserial ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DEPEND=acct-user/gpsd acct-group/dialout >=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez:= ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/ntpsec net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) dev-python/pyserial[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] )
 DESCRIPTION=GPS daemon and library for USB/serial GPS devices and GPS/mapping clients
 EAPI=8
 HOMEPAGE=https://gpsd.gitlab.io/gpsd/
 INHERIT=distutils-r1 scons-utils systemd toolchain-funcs udev git-r3
-IUSE=+gpsd_protocols_aivdm +gpsd_protocols_ashtech +gpsd_protocols_earthmate +gpsd_protocols_evermore +gpsd_protocols_fury +gpsd_protocols_fv18 +gpsd_protocols_garmin +gpsd_protocols_garmintxt +gpsd_protocols_geostar +gpsd_protocols_gpsclock +gpsd_protocols_greis +gpsd_protocols_isync +gpsd_protocols_itrax +gpsd_protocols_navcom +gpsd_protocols_nmea2000 +gpsd_protocols_oceanserver +gpsd_protocols_oncore +gpsd_protocols_rtcm104v2 +gpsd_protocols_rtcm104v3 +gpsd_protocols_sirf +gpsd_protocols_skytraq +gpsd_protocols_superstar2 +gpsd_protocols_tnt +gpsd_protocols_tripmate +gpsd_protocols_tsip +gpsd_protocols_ublox bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 selinux +shm +sockets static systemd test udev usb X python_targets_python3_10 python_targets_python3_11
-LICENSE=BSD
+IUSE=+gpsd_protocols_aivdm +gpsd_protocols_ashtech +gpsd_protocols_earthmate +gpsd_protocols_evermore +gpsd_protocols_fury +gpsd_protocols_fv18 +gpsd_protocols_garmin +gpsd_protocols_garmintxt +gpsd_protocols_geostar +gpsd_protocols_gpsclock +gpsd_protocols_greis +gpsd_protocols_isync +gpsd_protocols_itrax +gpsd_protocols_navcom +gpsd_protocols_nmea2000 +gpsd_protocols_oncore +gpsd_protocols_sirf +gpsd_protocols_skytraq +gpsd_protocols_superstar2 +gpsd_protocols_tnt +gpsd_protocols_tripmate +gpsd_protocols_tsip bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp qt5 selinux +shm static systemd test udev usb X python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+LICENSE=BSD-2
 PROPERTIES=live
-RDEPEND=acct-user/gpsd acct-group/dialout >=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez:= ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/ntpsec net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) ) gpsd_protocols_ublox? ( dev-python/pyserial ) gpsd_protocols_greis? ( dev-python/pyserial ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) selinux? ( sec-policy/selinux-gpsd )
-REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gpsd_protocols_isync? ( gpsd_protocols_ublox ) gpsd_protocols_ublox? ( python ) gpsd_protocols_greis? ( python ) python? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) qt5? ( cxx )
+RDEPEND=acct-user/gpsd acct-group/dialout >=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez:= ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/ntpsec net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) dev-python/pyserial[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) selinux? ( sec-policy/selinux-gpsd )
+REQUIRED_USE=gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) qt5? ( cxx )
 RESTRICT=!test? ( test )
 SLOT=0/30
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	scons-utils	b3544637c85286a19000d59461d3a7a5	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=7953ab681b34a08274b20f488c6c33a9
+_md5_=a4dd97062d724b9be0ac6c803cd872cc
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index dbf151887ca8..61987c98b4b5 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/lapack-3.12.0-r1 b/metadata/md5-cache/sci-libs/lapack-3.12.0-r1
index b2fcf1728139..09c5a9f71fa3 100644
--- a/metadata/md5-cache/sci-libs/lapack-3.12.0-r1
+++ b/metadata/md5-cache/sci-libs/lapack-3.12.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig test? ( || ( dev-lang/python:3.11 dev-lang/python:3.10 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5 virtual/fortran
+BDEPEND=virtual/pkgconfig test? ( || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5 virtual/fortran
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=!app-eselect/eselect-cblas virtual/fortran eselect-ldso? ( >=app-eselect/eselect-blas-0.2 >=app-eselect/eselect-lapack-0.2 ) doc? ( app-doc/blas-docs ) virtual/fortran
 DESCRIPTION=BLAS, CBLAS, LAPACK, LAPACKE reference implementations
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Reference-LAPACK/lapack/archive/v3.12.0.tar.gz -> lapack-3.12.0.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e6436a0aa92b402d2cb16b5a06b691ff
+_md5_=6579a78a88b009ae1c076aa7235fd52b
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 3e770633cf5d..c447400fd788 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/singular-4.3.2_p16 b/metadata/md5-cache/sci-mathematics/singular-4.3.2_p16-r1
index 58e04423a99d..d5b4a0026779 100644
--- a/metadata/md5-cache/sci-mathematics/singular-4.3.2_p16
+++ b/metadata/md5-cache/sci-mathematics/singular-4.3.2_p16-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-lang/perl dev-libs/gmp:0 dev-libs/ntl:= sci-libs/cddlib sci-mathematics/flint sys-apps/texinfo emacs? ( app-editors/emacs:* ) polymake? ( sci-mathematics/polymake ) readline? ( sys-libs/readline )
+DEPEND=dev-lang/perl dev-libs/gmp:0= dev-libs/ntl:= sci-libs/cddlib sci-mathematics/flint:= sys-apps/texinfo emacs? ( app-editors/emacs:* ) polymake? ( sci-mathematics/polymake ) readline? ( sys-libs/readline:= )
 DESCRIPTION=Computer algebra system for polynomial computations
 EAPI=8
 HOMEPAGE=https://www.singular.uni-kl.de/ https://github.com/Singular/Singular
@@ -8,8 +8,8 @@ INHERIT=autotools elisp-common
 IUSE=emacs examples polymake +readline
 KEYWORDS=amd64 ~ppc ~riscv ~x86 ~x86-linux
 LICENSE=BSD GPL-2 GPL-2+ GPL-3
-RDEPEND=dev-lang/perl dev-libs/gmp:0 dev-libs/ntl:= sci-libs/cddlib sci-mathematics/flint sys-apps/texinfo emacs? ( app-editors/emacs:* ) polymake? ( sci-mathematics/polymake ) readline? ( sys-libs/readline )
+RDEPEND=dev-lang/perl dev-libs/gmp:0= dev-libs/ntl:= sci-libs/cddlib sci-mathematics/flint:= sys-apps/texinfo emacs? ( app-editors/emacs:* ) polymake? ( sci-mathematics/polymake ) readline? ( sys-libs/readline:= )
 SLOT=0
 SRC_URI=https://www.singular.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-3-2/singular-4.3.2p16.tar.gz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	elisp-common	abb2dda42f680fce87602c8273f832c7	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=0592aee7adfb8becc00e58b87da2e719
+_md5_=53176ee7e7539f2f22cd40630efd5930
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 791acc1747b7..eb6d88e2af6e 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/dtc-1.7.0 b/metadata/md5-cache/sys-apps/dtc-1.7.0
index 0cc0d7e7d28d..59a68302507c 100644
--- a/metadata/md5-cache/sys-apps/dtc-1.7.0
+++ b/metadata/md5-cache/sys-apps/dtc-1.7.0
@@ -1,17 +1,17 @@
 BDEPEND=app-alternatives/yacc app-alternatives/lex virtual/pkgconfig python? ( dev-lang/swig ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) yaml? ( dev-libs/libyaml )
+DEPEND=python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) yaml? ( dev-libs/libyaml )
 DESCRIPTION=Open Firmware device tree compiler
 EAPI=8
 HOMEPAGE=https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/
 INHERIT=meson python-single-r1
-IUSE=python static-libs test yaml python_single_target_python3_10 python_single_target_python3_11
+IUSE=python static-libs test yaml python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) yaml? ( dev-libs/libyaml )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
+RDEPEND=python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) yaml? ( dev-libs/libyaml )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/utils/dtc/dtc-1.7.0.tar.xz
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=d61d783e89c187eee630680777a64c7b
+_md5_=b1c8fdf9803a91c43387959a15b5c504
diff --git a/metadata/md5-cache/sys-apps/dtc-9999 b/metadata/md5-cache/sys-apps/dtc-9999
index 791e087aee3c..8a7233a82590 100644
--- a/metadata/md5-cache/sys-apps/dtc-9999
+++ b/metadata/md5-cache/sys-apps/dtc-9999
@@ -1,16 +1,16 @@
 BDEPEND=app-alternatives/yacc app-alternatives/lex virtual/pkgconfig python? ( dev-lang/swig ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) yaml? ( >=dev-libs/libyaml-0.2.3 )
+DEPEND=python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) yaml? ( >=dev-libs/libyaml-0.2.3 )
 DESCRIPTION=Open Firmware device tree compiler
 EAPI=8
 HOMEPAGE=https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/
 INHERIT=meson python-single-r1 git-r3
-IUSE=python static-libs test yaml python_single_target_python3_10 python_single_target_python3_11
+IUSE=python static-libs test yaml python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) yaml? ( >=dev-libs/libyaml-0.2.3 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
+RDEPEND=python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) yaml? ( >=dev-libs/libyaml-0.2.3 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=b5857bc48ab23458ee9be1492d24ca87
+_md5_=835e163efa5b26582b427d6dffcfb6a7
diff --git a/metadata/md5-cache/sys-apps/ethtool-6.9 b/metadata/md5-cache/sys-apps/ethtool-6.9
new file mode 100644
index 000000000000..4eab40d9d531
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ethtool-6.9
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/xz-utils
+DEFINED_PHASES=configure
+DEPEND=netlink? ( net-libs/libmnl )
+DESCRIPTION=Utility for examining and tuning ethernet-based network interfaces
+EAPI=8
+HOMEPAGE=https://www.kernel.org/pub/software/network/ethtool/
+IUSE=+netlink
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=netlink? ( net-libs/libmnl )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/software/network/ethtool/ethtool-6.9.tar.xz
+_md5_=efebe5ec217f2e8ab643cfa94573c3f0
diff --git a/metadata/md5-cache/sys-apps/findutils-4.10.0 b/metadata/md5-cache/sys-apps/findutils-4.10.0
new file mode 100644
index 000000000000..6b67aa20504f
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/findutils-4.10.0
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( sys-devel/gettext ) test? ( || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) dev-util/dejagnu ) verify-sig? ( sec-keys/openpgp-keys-findutils ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl )
+DESCRIPTION=GNU utilities for finding files
+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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=GPL-3+
+RDEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnu/findutils/findutils-4.10.0.tar.xz verify-sig? ( mirror://gnu/findutils/findutils-4.10.0.tar.xz.sig )
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_md5_=7cabe65dececce9f8e6bba486f09fbbe
diff --git a/metadata/md5-cache/sys-apps/firejail-0.9.70 b/metadata/md5-cache/sys-apps/firejail-0.9.70
deleted file mode 100644
index 7c41b77cc92f..000000000000
--- a/metadata/md5-cache/sys-apps/firejail-0.9.70
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=!sys-apps/firejail-lts apparmor? ( sys-libs/libapparmor ) contrib? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) ) dbusproxy? ( sys-apps/xdg-dbus-proxy ) sys-libs/libseccomp test? ( dev-tcltk/expect )
-DESCRIPTION=Security sandbox for any type of processes
-EAPI=7
-HOMEPAGE=https://firejail.wordpress.com/
-INHERIT=toolchain-funcs python-single-r1 linux-info
-IUSE=apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home test +userns X +python_single_target_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-apps/firejail-lts apparmor? ( sys-libs/libapparmor ) contrib? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) ) dbusproxy? ( sys-apps/xdg-dbus-proxy )
-REQUIRED_USE=contrib? ( ^^ ( python_single_target_python3_10 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/netblue30/firejail/releases/download/0.9.70/firejail-0.9.70.tar.xz
-_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=449444d9e41c03578b65b6e7ce64d3e5
diff --git a/metadata/md5-cache/sys-apps/pciutils-3.11.1 b/metadata/md5-cache/sys-apps/pciutils-3.11.1
deleted file mode 100644
index 779f15bbc339..000000000000
--- a/metadata/md5-cache/sys-apps/pciutils-3.11.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=sys-devel/binutils-2.37:* sys-devel/lld sys-devel/native-cctools ) kmod? ( virtual/pkgconfig )
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=kmod? ( sys-apps/kmod ) udev? ( >=virtual/libudev-208[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
-DESCRIPTION=Various utilities dealing with the PCI bus
-EAPI=8
-HOMEPAGE=https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git
-INHERIT=toolchain-funcs multilib-minimal flag-o-matic
-IUSE=dns +kmod static-libs +udev zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=kmod? ( sys-apps/kmod ) udev? ( >=virtual/libudev-208[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sys-apps/hwdata
-REQUIRED_USE=static-libs? ( !udev )
-SLOT=0
-SRC_URI=https://mj.ucw.cz/download/linux/pci/pciutils-3.11.1.tar.gz
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=1dcaf750eaeb6ce3b78b6b142ddec80b
diff --git a/metadata/md5-cache/sys-apps/pcsc-lite-2.0.0 b/metadata/md5-cache/sys-apps/pcsc-lite-2.0.0
deleted file mode 100644
index ecc256e18e34..000000000000
--- a/metadata/md5-cache/sys-apps/pcsc-lite-2.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-alternatives/lex virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=libusb? ( virtual/libusb:1 ) udev? ( virtual/libudev:= ) policykit? ( >=sys-auth/polkit-0.111 ) acct-group/openct acct-group/pcscd acct-user/pcscd python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 )
-DESCRIPTION=PC/SC Architecture smartcard middleware library
-EAPI=8
-HOMEPAGE=https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC
-INHERIT=python-single-r1 systemd tmpfiles udev multilib-minimal
-IUSE=doc embedded libusb policykit selinux systemd +udev python_single_target_python3_10 python_single_target_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD ISC MIT GPL-3+ GPL-2
-RDEPEND=libusb? ( virtual/libusb:1 ) udev? ( virtual/libudev:= ) policykit? ( >=sys-auth/polkit-0.111 ) acct-group/openct acct-group/pcscd acct-user/pcscd python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) selinux? ( sec-policy/selinux-pcscd ) virtual/tmpfiles
-REQUIRED_USE=^^ ( udev libusb ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=https://pcsclite.apdu.fr/files/pcsc-lite-2.0.0.tar.bz2
-_eclasses_=multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=25b45f1e35c5a86a5c512976b1817afa
diff --git a/metadata/md5-cache/sys-apps/pcsc-lite-2.0.1 b/metadata/md5-cache/sys-apps/pcsc-lite-2.0.1-r1
index 082ff0e05b9b..913463dc2777 100644
--- a/metadata/md5-cache/sys-apps/pcsc-lite-2.0.1
+++ b/metadata/md5-cache/sys-apps/pcsc-lite-2.0.1-r1
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( udev libusb ) ^^ ( python_single_target_python3_10 python_sing
 SLOT=0
 SRC_URI=https://pcsclite.apdu.fr/files/pcsc-lite-2.0.1.tar.bz2
 _eclasses_=multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=726880a6acd4984e13e1516b528b906b
+_md5_=97d87cb101125362bd49b9f912fb0ac1
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-254.10-r1 b/metadata/md5-cache/sys-apps/systemd-utils-254.10-r1
index d67364193c49..1899d7711193 100644
--- a/metadata/md5-cache/sys-apps/systemd-utils-254.10-r1
+++ b/metadata/md5-cache/sys-apps/systemd-utils-254.10-r1
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v254.10.tar.gz -> systemd-stable-254.10.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-254.3-r1.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	meson	aecae905c2e0c201d7925fae52a5576d	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	secureboot	4911adb593665638c76fbd4e70d451ac	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=baefbc8e32d2ce51b130cf3c57775926
+_md5_=c8aafa3744d5a7b45e1de630482a679f
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-254.12 b/metadata/md5-cache/sys-apps/systemd-utils-254.12
index e1a0f01692b7..8e801b9792f2 100644
--- a/metadata/md5-cache/sys-apps/systemd-utils-254.12
+++ b/metadata/md5-cache/sys-apps/systemd-utils-254.12
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v254.12.tar.gz -> systemd-stable-254.12.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-254.3-r1.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	meson	aecae905c2e0c201d7925fae52a5576d	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	secureboot	4911adb593665638c76fbd4e70d451ac	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=eaffbfc1373900d3620cbdd2bf6e86c3
+_md5_=6b83581e0a5493821f456d2d568fd746
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-254.13 b/metadata/md5-cache/sys-apps/systemd-utils-254.13
index 9aa60760ce53..cc5dba6284c5 100644
--- a/metadata/md5-cache/sys-apps/systemd-utils-254.13
+++ b/metadata/md5-cache/sys-apps/systemd-utils-254.13
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v254.13.tar.gz -> systemd-stable-254.13.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-254.3-r1.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	meson	aecae905c2e0c201d7925fae52a5576d	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	secureboot	4911adb593665638c76fbd4e70d451ac	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=eaffbfc1373900d3620cbdd2bf6e86c3
+_md5_=6b83581e0a5493821f456d2d568fd746
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-255.4 b/metadata/md5-cache/sys-apps/systemd-utils-255.4
index 5cb281e530c0..7c056bd6081f 100644
--- a/metadata/md5-cache/sys-apps/systemd-utils-255.4
+++ b/metadata/md5-cache/sys-apps/systemd-utils-255.4
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v255.4.tar.gz -> systemd-stable-255.4.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-255.4.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	meson	aecae905c2e0c201d7925fae52a5576d	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	secureboot	4911adb593665638c76fbd4e70d451ac	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=35acd18a316afdf045dbc4c88df66037
+_md5_=6d42f7bb0dcc6bde910164f6769ee3bc
diff --git a/metadata/md5-cache/sys-apps/xdg-desktop-portal-xapp-1.0.4 b/metadata/md5-cache/sys-apps/xdg-desktop-portal-xapp-1.0.4
index eefd7fb093f4..8ce89b4ec082 100644
--- a/metadata/md5-cache/sys-apps/xdg-desktop-portal-xapp-1.0.4
+++ b/metadata/md5-cache/sys-apps/xdg-desktop-portal-xapp-1.0.4
@@ -5,10 +5,10 @@ DESCRIPTION=Backend implementation for xdg-desktop-portal using Cinnamon/MATE/Xf
 EAPI=8
 HOMEPAGE=https://github.com/linuxmint/xdg-desktop-portal-xapp/
 INHERIT=meson systemd
-KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.44:2 >=sys-apps/xdg-desktop-portal-1.5 sys-apps/xdg-desktop-portal-gtk >=x11-libs/xapp-2.8.1
 SLOT=0
 SRC_URI=https://github.com/linuxmint/xdg-desktop-portal-xapp/archive/1.0.4.tar.gz -> xdg-desktop-portal-xapp-1.0.4.tar.gz
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=81f50b343bd640037dd50592c11f3385
+_md5_=b034d2ce27ffd33dc39689a8fbfa0463
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 7d71ed1a5067..97fef6a6f13e 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/gcc-14.1.1_p20240601 b/metadata/md5-cache/sys-devel/gcc-14.1.1_p20240601
new file mode 100644
index 000000000000..876469efccc7
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-14.1.1_p20240601
@@ -0,0 +1,16 @@
+BDEPEND=amd64? ( >=sys-devel/binutils-2.30[cet(-)?] ) sys-devel/gnuconfig >=app-portage/elt-patches-20240116 app-alternatives/yacc >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-debug/valgrind ) ada? ( || ( sys-devel/gcc[ada] dev-lang/gnat-gpl[ada] ) ) d? ( || ( sys-devel/gcc[d(-)] <sys-devel/gcc-12[d(-)] ) ) rust? ( virtual/rust )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-debug/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +fortran doc hardened multilib objc pgo objc-gc libssp objc++ openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp pch systemtap d lto cet zstd valgrind custom-cflags ieee-long-double default-znow default-stack-clash-protection modula2 rust
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.11
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=14
+SRC_URI=mirror://gcc/snapshots/14-20240601/gcc-14-20240601.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-14.1.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-14.1.0-musl-patches-1.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=a447cd6dee206facb66720bdacf0c765a8b09f33 -> gcc-validate-failures-a447cd6dee206facb66720bdacf0c765a8b09f33.py )
+_eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain	ed4e0189e3e02b9fadef385f4b6dde2e	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=8e8a4ad646ca6b25588205b44cb97110
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 10182813a672..3b4910dba461 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/btrfs-progs-6.8 b/metadata/md5-cache/sys-fs/btrfs-progs-6.8
deleted file mode 100644
index fb3cadc266bf..000000000000
--- a/metadata/md5-cache/sys-fs/btrfs-progs-6.8
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig man? ( dev-python/sphinx dev-python/sphinx-rtd-theme ) verify-sig? ( sec-keys/openpgp-keys-dsterba ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/lzo:2= sys-apps/util-linux:=[static-libs(+)?] sys-libs/zlib:= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/setuptools[python_targets_python3_12(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd[static-libs(+)] ) )
-DESCRIPTION=Btrfs filesystem utilities
-EAPI=8
-HOMEPAGE=https://btrfs.readthedocs.io/en/latest/
-INHERIT=bash-completion-r1 python-single-r1 udev verify-sig
-IUSE=+convert python +man reiserfs static static-libs udev +zstd python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:=[static-libs(+)?] sys-libs/zlib:= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= )
-REQUIRED_USE=static? ( !udev ) python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) )
-RESTRICT=test
-SLOT=0/0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v6.8.tar.xz verify-sig? ( https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v6.8.tar.sign )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=57530701b6266e2b1f5e102fd7de32f9
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-6.8.1 b/metadata/md5-cache/sys-fs/btrfs-progs-6.8.1
index 0b4e5843eb96..cde0e29f4eca 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-6.8.1
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-6.8.1
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v6.8.1.tar.xz verify-sig? ( https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v6.8.1.tar.sign )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=2fcbbb6b2d91d9cf728a1ca9644285ff
+_md5_=a3b807d9e5d4084b695d80912d1a678f
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-9999 b/metadata/md5-cache/sys-fs/btrfs-progs-9999
index a9f784afe3dc..fa7597e49b43 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-9999
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=static? ( !udev ) python? ( ^^ ( python_single_target_python3_10 py
 RESTRICT=test
 SLOT=0/0
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=6dc799b3f3cb071ddd5e6694bb0436d0
+_md5_=bfafe1c0461333363abd1615bf2445b8
diff --git a/metadata/md5-cache/sys-fs/mergerfs-2.35.1 b/metadata/md5-cache/sys-fs/mergerfs-2.40.2
index 58cba4d80607..4b1cc5ba7ce6 100644
--- a/metadata/md5-cache/sys-fs/mergerfs-2.35.1
+++ b/metadata/md5-cache/sys-fs/mergerfs-2.40.2
@@ -2,14 +2,14 @@ BDEPEND=sys-devel/gettext
 DEFINED_PHASES=compile install prepare
 DEPEND=xattr? ( sys-apps/attr )
 DESCRIPTION=A featureful union filesystem
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/trapexit/mergerfs
 INHERIT=toolchain-funcs
 IUSE=+xattr
-KEYWORDS=amd64 ~riscv x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=ISC LGPL-2.1
 RDEPEND=xattr? ( sys-apps/attr )
 SLOT=0
-SRC_URI=https://github.com/trapexit/mergerfs/archive/2.35.1.tar.gz -> mergerfs-2.35.1.tar.gz
+SRC_URI=https://github.com/trapexit/mergerfs/archive/2.40.2.tar.gz -> mergerfs-2.40.2.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=77ddf79777c28a66cebaf8fc53bb1367
+_md5_=59f0bd6d57f7515f246a117a3e3c4c24
diff --git a/metadata/md5-cache/sys-fs/mergerfs-tools-0_p20230912 b/metadata/md5-cache/sys-fs/mergerfs-tools-0_p20230912
new file mode 100644
index 000000000000..daa61f9c6ba5
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/mergerfs-tools-0_p20230912
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install setup
+DESCRIPTION=Optional tools to help manage data in a mergerfs pool
+EAPI=8
+HOMEPAGE=https://github.com/trapexit/mergerfs-tools
+INHERIT=python-single-r1
+IUSE=python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=ISC
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13 )
+SLOT=0
+SRC_URI=https://github.com/trapexit/mergerfs-tools/archive/80d6c9511da554009415d67e7c0ead1256c1fc41.tar.gz -> mergerfs-tools-0_p20230912.gh.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=9738134709aaa16eeb4a627898cac987
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 2c2cf8f78f69..f748b973b98e 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/xpra-html5-10.1 b/metadata/md5-cache/www-apps/xpra-html5-10.1
index 3e733ad57617..4952ec27cf90 100644
--- a/metadata/md5-cache/www-apps/xpra-html5-10.1
+++ b/metadata/md5-cache/www-apps/xpra-html5-10.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) brotli? ( app-arch/brotli ) minify? ( dev-util/uglifyjs )
+BDEPEND=|| ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) brotli? ( app-arch/brotli ) minify? ( dev-util/uglifyjs )
 DEFINED_PHASES=configure install setup
 DESCRIPTION=HTML5 client to connect to any xpra server
 EAPI=8
@@ -10,4 +10,4 @@ LICENSE=MPL-2.0
 SLOT=0
 SRC_URI=https://github.com/Xpra-org/xpra-html5/archive/refs/tags/v10.1.tar.gz -> xpra-html5-10.1.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a3c4a98fd58030631dce92e2cbed9629
+_md5_=ef4425bbe9ea7694eb7daa76782086ef
diff --git a/metadata/md5-cache/www-apps/xpra-html5-6.1 b/metadata/md5-cache/www-apps/xpra-html5-13
index 09967574ed88..657fe1557a79 100644
--- a/metadata/md5-cache/www-apps/xpra-html5-6.1
+++ b/metadata/md5-cache/www-apps/xpra-html5-13
@@ -1,13 +1,13 @@
-BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) brotli? ( app-arch/brotli ) minify? ( dev-util/uglifyjs )
+BDEPEND=|| ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) brotli? ( app-arch/brotli ) minify? ( dev-util/uglifyjs )
 DEFINED_PHASES=configure install setup
 DESCRIPTION=HTML5 client to connect to any xpra server
 EAPI=8
 HOMEPAGE=https://xpra.org/
 INHERIT=python-any-r1
 IUSE=brotli +gzip minify
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
 LICENSE=MPL-2.0
 SLOT=0
-SRC_URI=https://github.com/Xpra-org/xpra-html5/archive/refs/tags/v6.1.tar.gz -> xpra-html5-6.1.tar.gz
+SRC_URI=https://github.com/Xpra-org/xpra-html5/archive/refs/tags/v13.tar.gz -> xpra-html5-13.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=d68aae89779cdede347e4fa1b8f99d18
+_md5_=e04da356d9e92a0628a5ceb403e49cd2
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index f80f49d828a8..313ba27ef205 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/elinks-0.16.1.1-r3 b/metadata/md5-cache/www-client/elinks-0.16.1.1-r3
new file mode 100644
index 000000000000..30d7e4226de5
--- /dev/null
+++ b/metadata/md5-cache/www-client/elinks-0.16.1.1-r3
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( net-dns/libidn ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
+DEFINED_PHASES=compile configure install postinst setup test
+DEPEND=>=sys-libs/ncurses-5.2:=[unicode(+)] brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn:= ) javascript? ( dev-cpp/libxmlpp:5.0 dev-lang/mujs:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= ) X? ( x11-base/xorg-proto )
+DESCRIPTION=Advanced and well-established text-mode web browser
+EAPI=8
+HOMEPAGE=http://elinks.or.cz/
+INHERIT=flag-o-matic meson lua-single python-single-r1
+IUSE=bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn javascript lua lzma +mouse nls nntp perl python samba ssl test tre unicode X xml zlib zstd lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/ncurses-5.2:=[unicode(+)] brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn:= ) javascript? ( dev-cpp/libxmlpp:5.0 dev-lang/mujs:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/rkd77/elinks/releases/download/v0.16.1.1/elinks-0.16.1.1.tar.xz
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=f7a0ac8e476c302ca06e505105755335
diff --git a/metadata/md5-cache/www-client/elinks-9999 b/metadata/md5-cache/www-client/elinks-9999
index 37a59562d5c8..b4dece6a67fc 100644
--- a/metadata/md5-cache/www-client/elinks-9999
+++ b/metadata/md5-cache/www-client/elinks-9999
@@ -1,16 +1,16 @@
-BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( net-dns/libidn2 ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( net-dns/libidn2 ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst setup test unpack
-DEPEND=>=sys-libs/ncurses-5.2:=[unicode(+)] brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn2:= ) javascript? ( dev-cpp/libxmlpp:5.0 dev-lang/mujs:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= ) X? ( x11-base/xorg-proto )
+DEPEND=>=sys-libs/ncurses-5.2:=[unicode(+)] brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn2:= ) javascript? ( dev-cpp/libxmlpp:5.0 dev-lang/mujs:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= ) X? ( x11-base/xorg-proto )
 DESCRIPTION=Advanced and well-established text-mode web browser
 EAPI=8
 HOMEPAGE=http://elinks.or.cz/
-INHERIT=flag-o-matic meson lua-single python-any-r1 git-r3
-IUSE=bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn javascript lua lzma +mouse nls nntp perl samba ssl test tre unicode X xml zlib zstd lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+INHERIT=flag-o-matic meson lua-single python-single-r1 git-r3
+IUSE=bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn javascript lua lzma +mouse nls nntp perl python samba ssl test tre unicode X xml zlib zstd lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=>=sys-libs/ncurses-5.2:=[unicode(+)] brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn2:= ) javascript? ( dev-cpp/libxmlpp:5.0 dev-lang/mujs:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
+RDEPEND=>=sys-libs/ncurses-5.2:=[unicode(+)] brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn2:= ) javascript? ( dev-cpp/libxmlpp:5.0 dev-lang/mujs:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=98d7f2cb8e94cd0187a9e09c083c63a7
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=d2fa7f7df4f708e9faa78202c1cfaf99
diff --git a/metadata/md5-cache/www-client/vivaldi-6.7.3329.31 b/metadata/md5-cache/www-client/vivaldi-6.7.3329.31
index 91396a5a175b..8a1af0ed6c19 100644
--- a/metadata/md5-cache/www-client/vivaldi-6.7.3329.31
+++ b/metadata/md5-cache/www-client/vivaldi-6.7.3329.31
@@ -5,7 +5,7 @@ HOMEPAGE=https://vivaldi.com/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=chromium-2 desktop linux-info toolchain-funcs unpacker xdg
 IUSE=ffmpeg-chromium gtk proprietary-codecs qt5 qt6 widevine +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_ca-valencia +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~arm64
+KEYWORDS=-* amd64 ~arm ~arm64
 LICENSE=Vivaldi
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) ffmpeg-chromium? ( media-video/ffmpeg-chromium:124 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) widevine? ( www-plugins/chrome-binary-plugins )
 REQUIRED_USE=ffmpeg-chromium? ( proprietary-codecs )
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.7.3329.31-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.7.3329.31-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.7.3329.31-1_arm64.deb )
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e8e3e41baa427395c4e855fab6230bca
+_md5_=3c7637f21ab5cd8bac324db9fbe06abc
diff --git a/metadata/md5-cache/www-client/vivaldi-6.7.3329.27 b/metadata/md5-cache/www-client/vivaldi-6.7.3329.39
index 92f896677041..d6c586215c7a 100644
--- a/metadata/md5-cache/www-client/vivaldi-6.7.3329.27
+++ b/metadata/md5-cache/www-client/vivaldi-6.7.3329.39
@@ -5,12 +5,12 @@ HOMEPAGE=https://vivaldi.com/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=chromium-2 desktop linux-info toolchain-funcs unpacker xdg
 IUSE=ffmpeg-chromium gtk proprietary-codecs qt5 qt6 widevine +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_ca-valencia +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64 ~arm ~arm64
+KEYWORDS=-* ~amd64 ~arm ~arm64
 LICENSE=Vivaldi
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) ffmpeg-chromium? ( media-video/ffmpeg-chromium:124 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) widevine? ( www-plugins/chrome-binary-plugins )
 REQUIRED_USE=ffmpeg-chromium? ( proprietary-codecs )
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.7.3329.27-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.7.3329.27-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.7.3329.27-1_arm64.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.7.3329.39-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.7.3329.39-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.7.3329.39-1_arm64.deb )
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3c7637f21ab5cd8bac324db9fbe06abc
+_md5_=e8e3e41baa427395c4e855fab6230bca
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-6.7.3329.19 b/metadata/md5-cache/www-client/vivaldi-snapshot-6.8.3371.4
index 672696e95dcd..f07baa7d2571 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-6.7.3329.19
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-6.8.3371.4
@@ -7,10 +7,9 @@ INHERIT=chromium-2 desktop linux-info toolchain-funcs unpacker xdg
 IUSE=ffmpeg-chromium gtk proprietary-codecs qt5 qt6 widevine +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_ca-valencia +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* ~amd64 ~arm ~arm64
 LICENSE=Vivaldi
-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[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) ffmpeg-chromium? ( media-video/ffmpeg-chromium:124 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) widevine? ( www-plugins/chrome-binary-plugins )
-REQUIRED_USE=ffmpeg-chromium? ( proprietary-codecs )
+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[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) ffmpeg-chromium? ( media-video/ffmpeg-chromium:126 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_6.7.3329.19-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_6.7.3329.19-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_6.7.3329.19-1_arm64.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_6.8.3371.4-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_6.8.3371.4-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_6.8.3371.4-1_arm64.deb )
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bcb0c9fb44fd7a178d7a1d17650b2da6
+_md5_=4bdd798634dbc67da63adffd9d22e8fd
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index d1dbb4bf5d9e..ba5a54c62529 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/xcb-imdkit-1.0.7 b/metadata/md5-cache/x11-libs/xcb-imdkit-1.0.9
index 5b6ee5c082c8..28380fea1d59 100644
--- a/metadata/md5-cache/x11-libs/xcb-imdkit-1.0.7
+++ b/metadata/md5-cache/x11-libs/xcb-imdkit-1.0.9
@@ -1,14 +1,14 @@
 BDEPEND=kde-frameworks/extra-cmake-modules:0 virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
+DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms dev-libs/uthash
 DESCRIPTION=Input method development support for xcb
 EAPI=8
 HOMEPAGE=https://github.com/fcitx/xcb-imdkit
-INHERIT=cmake
+INHERIT=cmake unpacker
 KEYWORDS=~amd64 ~arm64 ~loong ~riscv ~x86
 LICENSE=LGPL-2.1
 RDEPEND=x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms
 SLOT=5
-SRC_URI=https://download.fcitx-im.org/fcitx5/xcb-imdkit/xcb-imdkit-1.0.7.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=be28d16b151d1d87b9f8e6eaeb728b52
+SRC_URI=https://download.fcitx-im.org/fcitx5/xcb-imdkit/xcb-imdkit-1.0.9.tar.zst
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=df89e7f11b890c330f59b841049a582e
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 70031c74e63d..0fcf3cf88e78 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/spacefm-1.0.6-r3 b/metadata/md5-cache/x11-misc/spacefm-1.0.6-r3
new file mode 100644
index 000000000000..2f1c379d45a1
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/spacefm-1.0.6-r3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3
+DEFINED_PHASES=configure postinst postrm preinst prepare setup
+DEPEND=dev-libs/glib:2 dev-util/desktop-file-utils virtual/udev virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info startup-notification? ( x11-libs/startup-notification ) video-thumbnails? ( media-video/ffmpegthumbnailer ) x11-base/xorg-proto
+DESCRIPTION=A multi-panel tabbed file manager
+EAPI=8
+HOMEPAGE=https://ignorantguru.github.io/spacefm/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools linux-info optfeature xdg
+IUSE=+startup-notification +video-thumbnails
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=dev-libs/glib:2 dev-util/desktop-file-utils virtual/udev virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info startup-notification? ( x11-libs/startup-notification ) video-thumbnails? ( media-video/ffmpegthumbnailer )
+SLOT=0
+SRC_URI=https://github.com/IgnorantGuru/spacefm/archive/1.0.6.tar.gz -> spacefm-1.0.6.tar.gz
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=617b0f23fb93f39a8c090406196086ac
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index d50169b1f1ab..15259ed6eb9a 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/xfce4-power-manager-4.19.3 b/metadata/md5-cache/xfce-base/xfce4-power-manager-4.19.3
new file mode 100644
index 000000000000..4579b5b55067
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfce4-power-manager-4.19.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 virtual/pkgconfig wayland? ( >=dev-libs/wayland-protocols-1.20 >=dev-util/wayland-scanner-1.15 )
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.70.0 >=sys-power/upower-0.99.10 >=x11-libs/gtk+-3.24.0:3[wayland?,X?] >=x11-libs/libnotify-0.7.0 >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.18.4:=[gtk3(+)] >=xfce-base/libxfce4util-4.19.2:= panel-plugin? ( >=xfce-base/xfce4-panel-4.14.0:= ) policykit? ( >=sys-auth/polkit-0.102 ) wayland? ( >=dev-libs/wayland-1.15 ) X? ( >=x11-libs/libX11-1.6.7 >=x11-libs/libXrandr-1.5.0 >=x11-libs/libXext-1.0.0 x11-libs/libXtst ) x11-base/xorg-proto
+DESCRIPTION=Power manager for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/xfce/xfce4-power-manager/start https://gitlab.xfce.org/xfce/xfce4-power-manager/
+INHERIT=xdg-utils
+IUSE=+panel-plugin policykit wayland X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.70.0 >=sys-power/upower-0.99.10 >=x11-libs/gtk+-3.24.0:3[wayland?,X?] >=x11-libs/libnotify-0.7.0 >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.18.4:=[gtk3(+)] >=xfce-base/libxfce4util-4.19.2:= panel-plugin? ( >=xfce-base/xfce4-panel-4.14.0:= ) policykit? ( >=sys-auth/polkit-0.102 ) wayland? ( >=dev-libs/wayland-1.15 ) X? ( >=x11-libs/libX11-1.6.7 >=x11-libs/libXrandr-1.5.0 >=x11-libs/libXext-1.0.0 x11-libs/libXtst )
+REQUIRED_USE=|| ( wayland X )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-power-manager/4.19/xfce4-power-manager-4.19.3.tar.bz2
+_eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=5c9ec80e52d4d294b7821dfde68058d4
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 37f5dd056750..a33548df9e49 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 18015 BLAKE2B 0f236b16aa7102e94bdd290c9f35570b14fb7fd85c65d186e87b6144aaab308d7d7d90c949a1a279026ed000388dfc6d58203e21b0ea6f443155b2f84bd0dac1 SHA512 f7c4e16fcc69c01f6670c47e53c3d66dee0c1805037a50a3c5b41e311cff17079a9031b211bdfb4ad68df22ad33fe9c562c28c14eec3932a15d0e9e3a86b3533
-TIMESTAMP 2024-06-01T22:40:36Z
+TIMESTAMP 2024-06-02T22:40:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmZbo2RfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmZc9OlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBmMA//XdNdZBCBE3Jnk/mzKT2N6O7kKJunUgd59OSXuxJV1HZPq6BesqIUZWkz
-FPHVWXP+JHVA1OFYVvFvJVFPSaSPFNexoAmlVA7sedsYPdwzAC66uYspEUmKfUVw
-EbpiR1iMIj9XnLNav7inrJnaCVuruPWu4KFqD8D1eMYMplPeWzx7FqyxIlY9fqJ7
-KEiHv/vgxKo2VGMRuwRREmkr/v3xi+lVEYjIaJveXSyQzoRr4WaGlzcadMKaWJzg
-GhYAGjmDRnthKa9OMP1LpOn0LwvRzQuSvr+XEv6zn3kw7T95z+f2+su6GaYtMwRx
-JXt7nuO1/8imojkhM3eGaVF8uu8nEEwJ0AP+hJ18rA9vMgb5JOT/sJRuUPVuXSv0
-w4W486wP+Q9I9bgqOTzS4qr8PjJhcZRoRmfGlNUdjHugCF8JG1ndtmfb4rgidANR
-3LMtxt55VycOICZ7x9lb9l23ua3HLsXK05+RoKUh1R/d+9hr0Us/PFuqAv85LyG5
-Mi4ibXDpznBTo2NcgU2DzBNGY7oyS6Mladjg2XNfSXOSF+rNsWnI3xraU6IbOcI7
-vxkunK1JVsVQHEu2Iliugn2ZDSo9k5Yrfo4BXWl54ZzCXAX6/QwByV8OWjP5/rMY
-yLalRwKQ3VgseJIf6jVf/2Y3/SBfjn1xUeGlKprBUH1j/+RMhVo=
-=UaXP
+klCuAw//XWz/WUyelMhB/R45raMhyD66IKsFh11aQZI/Mw4ttLtCDxdxsqSYm0ZZ
+pzW8ZjbQ2uKNDUZyi5qTa3XBxbaCMigSFPUFngRKvZxPJp/RZ8lJj4bcWBi7sYr1
+ImTpf+kUneQe7AcCtbi54/ri0EW7IllQND5eJxOr/+uxih/9ha9nQRlA6l7NlFAc
+SldBrujdje2aku7H2pYb6WjViO6VHHTk2Lo/gemDe55Mhp+2XAK6qGY6SPBf1D9V
+GiVnnaJm6xxQoKfp7j7TCoqfvogvVuJAgsc7h8iH4pGdz4EvdB7d/eDQuvgsYuWY
+sIs4qXCgDwY4VAdzOsmwJjl5s0AsmRrIzM/HuKIcZFIPqcENGqGntqZSmFHT4DHR
+owchO/QClI6CMtqdr4gRNHRlH4U0xeT5U9WLBpUt4EzE2hMSXLhR3gqtoL/05EKT
+fl3D2q4IImBMw3YcBS4tGAOX70JC1iC6ZWazSJSO2fueY8igyNOJJdO8oyXSw8K+
+3VDU04fA+PhZL9vh7RVRq1afxZ2lR1Tv7pf76gwy6978O+ngsc9hjMKmrc20c4mG
+igFRKIWcsIaJ07CCk5mb80IEe+f5eG/jEEK6KGHx36IvH04XgE2UvKFrdNHNsgWr
+Dr/i/vYTCOQS4mg4UtqNnZf+kyvviCx/C5fuPBATBKQ9rExf4pk=
+=Vo7w
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 71a731690160..986f831690ee 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 01 Jun 2024 22:40:31 +0000
+Sun, 02 Jun 2024 22:40:38 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 4f22d99bd96f..9c9ab1fa5bfb 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Jun  1 10:40:30 PM UTC 2024
+Sun Jun  2 10:40:38 PM UTC 2024
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 261945601935..93e4b4d4384a 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 01 Jun 2024 22:45:00 +0000
+Sun, 02 Jun 2024 22:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 9c70079ca642..1ef8248b8c46 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-eccf9081825f94949ac04bcf2427a5c7191f0cb4 1717280307 2024-06-01T22:18:27Z
+f29a2197112517666901f840a9cb59510b878f54 1717364971 2024-06-02T21:49:31Z
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 6dfa257eec4c..191069d2aa87 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1717281600 Sat 01 Jun 2024 10:40:00 PM UTC
+1717368000 Sun 02 Jun 2024 10:40:00 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 71a731690160..986f831690ee 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 01 Jun 2024 22:40:31 +0000
+Sun, 02 Jun 2024 22:40:38 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 5282e9389d87..aa2a7f3be896 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index ad2681f242fd..e444951f5b46 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -17,8 +17,8 @@ AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c
 DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636
 DIST net-snmp-5.9.3.tar.gz 6646950 BLAKE2B b8e3de60e178ec16ad2848ad77f3bd4cbd35eaa9be103c0fa5d17514c29df4e69015ac53b54c9e565e3032b0c0bb47c19729e65310a6acefae901e101ea49451 SHA512 a476df4967029a2eb03d27b0e250170785d0a8c143d49b900ee958c3cbdfaccd415b70af40f6fbed9cb8819d522c35a6073a431091d908ccc7c018fa0aaa2abc
 DIST net-snmp-5.9.4.tar.gz 6681606 BLAKE2B 2f3dfdc4ce2f4d9a1a771a77e0b0c427a89e3de6dc217009df385baabc7d860ca7714fa76360a4d14521f1b88c9c13ad46b25d3975e33e8bc4bce3eb3b27b99d SHA512 a510fa91a21e9ddc86a12fd1d0bc6b356e63f3ea53f184d2e31439004d41d902390664134dc40b3b828eabb4282eaf3da628a07c4d480fa00eff7e700950c423
-EBUILD net-snmp-5.9.3-r3.ebuild 6557 BLAKE2B 719158070ba93af0208d0d970b7ac5b9858ff612f8de4ef83c6e6c6cb63e8c51f0f5452e7df220a67c3e6d660390b56d8b7b800379f1df3171eec1440fa0fcde SHA512 a63a6b28d9ce43e8f0660be514ed75f4b09adc145d04422f2f55fb4ee11604777ab25850b266d18674f976404756a13ab55e299fa72ed5115ce786665d15e44e
-EBUILD net-snmp-5.9.4-r1.ebuild 6563 BLAKE2B c29cb709e787b68ca8f3659e79c07aeec2fed913697ba82bbd81193f4fd405ed04a47c2a0c34776e16324f9c896be3f71e788de4568975c857e9b0fc0de9d22d SHA512 a6662327bd0bc448a1281c107363db5fd056587cf14e78924fbf4d964f6bc84139a20e906cfd95a9150e353d087703fca27d1972ab7fd112447fcd44f841facb
-EBUILD net-snmp-5.9.4.ebuild 6526 BLAKE2B fc0a68e7e79abb9f55bab849a9378720050ba08312b671f158ed4b0e8774d667e0e10f3fa27dd5f75f9f6006ea823215b610286e9308a45818b3a9d5597298f3 SHA512 b8ce931bc4955761018ba20a6f6dadebbe1fcff2b95f9e81969970fc78484903930ba0999cc9865e470dc4c2b7bff49f8d85ea81419ca8fcab626070c44cf754
-EBUILD net-snmp-9999.ebuild 6186 BLAKE2B 41fdd326cd4b9b7281aa455c741d8aa7756f6f8ef49477fa04386e809a9a1252c1881f7a50738b83896adb276f0e0545228e8d88c544bd1604d1a6d51cf685c9 SHA512 1ffc81d800fd8b20fc97bbd4cce48990c7b037ac76ff4336d681bec62c0d69d4a976cacfdfee751fe75deb8067f53da44eef16c90a3c0d632779e93d336eee8f
+EBUILD net-snmp-5.9.3-r3.ebuild 6557 BLAKE2B 9d01524a05a781dd6a34ebde50b2d64657cae6916d9c9e71ee63f4434debe996691e78bfa0b868c21fba2be23c1caae7c67e9396561a668c0e9ef34e42d6e7c4 SHA512 7c08cbdd4e2ff57c92028d0f662490a241ee31e23be03fd458cb149e4ff2e19d0092f72cef1b4d96f8bf7f2bcd9fc927c75b36c1342450c0c2df7fb1c0eb0e51
+EBUILD net-snmp-5.9.4-r1.ebuild 6563 BLAKE2B d64511baed96f27d6c7c0bd9311d5c997a7ac30a0046bcade50f0f0477bdeaf537c06ffa6cdc23a9a9285aeaebea64bba22635193ef559875fc18091d312c9e1 SHA512 c5d10fbe18ac82ec52078b5bad97ed044618e69ce43c152ad9ac2fc70f65910a0d1c05dce8e0875b2622276c109a14f0fc0951aa28d6a6562bdfddcf6dc0321c
+EBUILD net-snmp-5.9.4.ebuild 6526 BLAKE2B a3c04658acf1708e979f4425dcb9ef64949001d02926552a18036395ec54917cb3515db13696a34aa4a1cfd5d5ededbd54e8605eb310dcb71234cabea9cba6b2 SHA512 014a169bf94f74d832646b5fc7c7c87aa54953cf8ab14c27b3b94b4dc65a39d419d88976bb437159bc8131dbc02bc79382a8b5c43e8b7e8545f80628f739224e
+EBUILD net-snmp-9999.ebuild 6186 BLAKE2B 977c68c940ae1e1789ab42a46acf3d7a8fc0ea1e8503c72e3de409501a99d042b3c3d1e27d7336fa2675da1267539d0e76a435c8c8f9a72bf9aebce84e49dd79 SHA512 470e5993e1f659217fed0c97494e05633ac780fbbda0b7574a360070fb6cdcd86a76ed0381eb3a4ea7a697a615604ccb97e014102ccc600e4def9c15cf5bb2f9
 MISC metadata.xml 1552 BLAKE2B 4e2f3ca85f76e2bd5992e87385485055dc61f2ff52ba7a6ccc6cf2a3e34557a0d98840cfd34a88ee3c1513ebd2609e294f2db68d5963fa884eb0eb940d8599e3 SHA512 b666ad1730772cc9856bde562ad43db51b7ae1b2b9865d5804dd3313a0ca9200989d036be4ac33eaf1f5b1eda9864d9b9be4f5a58bcca8b1455d6e508e534bc2
diff --git a/net-analyzer/net-snmp/net-snmp-5.9.3-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.3-r3.ebuild
index cbf3ea5020b3..a84f5c835dad 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9.3-r3.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9.3-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_OPTIONAL=yes
 DISTUTILS_SINGLE_IMPL=yes
 GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 WANT_AUTOMAKE=none
 
 inherit autotools distutils-r1 libtool perl-module systemd
diff --git a/net-analyzer/net-snmp/net-snmp-5.9.4-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.4-r1.ebuild
index bf9f27337a9c..fd1c5403a8a4 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9.4-r1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9.4-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_OPTIONAL=yes
 DISTUTILS_SINGLE_IMPL=yes
 GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 WANT_AUTOMAKE=none
 
 inherit autotools distutils-r1 libtool perl-module systemd
diff --git a/net-analyzer/net-snmp/net-snmp-5.9.4.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.4.ebuild
index fe0ff528541d..7445f870e6bc 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9.4.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9.4.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_OPTIONAL=yes
 DISTUTILS_SINGLE_IMPL=yes
 GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 WANT_AUTOMAKE=none
 
 inherit autotools distutils-r1 libtool perl-module systemd
diff --git a/net-analyzer/net-snmp/net-snmp-9999.ebuild b/net-analyzer/net-snmp/net-snmp-9999.ebuild
index cb2b73cf9956..aec71f44cfce 100644
--- a/net-analyzer/net-snmp/net-snmp-9999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_OPTIONAL=yes
 DISTUTILS_SINGLE_IMPL=yes
 GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 WANT_AUTOMAKE=none
 
 inherit autotools distutils-r1 perl-module systemd
diff --git a/net-analyzer/wtfis/Manifest b/net-analyzer/wtfis/Manifest
index cf54c8905232..4873a6eae134 100644
--- a/net-analyzer/wtfis/Manifest
+++ b/net-analyzer/wtfis/Manifest
@@ -1,6 +1,8 @@
 DIST wtfis-0.7.1.gh.tar.gz 548395 BLAKE2B fbcc19358a0a357fdc9f4b5f27d4bda60e20a118c3c3b7cdfd90fad956d2ef0375efe4f0c8a3a94bfa8a6657d5bb710eaacb403b8c3d446921b963e3e8909442 SHA512 9a77c17e1e922e6d17aba9c6cc7364c8b65bc401cbca311280a4eef958056238aef87c2a8891c1bce5848083d1a7e5e00b0b63ead5ffefdea80ae7baee40c845
 DIST wtfis-0.8.0.gh.tar.gz 576810 BLAKE2B ac4573893aacc2533fe9ed3248613d3bf5ffb390a2dcbf01fd0590093a7bf753ee8da6e67b60142111726d55928a7913bb3f7ae1a22474876dec1cb3d81d3a3c SHA512 b709948d0ccd75472d9ccc0bfc4cec943700e57eccc42cc486075b8b89516fff054b6df92d6b23999987bab97b80db755de575cba4b56e2bd01a6bf24f058798
+DIST wtfis-0.9.1.gh.tar.gz 590558 BLAKE2B e4d1b70bd979b1cdf5c09e9adcf2e9484eb15a8986dc4c1f88d29af830f18a6974a6f5ec5cbb808c039df85aad708dec822ccdd8c765507c1a62084d6173e1c0 SHA512 72b6725c62d7345440021e57144c637e0c5503cfd870a8626707508428dc0ba24ae183b11836c726a58de6f2103e57cb7a3be4d132f7c8b758f88463d195dcc2
 EBUILD wtfis-0.7.1.ebuild 1016 BLAKE2B a9751f147f070de2960fe03ce51b2fb28447acea7d0bfb2fb3c2224a07c8f43255494e6fd6924e40e6bc003f9e091462c0760920ccee4bb7bf6a948e14da269c SHA512 db099cde7121278f5a33818acc58c78beb3aac3d61b92262c28b6a980dcf135ac5b7b1e62f78f75aebba33c3c9f63340974372c56b1f718e1b3fc820f8914ae8
-EBUILD wtfis-0.8.0.ebuild 1016 BLAKE2B 56c89a18dd0792ecb98d12453cc444ff2a611939772992b8f864024ab80af8e0bf2a706901d2ed1a12c6ddeceea91c5109564b4ea245751d76974ade951fdc53 SHA512 a5e172a1783fbcb49e40ad8410b056d9967a1bef7180b93e83e03d2c394ee709511dcc4b06a8543e7eb46435c0c0d38b5b274cfcd2d75d4b6de0e2eabdc8516b
-EBUILD wtfis-9999.ebuild 1018 BLAKE2B 1320c51abbe930264341bde632d6008071a77d6770dc75c6f93aefca94eab51ef83c9ae298aaa3bbea481d41dbc88204f02e6119cec25c43217857d4683408dc SHA512 31e531e6f585df54faf486511d75a45af50858ed63e7dfd1089542195b87a47d68033d1efb5661d1599dc8af37a49f863de4d9a1d67e16d9d907a53e8885cab0
+EBUILD wtfis-0.8.0.ebuild 1016 BLAKE2B a9751f147f070de2960fe03ce51b2fb28447acea7d0bfb2fb3c2224a07c8f43255494e6fd6924e40e6bc003f9e091462c0760920ccee4bb7bf6a948e14da269c SHA512 db099cde7121278f5a33818acc58c78beb3aac3d61b92262c28b6a980dcf135ac5b7b1e62f78f75aebba33c3c9f63340974372c56b1f718e1b3fc820f8914ae8
+EBUILD wtfis-0.9.1.ebuild 975 BLAKE2B ae7f266879f8b807e75fb3344d946ae2fe16d35b0e82801b818b5ba8180fc0fbcc627d3fcc745668cc2abc56a52f0781240bbaaa1e42d6055fe599f97321de9a SHA512 a9d29b63120685e4c70a9163a2a6be5c3d8e1d448876d8ec9c29f8a7a2ea33f2f3b1fa4fd0a4e8d69aea7df9b7dc5f5fa17a2dd18b5a21e376c8b71354f20b94
+EBUILD wtfis-9999.ebuild 975 BLAKE2B ae7f266879f8b807e75fb3344d946ae2fe16d35b0e82801b818b5ba8180fc0fbcc627d3fcc745668cc2abc56a52f0781240bbaaa1e42d6055fe599f97321de9a SHA512 a9d29b63120685e4c70a9163a2a6be5c3d8e1d448876d8ec9c29f8a7a2ea33f2f3b1fa4fd0a4e8d69aea7df9b7dc5f5fa17a2dd18b5a21e376c8b71354f20b94
 MISC metadata.xml 855 BLAKE2B 552b9998e0eada39d9a0f0e092c566e9a75c5ac2e2360df66d9b7334e663a9fb4a82be51f31623f31644e2863d78570405dc94e36769be7cbbcc3539cf49d920 SHA512 56593e8b58a019e4cdbf23946331c34f66fc72e318271916b33f3f63ccfb2d7a546dcbf05fcd0bd0bce9e5e0ce8f7b0cfd621b4b938c0eed135c34d025fdfc32
diff --git a/net-analyzer/wtfis/wtfis-0.8.0.ebuild b/net-analyzer/wtfis/wtfis-0.8.0.ebuild
index eb5e05b23963..08106d305363 100644
--- a/net-analyzer/wtfis/wtfis-0.8.0.ebuild
+++ b/net-analyzer/wtfis/wtfis-0.8.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1
 
 DESCRIPTION="Passive hostname, domain and IP lookup tool for non-robots"
diff --git a/net-analyzer/wtfis/wtfis-0.9.1.ebuild b/net-analyzer/wtfis/wtfis-0.9.1.ebuild
new file mode 100644
index 000000000000..5982358071db
--- /dev/null
+++ b/net-analyzer/wtfis/wtfis-0.9.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..12} )
+inherit distutils-r1
+
+DESCRIPTION="Passive hostname, domain and IP lookup tool for non-robots"
+HOMEPAGE="https://github.com/pirxthepilot/wtfis"
+
+if [[ ${PV} = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/pirxthepilot/wtfis.git"
+else
+	SRC_URI="https://github.com/pirxthepilot/wtfis/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64 ~loong ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/pydantic-2.7.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dotenv-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.31.0[${PYTHON_USEDEP}]
+	>=dev-python/rich-13.7.1[${PYTHON_USEDEP}]
+	>=net-analyzer/shodan-1.31.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/rich[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/net-analyzer/wtfis/wtfis-9999.ebuild b/net-analyzer/wtfis/wtfis-9999.ebuild
index 27c081820a3e..5982358071db 100644
--- a/net-analyzer/wtfis/wtfis-9999.ebuild
+++ b/net-analyzer/wtfis/wtfis-9999.ebuild
@@ -22,12 +22,11 @@ LICENSE="MIT"
 SLOT="0"
 
 RDEPEND="
-	>=dev-python/pydantic-2.0.3[${PYTHON_USEDEP}]
-	>=dev-python/python-dotenv-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-2.7.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dotenv-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.31.0[${PYTHON_USEDEP}]
-	>=dev-python/rich-13.4.2[${PYTHON_USEDEP}]
-	<dev-python/rich-13.5.0[${PYTHON_USEDEP}]
-	>=net-analyzer/shodan-1.29.1[${PYTHON_USEDEP}]
+	>=dev-python/rich-13.7.1[${PYTHON_USEDEP}]
+	>=net-analyzer/shodan-1.31.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index e508972fe746..6a66506dd875 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/dnsviz/Manifest b/net-dns/dnsviz/Manifest
index 524a89523322..28e7e9325f3b 100644
--- a/net-dns/dnsviz/Manifest
+++ b/net-dns/dnsviz/Manifest
@@ -1,5 +1,3 @@
 DIST dnsviz-0.10.0.gh.tar.gz 480916 BLAKE2B 51cdf40d91429447b01470f9356140ed53b488c6831bd06a8352493c0938d995c625024c2a976c2d7408a56085d15dcdbfe70486304a7d0c2168d93033939659 SHA512 0bc07ad6edc25986ca17d5e02bee6e120c2e3f01d3ee015a8ed8d8a6471f3e1b3176bc3194a0b9172cf789bac42548fb64f095fc94264bd8ea97a9b1ed484114
-DIST dnsviz-0.9.4.gh.tar.gz 477971 BLAKE2B 3c8bebcea89bc6e78247c45c4266f73be4f9f618bfaa48a47460a43deb4789fe71eaa77eb4ff59c2d8e863cdfdddaf5908279aad93ffd63fdbe16d0966aa943b SHA512 b88d0ddff6279078a5222b4250a404c39db6d896d57bba51c878c8b8d01582deda2fe67b5f6370d7a98389e09ad46bdf3903d77fee91c0291b14a9109f1739e3
-EBUILD dnsviz-0.10.0.ebuild 1489 BLAKE2B 794108a1bf826a2ec25715e09640b00e839e412fe300b75249458e441e7aede42c00aedbfe2cb30763831cbfda0a7eb1012d8cb1ad67d4fb3761c67f317586d4 SHA512 44313b7fb2a146d62be5cfe9f02621c7a61e155bb2eba984c368fa9d3d4ffd6319324bc0b89a6c14052e5e87081bb40650f6654ff140d34c4d6cbdda760e79a8
-EBUILD dnsviz-0.9.4-r1.ebuild 1315 BLAKE2B 7ea8e379b0308b0bc69ac9a0e4ddf6c7c9183e9500dac00297d987fc8776a93230ab3d1391cc84300b064e7e58d31aaa8517df91ff38bcb87949b47fc91aef70 SHA512 c9b7df3a15fda9f24d73dcda7d85bfb55047ef24efb3d9a74f21c3ddbf2843e1718a7fc9bf507b3cb59113f2e08dc7aa37dd9f87b12549cf2af6de00ec412c19
+EBUILD dnsviz-0.10.0.ebuild 1487 BLAKE2B b71b213747a5f769af49d760a5b332af6163cb71146651f0dedb9671d2ddb7ab13698dfc2d1fff97abfb8ecb61ef54667af4279e42a1f6defa172d3540bd83af SHA512 5403c9f299d4a58c267e1259cecb44b3b26928cf8b11eb37a3a16b9fc3d10cf1fe7b957f6065a49054574083f4651d9b51517bc46093c0e5003fd69b95ff7ffc
 MISC metadata.xml 526 BLAKE2B 92a80291c1decfcbca0f153f2512013e9356476115d2b768df4c322179237d210dcf1a1c32e7b2664157788c9e0f3a69ddf45ca7cb7d4ec865168054d6bd1ed2 SHA512 ea5853c78aa415926d72f665fcf408de1185dc0b5ee7b8e1c584b9e325aad5a9df10fb6269866501bc2ac54ed8520ae6ec7a0ff928d56a7f156ec5a6398ff1d8
diff --git a/net-dns/dnsviz/dnsviz-0.10.0.ebuild b/net-dns/dnsviz/dnsviz-0.10.0.ebuild
index 2638e94461f9..f36f4730d7b4 100644
--- a/net-dns/dnsviz/dnsviz-0.10.0.ebuild
+++ b/net-dns/dnsviz/dnsviz-0.10.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 optfeature
 
@@ -14,18 +14,15 @@ HOMEPAGE="
 	https://github.com/dnsviz/dnsviz/
 	https://pypi.org/project/dnsviz/
 "
-
 # 0.10.0 is untagged, see https://github.com/dnsviz/dnsviz/issues/122
 SRC_URI="
 	https://github.com/dnsviz/dnsviz/archive/86ceba56e8ed23df0ec091b8750025ac374f3916.tar.gz
 		-> ${P}.gh.tar.gz
 "
-
-SLOT="0"
-
 S="${WORKDIR}/${PN}-86ceba56e8ed23df0ec091b8750025ac374f3916"
 
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/net-dns/dnsviz/dnsviz-0.9.4-r1.ebuild b/net-dns/dnsviz/dnsviz-0.9.4-r1.ebuild
deleted file mode 100644
index 9b1dd27567af..000000000000
--- a/net-dns/dnsviz/dnsviz-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Tool suite for analysis and visualization of DNS and DNSSEC"
-HOMEPAGE="
-	https://dnsviz.net/
-	https://github.com/dnsviz/dnsviz/
-	https://pypi.org/project/dnsviz/
-"
-SRC_URI="
-	https://github.com/dnsviz/dnsviz/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/dnspython-1.13[${PYTHON_USEDEP}]
-	>=dev-python/m2crypto-0.37.0[${PYTHON_USEDEP}]
-	>=dev-python/pygraphviz-1.3.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	media-gfx/graphviz
-	test? (
-		${RDEPEND}
-		net-dns/bind
-	)
-"
-
-python_prepare_all() {
-	# Fix the ebuild to use correct FHS/Gentoo policy paths
-	sed -i \
-		-e "s|share/doc/dnsviz|share/doc/${PF}|g" \
-			"${S}"/setup.py \
-			|| die
-
-	# skip online tests
-	rm tests/*_online.py tests/dnsviz_probe_options.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	eunittest -s tests -p "*.py" || die
-}
-
-pkg_postinst() {
-	optfeature "Support for pre-deployment testing" net-dns/bind
-	optfeature "Support for DNSSEC signatures using GOST algorithm or digest" dev-libs/ghost-engine
-}
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index d26be7783b3e..2f3f57dba120 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/rtsp-conntrack/Manifest b/net-firewall/rtsp-conntrack/Manifest
index 7e8ed4f113bb..10f46d4c487f 100644
--- a/net-firewall/rtsp-conntrack/Manifest
+++ b/net-firewall/rtsp-conntrack/Manifest
@@ -1,4 +1,6 @@
+AUX rtsp-conntrack-5.3-strlcpy.patch 888 BLAKE2B 2b106270b7ab915624ddb2dc2677f382b7514665015d65359c7db2ddb99370d7a9a43ce90ab7c728bbdda39e060b8028d2dfede0feba150f80c7561b53d758e9 SHA512 704fc37e3f477819a63832298300ab085eeca53009c29296cd10a014196b218e4973d8cc5c64956e2af55112eded101e19870f381181f9378f73d3a515e93a41
 DIST rtsp-conntrack-5.3.tar.gz 12409 BLAKE2B 91bc82f404c3d5b32100684625f5fc9641d60df457c25b2bf93988bad7acd76fdc46e2e76d12dccf42eb61bd3f724752a974728a8b229bb59df6bec545e22151 SHA512 660cf212cb5802f0d9a02c45948d02729e686fe96e12d5e2294f5d9a588d872677d4f8ef39f4abac6ec3adb2ef5e1c884858e63275a84e1035d13c21537530ab
 EBUILD rtsp-conntrack-5.3-r1.ebuild 598 BLAKE2B c6fcfc39d717fc8f7750e931e401f88de295123e64912acd39cc9483ba6114f6cc6f27e3f374046abd5077e2322372a32e83ae7e0cd104c24f1b3c39ef14a94f SHA512 97e48aee8ee73d2e4270bbe8fb448f69c2c8982fc2502a0c8630707481e4cd2f63c10506e2a846be27a0f36263868535b7a1d2a5abe6b1b81c6af853a76299f0
+EBUILD rtsp-conntrack-5.3-r2.ebuild 648 BLAKE2B 163761ab81a4f75fa9f5a04a2436dddb97cdd16fbcd8415efb104462cba1b699ac6f58f0067fcffbd4171aeec26fb590f3cccb56d919dbea71e4066418a018e2 SHA512 6733fc0f9587572faf190ab038a5467d8c1967e7813f9fe5eff5018ab4e7520ddd2549015ed738c4777145fb96974c3195da507ff32f05949fe4833ff702d1d3
 EBUILD rtsp-conntrack-5.3.ebuild 713 BLAKE2B 8559fc61f630373fe571805219ac94de0de02b6e9061b52f508f6e986da3a0c8b9c1a9c4bf688d4f5e2ad373825e72ccabeb99676afa97b66e868122694674f9 SHA512 edab69d7b9bf2cd6936831f12a6d2582a64b088a24573955eac978c6e255904570de16a052c3bab9f76df06fa68e83269060c5de8ec52c1e41ad1fd2f048885d
 MISC metadata.xml 253 BLAKE2B 6c0ff48fb0bc43e945ed68a2f4a5f067ecef5c84a32c013616037dd8de51b7ce80bbe6560800bb16c4c24e0318a592bbf943c4182b826d694780b46e0d8dd95e SHA512 8487052b487f4d0aea42dcddcbb32e1c55ed9da79074c12971b9f31f84acc3df9d67735e247a55057312840ffc7e1ea1fa54a5fd5bb1638ca20924cb04d60919
diff --git a/net-firewall/rtsp-conntrack/files/rtsp-conntrack-5.3-strlcpy.patch b/net-firewall/rtsp-conntrack/files/rtsp-conntrack-5.3-strlcpy.patch
new file mode 100644
index 000000000000..4051421a0f84
--- /dev/null
+++ b/net-firewall/rtsp-conntrack/files/rtsp-conntrack-5.3-strlcpy.patch
@@ -0,0 +1,29 @@
+https://patch-diff.githubusercontent.com/raw/maru-sama/rtsp-linux/pull/12.patch
+From: Brahmajit Das <brahmajit.xyz@gmail.com>
+Date: Sun, 28 Apr 2024 01:48:03 +0530
+Subject: [PATCH 1/1] Fix build with Linux 6.8
+
+With commit
+https://github.com/torvalds/linux/commit/57f22c8dab6b266ae36b89b073a4a33dea71e762
+strlcpy has been removed in favor of strscpy. Thus giving us build error
+such as nf_conntrack_rtsp.c: error: implicit declaration of function
+strlcpy.
+
+First reported on Gentoo Linux, please reffer:
+https://bugs.gentoo.org/928590
+
+Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
+--- a/nf_conntrack_rtsp.c
++++ b/nf_conntrack_rtsp.c
+@@ -550,7 +550,7 @@ init(void)
+ 		}
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
+-		strlcpy(hlpr->name, tmpname, sizeof(hlpr->name));
++		strscpy(hlpr->name, tmpname, sizeof(hlpr->name));
+ #else
+ 		hlpr->name = tmpname;
+ #endif
+-- 
+2.44.0
+
diff --git a/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r2.ebuild b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r2.ebuild
new file mode 100644
index 000000000000..b53a2b6b90ce
--- /dev/null
+++ b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-mod-r1
+
+DESCRIPTION="RTSP conntrack module for Netfilter"
+HOMEPAGE="https://mike.it-loops.com/rtsp"
+SRC_URI="https://github.com/maru-sama/rtsp-linux/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/rtsp-linux-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CONFIG_CHECK="NF_CONNTRACK"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-strlcpy.patch
+)
+
+src_compile() {
+	local modlist=(
+		nf_conntrack_rtsp=net/netfilter
+		nf_nat_rtsp=net/ipv4/netfilter
+	)
+	local modargs=( KERNELDIR="${KV_OUT_DIR}" )
+
+	linux-mod-r1_src_compile
+}
diff --git a/net-firewall/ufw/Manifest b/net-firewall/ufw/Manifest
index 67904eec6ee9..ac962b4bbaf3 100644
--- a/net-firewall/ufw/Manifest
+++ b/net-firewall/ufw/Manifest
@@ -9,5 +9,5 @@ AUX ufw-2.initd 2611 BLAKE2B b6a75e023ad0efeeef168e7e074c716ec66f40d3bde9f99cf1a
 AUX ufw.confd 219 BLAKE2B 8ed5dec5dd9acc84715918240e31398268ff36f73bb2cfc10e64e0593e59cc7f5b988f8545ddea37f19d9b40e870d743bea66edd7da1e3d2753b6edda8afa352 SHA512 a010532c97b9cf83f1fb5fa707228e0542a8b109c76e5942aaf2d6552c63e033d32e39e5a6ac87cb9e2ed4c3fdbc5d03c75127e6378665e592b143bc1eda52c7
 AUX ufw.service 329 BLAKE2B e817fc85b3bdb21b47a3089c6f2204292a019eaeae510832530f0e09f8784a312dd636fa3cf90610bb3159d52b4bdaadf803699ac4bff31576b566a3e977b2d2 SHA512 a365e704ca958c83c86f8a6b1623ce3f9ad72dcfb0cfc7758bfc787e0877f897ccf8b200db83df17130ca5dcc54f938178b8cabfe3ee0c0896c814ee7d2439c7
 DIST ufw-0.36.1.tar.gz 583123 BLAKE2B 16e1ee67493d5db10a04667b646a019aa3aeb06345d0facc334fb07eeff4d4f6674a4699b2bd7bd6ed29de1c05c4e14812e9e8ec55c4bfb8579b8e3e2e577f6a SHA512 77d01fef661083eac041be6d6eabffb1d8aedb215f73e44e18a9a63a48da96414b3c0166e3ffd9402c22c72a6de5d774ba14b15368b02997aae8e08d1c5dd4c0
-EBUILD ufw-0.36.1.ebuild 6135 BLAKE2B 161fe91a1dd61e998e6f7d7025fbf0a711130dbac37047c14a1b52a5c2162667540751f0af4fd984b7d8a837d0dd968a00e751fd03ac7a29d9bb1760b60673b3 SHA512 821ce06de3f8e289f79a5bb487be03dcde98a74d73c4927ae549418ef90f8735610b34a4a44d65e879ce463d6b97ef844811b0b6a2bda4ebd0bdd6d95d9cc44c
+EBUILD ufw-0.36.1.ebuild 6136 BLAKE2B de9c978991593488f9d8557b70501f9c14e61e726eb00514c00878502d4f12b906148b73d552a56176415094c3372c4950c3d0428765754356bb6d99d08256c1 SHA512 288721f0bd9fc07f549357f70dc110267c1b763ed84e60791485cd29f3287b864e1528aa0eb3fa67d923e1b90da276321da1d3757496919f70c431e5fb29719b
 MISC metadata.xml 686 BLAKE2B 6d415e2295cf7facf8908aab2fbd7d4150d24595c9eb30ccf7f105ff2263cd7dc6c393dc8ad8303b264d76be37bb11da3ce4d4b666c0648e974b7585e9e7e452 SHA512 c1dee02a7458095069243337abb01a66dc132de15a51114cc1b39778f02b3a05d28a869cfa8cef55cf8701bb7f872232b63d432c1c5e45d71d90fa6099f74dd5
diff --git a/net-firewall/ufw/ufw-0.36.1.ebuild b/net-firewall/ufw/ufw-0.36.1.ebuild
index 922d7aa76f9d..29c289c00534 100644
--- a/net-firewall/ufw/ufw-0.36.1.ebuild
+++ b/net-firewall/ufw/ufw-0.36.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_IN_SOURCE_BUILD=1
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index c7c5b198cee4..5be5393f6744 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/btfs/Manifest b/net-fs/btfs/Manifest
index f4653080fb94..33ebb086a501 100644
--- a/net-fs/btfs/Manifest
+++ b/net-fs/btfs/Manifest
@@ -1,3 +1,3 @@
 DIST btfs-2.24.tar.gz 24328 BLAKE2B d143d25fd78706e60e7ad46053371140bc73a15e313ad35258aedc350614efe72c3662418da2ca61eb8c36a6f153db3477cdc0b5f290afd0eb361739b9d33f3d SHA512 33339d9eefe6836c8c96c4ea0fb6ee99150df5500f4d1dce107c20df72e0d2959152fca0901676cec1eebf1de39a69dc46ea96442aecd234c9fb4e7618337b0c
-EBUILD btfs-2.24.ebuild 832 BLAKE2B 6eed3a5c8ba9b2961fb31d4ad1c526515745362d9020d27e93c21adc8a0dfd6cf4f5aa8f671174f76555e3d2607afa91e8f4f6ef7c468506c033b083bf68cca2 SHA512 7bf99e1b46e81aba56f3714f7649c132aeb98a5b532e9be2be1c9676d17377c6d68a88ad3206343fea0fa7b5e67637e05ac2a093bf2a72ee1314adf6204e5d37
+EBUILD btfs-2.24.ebuild 839 BLAKE2B fc97a64b41af76393d6831fee9cd22b4b890fc919bea08d891f94a1ba4afb02a653704338dde6d38882d58c5826fd7dc4b089f05ce2113069f0ae5a4d9d618ce SHA512 3aab89e0edb664b032f385130e8bb0a105628fdd55644fa09abe77ab0fc7dd9364d6cb31063653fd9fc01d56cfad29a361c17bcfed9393d0572d86d67ba73a0b
 MISC metadata.xml 244 BLAKE2B 9f54ce24ff94456bd875b5386abf16c27313f10ba739afc1fc817f65fbf530a6562c2fc32caec6f1a976abab2715b98b674e167f23189653846fbb1f7352af5a SHA512 d3ddeeb221e464dfeb68c3ad361277c3711b9c1639246423454393c3158a6aae80757333d97698e938609fb21ef51f15fe1e8ecc6ebe7355c7a418df44f765c1
diff --git a/net-fs/btfs/btfs-2.24.ebuild b/net-fs/btfs/btfs-2.24.ebuild
index 38bd3d6bbeba..0a84c213ddc8 100644
--- a/net-fs/btfs/btfs-2.24.ebuild
+++ b/net-fs/btfs/btfs-2.24.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit autotools python-r1
 
 DESCRIPTION="a bittorrent filesystem based on FUSE"
@@ -15,12 +15,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND=">=sys-fs/fuse-2.8.0:0
+DEPEND="
+	>=sys-fs/fuse-2.8.0:0
 	>=net-misc/curl-7.22.0
 	dev-libs/boost:=
-	>=net-libs/libtorrent-rasterbar-0.16.0:="
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}"
+	>=net-libs/libtorrent-rasterbar-0.16.0:=
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
 BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 9935a549a5da..411e070cf5d6 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index 294955fde230..18448924fac4 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -3,5 +3,5 @@ AUX ncftp-3.2.7-fix-gcc14.patch 580 BLAKE2B 4db070ba0c247f385e5feda778eb87e0b486
 AUX ncftp-3.2.7-implicit-function-declarations.patch 2456 BLAKE2B 860a88090eae634036ac95c7b1b8530b27c7fbfc67aa70bf4b68b8ba07d9ec770e1f0981a3633c5a79d4d6e03b26a84c3accba445553580ba0dd9ffc2c76d34f SHA512 64fd1b531666cedcca533afa54d0acce163b15315dad9d16715ec17dd2f0696e976bcd5a1e8df7b63783aa9517f9c5bd5680dc0a09bafab97a87cc88b3bedd99
 DIST ncftp-3.2.7-src.tar.xz 422480 BLAKE2B d075be273d534b11385b8ee5839835102d9f69a6cc8fc8f661b85be32c1cad3b1c4bab2c99b8c47bc3c40d18275524b88da7d8e70985dbb0cfb7ff5ea07b70f3 SHA512 b755385a57ac2487625c15985f091d9e1b71073b2593faffe1f2bbba34e691cfff9ffd8448b048f223ea08428e890f30c49a903e4f938393e3c0e4ae03ddab37
 EBUILD ncftp-3.2.7-r1.ebuild 1165 BLAKE2B 9a5949135eab886cf966c6bffde6bf544c57b3ac41a9250be26e20d8ad9b30a4d35da94e16e28fb7755c68a097ceb0074eabc3ef2d329f2829e5082f5c65d9ca SHA512 601aedc87b0cc0f6e87fbe562d363cc8752b22d50314bde732851027b916184e840d213aeb3de7ad0a9a1624d73e91cfa43fd4a8d8cbfef75fd448b26f92b772
-EBUILD ncftp-3.2.7-r2.ebuild 1131 BLAKE2B 35d64afb588cc1c4423ef81944f5024f36d2ae2fd8695bb4c13a732e26280e2717d29f4cb99715da3c55c7063e2abd6b596f27ba572b686c8cdd84055572cd67 SHA512 e395402d1840ebb74db04253e5722b29bc53103f18bcc236628bede969bbe24238597278ba2c38527b71f433b3046599cc7755f2de217d00dd79fa19a7f414e4
+EBUILD ncftp-3.2.7-r2.ebuild 1126 BLAKE2B 52e677fcd83ce0c171e38323184fdce92ac09c014b69f3a964260cd0039fa704728733c7ab9607b2ca1a7cfb662dbe2bd387d13e84169f4e2a4242db421df6c1 SHA512 c207763155b172a47de557c7830fddf5df96cfed3e6001584a533c1ede5d5fa1fd6dba527994ab27dc61bb288f2ccb3ce87ead03b8207c1b2e990f618ad6a411
 MISC metadata.xml 747 BLAKE2B eb28ac0c7249544d1519dc534092dc0f8575c3f68cd24d9dc1654e0d9ffaabf8359fd64ee7ec321878b31e4e65a1c3767528a9f91301809e07f187867f52f09a SHA512 2d672c6901cf721df89f79f420f61ad709d3570fa0d762cae4becbb7f2426abf7a2812d9899fdee75daab20aab80fa80f796295dd3bbae588fe4eac93204b1f7
diff --git a/net-ftp/ncftp/ncftp-3.2.7-r2.ebuild b/net-ftp/ncftp/ncftp-3.2.7-r2.ebuild
index 48fa3dac535e..a0963db220d5 100644
--- a/net-ftp/ncftp/ncftp-3.2.7-r2.ebuild
+++ b/net-ftp/ncftp/ncftp-3.2.7-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.ncftp.com/public_ftp/${PN}/${P}-src.tar.xz"
 
 LICENSE="Clarified-Artistic"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos"
 IUSE="pch"
 
 DEPEND="
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 05ce3f8d23c5..65253e7874dc 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index d760000fff64..0c3c4c2cec28 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -8,6 +8,6 @@ AUX serf-1.3.9-python3.patch 965 BLAKE2B 0f7444b19ec1f2b32c165ddf08d96113cb22ca3
 AUX serf-1.3.9-python3_byte.patch 1079 BLAKE2B 7e8c328d101c3642cc82be9f92f26e9af49ada5df040da088e35869efddeaaf043cba06fe6c626380e9a68b10f1f5a61e393405d039bb7b59d9d00d00d95e066 SHA512 b02b3eb8fa27a7a133ebe6bd958f378bcc5daf9a1871e5a4015ec8fb292736cf65ba7776ef3297ceb3b4fb767ae4f22cc44e0e3b4a222887c73107e3c03e4533
 DIST serf-1.3.10.tar.bz2 147744 BLAKE2B fed9ef4d5b16a5f1276a4a6f72ab938db18d4bd51c2a58311d2918f52f891bdb636f947cdc612b12a8978f75d27715b7695f21730d1b8a0545746281535369fc SHA512 19165274d35c694935cda33f99ef92a7663a5d9c540fb7fd6792aa0efe39941b2fa87ff8b61afd060c6676baec634fd33dc2e9d34ecbee45ed99dfaed077802c
 DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d
-EBUILD serf-1.3.10.ebuild 1849 BLAKE2B 8a9b46a78f7d418833002561e66ad5536fc18fedf52077238416a5070d54c50f0e95c47de57ff390a65710b5a01466bda02b2e01e692be5c184dcb9fe4a022ea SHA512 66f1376c456175ea8d96f74283eda217f830585309d327ef1ff8a56ed67c620a673828299f6043849559d3bfd0a0d6d4e62ef0a49b04dcff65082ace24876887
+EBUILD serf-1.3.10.ebuild 1848 BLAKE2B e9acc81b3be24e90490c3871684760e1c9e60c87e7e84b9a3da5ebf7c3ead21f1c148ba68ba4c24c62ccf195d1d5b0c5226b69ca5994f3d41acf8cdd0fd94bdc SHA512 3b9f04f8ed6a4de261f96f5dfc0b5edead7f7aa1418cc87a8293a219aacf287d8683ffca40db2a3ccdb42dd43d4963225700f3d90ad4d9e0427f87571d82a818
 EBUILD serf-1.3.9-r4.ebuild 2187 BLAKE2B 239e0c488972e1535cd32bb8dae10f25eaad37e49125cb441f38caacfad7ffbebff0e5cbc9705238f9a612a699fb6b047a8d036d86113164f7e6007a306e76d9 SHA512 5e5a57e7f462f8353bafdd4bb7c15e9d57a43506ffcad6bd5af0fbf6fab04b4ea264f8cbd2521af776558843120d7081577b1bf74bad11aba5967a610c84876f
 MISC metadata.xml 242 BLAKE2B 9323724392947eec7347e9052aadab6d31da88b1fe94720fdd3993f37aeb74d00e43a34ec26642c79b0d471bd0146aaaf3489a3ab341445c6ddfcf305c581989 SHA512 c20cc4c38ff85c11dafe9981b45f20d2343d817cdfbb0c1e8cb77b0964e5d2b74762dfb8384c9fb47e8f0427b1f3f3e38a3a81f81c76ca30ade4a0994db14cea
diff --git a/net-libs/serf/serf-1.3.10.ebuild b/net-libs/serf/serf-1.3.10.ebuild
index ee5a62b77c4b..c7e7d9ad5e07 100644
--- a/net-libs/serf/serf-1.3.10.ebuild
+++ b/net-libs/serf/serf-1.3.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="kerberos"
 # Many test failures.
 RESTRICT="test"
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 33fc6436a531..3867bbbb795d 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/automx2/Manifest b/net-mail/automx2/Manifest
index f86fed299346..79aa69e145a7 100644
--- a/net-mail/automx2/Manifest
+++ b/net-mail/automx2/Manifest
@@ -2,5 +2,6 @@ AUX conf 721 BLAKE2B 976a2936da5e9eef71d9d08f7f12c51151549c23c27918de28da355e87e
 AUX confd 213 BLAKE2B 2573f19bdc9022357f2f92ff17d84a1e77078c6c05a46a09b6e57ab7132d1f1078fb5003640f83213f746f94e3ab5b482b01d92feb94684665eb4e796a642841 SHA512 6c04de3ef26fd132269532c7bdca3263e95cebf5078ddd57e8ebff62229fabfb64b8ad4d988dfe99c9611c5d1081b4d3862f09d11c08aa1aabc1d5bc7c987439
 AUX init-r1 608 BLAKE2B 7d2b93482c62fe0219c7194279ee495274e4b0b8319ccf2d24e7816abe7eb23452bc21c01305283deeb8224c3668641b1bd5a7f3fbf8fe783a28e58268511ace SHA512 4a1ed2c45e1414734b8e5cbb731377da2087bd4f1a1075b4acb81b5057a65c0557e9e1a05cdf6856da35067a589d9c56fcf13156e8872facfc8f161bb3cade0f
 DIST automx2-2022.1.tar.gz 182519 BLAKE2B baf2ecc801f6f024eb6a6fe2610d6cb7c3dd0726cfa877fdea76d94ebf16b9393addc5be8844f3017fd664b73adc74f2cd898736bbcad1fa0b2b3c1022cb638a SHA512 3d6fb9cf01cff641c78851560d72e3d80f9011cca4cd438cd49e999feef3f290bbd9495655f41319eb5456beac09bb8862dc327b521254266e0d53aa17b0bbd3
+EBUILD automx2-2022.1-r1.ebuild 1141 BLAKE2B 4b32b662798301253ac5fb2ace1607072ce54d4aa8efb81ecfb8b3b04bc40809c0a35ee9659407c2372cdd1d657bd96f93ebe1ce2114614e67c522f5e2619c7f SHA512 523417fccc10f0bb768a1f02a98c380885cba7b5bd1c257716378e019520fde36d44964602826d233b582e1ce218290be6e85ccb400acfa27143da87e46e166f
 EBUILD automx2-2022.1.ebuild 1123 BLAKE2B 94b1f59b450dd22148a2e6f8cdf397583fb13bfb1ae10de2a7c7adf08c56cdcc74920167c6ddcccd5bfbfc1e470bb43e697a6c62f5530136b192e47cc48c36ba SHA512 6ed7e6e6c28afc3f58310b3a4e3aae99fe509deb74641cca09c6f4de7848879ec1016d7dfbbc8d250a75602a12a4ed764f13e6748dbc3554f5f39e9d3375b988
-MISC metadata.xml 690 BLAKE2B 93cac84cef0aafc4d7b5a12f420b65454c02071ee7ec3c1d15b6429fcc841bcccc94e6652da3a8f82ab7feeb3e875cdf3566de5561e10de6bdf09472aa61c80f SHA512 e332e3e64a8bb7898b79a972cbd8d8758933e33986e96df2619f65ce9e49022e8c756a1b248c21738ef7942df5154a1ce54b934021c10661a295749dfed129cd
+MISC metadata.xml 662 BLAKE2B 0751c66d39b941b5fe181be51254b0d22192af56bdf016ac72e5b4f8ab0fe579424ee587d23e66d29a5f87726ac0e1fa47c9b0b71de5d9d1bed7b834b16d5bee SHA512 b50f93ec5909b8f12992b79bdf173199bf0aab37df9420111cc487ccd9e3aab92e78aa4742fbb90043648b95e1c29d3aece003fd39f20314ebc7d11c70b1dd0a
diff --git a/net-mail/automx2/automx2-2022.1-r1.ebuild b/net-mail/automx2/automx2-2022.1-r1.ebuild
new file mode 100644
index 000000000000..05f26b65305a
--- /dev/null
+++ b/net-mail/automx2/automx2-2022.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11,12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Email client autoconfiguration service"
+HOMEPAGE="https://rseichter.github.io/automx2/"
+SRC_URI="https://github.com/rseichter/automx2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="acct-user/automx2
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-migrate[${PYTHON_USEDEP}]
+	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/ldap3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	sed -i -e "/('scripts'/d" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x AUTOMX2_CONF="tests/unittest.conf"
+	eunittest tests/
+}
+
+python_install_all() {
+	local DOCS=( "${S}"/docs/*.adoc "${S}"/contrib/*sample.conf )
+	local HTML_DOCS=( "${S}"/docs/*.{html,svg} )
+	newconfd "${FILESDIR}/confd" "${PN}"
+	newinitd "${FILESDIR}/init-r1" "${PN}"
+	insinto /etc
+	newins "${FILESDIR}/conf" "${PN}.conf"
+	distutils-r1_python_install_all
+}
diff --git a/net-mail/automx2/metadata.xml b/net-mail/automx2/metadata.xml
index 54630a522f9b..01690ef05208 100644
--- a/net-mail/automx2/metadata.xml
+++ b/net-mail/automx2/metadata.xml
@@ -10,7 +10,7 @@
 		(autoconfig) in one tool.
 	</longdescription>
 	<upstream>
-		<doc>https://github.com/rseichter/automx2/blob/master/doc/automx2.pdf</doc>
+		<doc>https://rseichter.github.io/automx2/</doc>
 		<maintainer>
 			<email>automx2@seichter.de</email>
 			<name>Ralph Seichter</name>
diff --git a/net-mail/b4/Manifest b/net-mail/b4/Manifest
index fd6713288a06..164f69a97db0 100644
--- a/net-mail/b4/Manifest
+++ b/net-mail/b4/Manifest
@@ -1,5 +1,3 @@
-DIST b4-0.12.1.tar.gz 233691 BLAKE2B d10dc969d16722083ab0b79b7a2a26df44dbe2d5a8a804a0339903ff30f2a25a915e7755d4c5a9855d9b3abd8fbd6a3ff3b8034a6679491835446fdd24ee1b0f SHA512 6a7cacfdda6b4c8c3b87554c1b8fc7b2e797ea0b44476943aa6b75a901dc57cc17fab2a584d63c3724967ee8e6d9b3070dea94a6e4df43547a521ba741366032
 DIST b4-0.13.0.tar.gz 243729 BLAKE2B b004209ab289026e5013003355873feeef0c275dbd638a9ca725adc0bb594ea5091094b2fb30737fad9ef60a742809699c9c9a0e0015e9ebf58ee3d1c90fc989 SHA512 692d01970019d3fc604187882004d97f4286a22d87e5778d7830ec247757534a9d951fa8edfe9e04e8f14107c77b08b6c15024f37bd99f4abf3aa0d823df21e5
-EBUILD b4-0.12.1.ebuild 730 BLAKE2B c10a4cd3d798a386811fd25fc362abf5756e0ba56978ec918429232c4c606253d3c5cb88f6324d7e471c4b508c1a569d6b1379ce09f246ec8e0099bb5734261c SHA512 b0a6a01e59aaef24069dfa8640c3e128f28edb4f2b8c96a5a08b72d746de7504a3dd88d8dc151869cd390e04f4def43aa58d01eaec2721012cc1ed02f4e125f0
-EBUILD b4-0.13.0.ebuild 730 BLAKE2B 923fe67c092b592c15309c4ccbd26df77f861856c5500218afcd0e090eb582e0778ca85f4c3e0ccfc8ade751b395594837e1f393c93227d8bb805133f4418915 SHA512 d0be80a6fd6546dc9eac5a2b0b3859c02e31e7b586e52393ac4eaae2ecaa05c96413b50664bf89a78cf598e8247740ee7c1b44526ee8d08fb5e274a6a64f0ef9
+EBUILD b4-0.13.0.ebuild 731 BLAKE2B d057a3a259e3afc46f560ceaae269e0951e395c503d22cbf8e9dd37b572eaf798efb83614b266caffcde4df5064926c91c19d7cb7ee57bd2872113de32d77e55 SHA512 feea14aa0b3b3224eecb8d42bd8421009e68a493249cacade6de802397a33ec43f18d1c62bb92ffe51f3c5ecd416e0c34b91058e362878905fad4702d9321cc2
 MISC metadata.xml 340 BLAKE2B 068a46f0803f27be10a3f0e4e4112a2acf447bfc7741b4e2bcc4f534b6233798453854a102682f3d279804cce4c18dd65b83878d7551c5e14c947d35bb671f0e SHA512 439be60ffa5430279d825268d7865faeef3054a5d46b7085d6660eebc5a8c829dd24b35256cc2f26739fc749749efad736479988e642fe160d3a275f46d8a444
diff --git a/net-mail/b4/b4-0.12.1.ebuild b/net-mail/b4/b4-0.12.1.ebuild
deleted file mode 100644
index db383dc61a8b..000000000000
--- a/net-mail/b4/b4-0.12.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
-
-DESCRIPTION="Utility for fetching patchsets from public-inbox"
-HOMEPAGE="https://pypi.org/project/b4/"
-# pypi lacks tests
-SRC_URI="https://git.kernel.org/pub/scm/utils/b4/b4.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/dkimpy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-2.1[${PYTHON_USEDEP}]
-	>=dev-python/patatt-0.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.24[${PYTHON_USEDEP}]
-	>=dev-vcs/git-filter-repo-2.30[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/net-mail/b4/b4-0.13.0.ebuild b/net-mail/b4/b4-0.13.0.ebuild
index 21f935f044e6..50d792d2e86f 100644
--- a/net-mail/b4/b4-0.13.0.ebuild
+++ b/net-mail/b4/b4-0.13.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1
 
 DESCRIPTION="Utility for fetching patchsets from public-inbox"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 8c2b47d2144f..4c8efa4758cf 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index 69e1ecd28223..903ccf12fe18 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -1,5 +1,7 @@
 DIST gallery-dl-1.26.9-5227bb6.patch 3415 BLAKE2B 864d6877ba9f6ee6449465ebce9b6648325c176f2ae4062c27e7059852b05983a99f203aabc9e3c361214b14d489bdb450920879171385474ddec50d83f1b937 SHA512 6931eeb00f6fcd6b9005672aa23ed2b0270846758a762a8a86ef51ca860bea2563673b02881abd5a1a224b7518a89e66de46da5cc0a7994d58078886aa090c64
 DIST gallery-dl-1.26.9.gh.tar.gz 670467 BLAKE2B 849d20ff6fd802915b3bc4f6bb11d638d1e8f24f1dbdcfd5946461798044d59bf9243faa370cdddcdffe40a24d39d44a43abc79b4c8e89e7c60b40e5e204603a SHA512 54c2a86a67c53b7d5c62e6c23c549fd89503386549dc9d2f9c7de058b52ecb60b5089555e97dd0b63d33686e1bd08a3be940152715a6d26647e6949e641df9cb
+DIST gallery-dl-1.27.0.gh.tar.gz 682957 BLAKE2B 7a376c22d970533ac3668d9893fed74551100463d7d24c93940971238c568b70c644cd78df1edb506c9a5ef0d7154d3566f61fb9bcc047c47f0868900936b5d5 SHA512 129df83eafecf3ce680318ff9360fd99feb2136e236f377eb7921406e3f4ea93bb2479265dcec18cae77b83f013223612c0cae7ffd7ac2e122e0395de7beb92a
 EBUILD gallery-dl-1.26.9.ebuild 1297 BLAKE2B 4887d8139f44daa0a8ce4ad56ac50107165e2ca4f9f50e71076531770ad8d17cb67c6485581cca5f03f16476f9042523aed9cd1c6a59a27a38215a53d45f2d16 SHA512 d2304f95acc119c0229e104d5343de465d60246af78a4c73c15da25ad8fd57cbaba540d9bc4a4ec70502304b2ff138475712a005757047864396237fa38e3fc5
-EBUILD gallery-dl-9999.ebuild 1142 BLAKE2B 6a0c03091500dd90754cc580a693c3ee9544d7ea1188fa56f7e5c08c2b678e540aa7a23c8b859921518c722a135a02328144d52f5bd485f07b3a0f9076e5edc0 SHA512 119516d297a7abceb2d9fde4bf9c9edf1fff83bcac856efc67e8b35c6b4b58b3080bb50f2a59a90ba858bf30a9c42f391be67187e4e363f1cdeee284b2043cba
+EBUILD gallery-dl-1.27.0.ebuild 1142 BLAKE2B e0b7b410c71ec272bf5c02ba6489c84f7bc9251c64e35774f599a130b356ce2c7bd2e51c345defa812664d0c7e2381ebed78edb5b087c741ef7d42fcc11afa58 SHA512 357e03c77c606d5c98b98b1a97226180c752efe086800c95c9e5d89e442985c8875add96714443960005b969ddab640ef84ef6383cf169e46f1940f418ee0ee4
+EBUILD gallery-dl-9999.ebuild 1142 BLAKE2B e0b7b410c71ec272bf5c02ba6489c84f7bc9251c64e35774f599a130b356ce2c7bd2e51c345defa812664d0c7e2381ebed78edb5b087c741ef7d42fcc11afa58 SHA512 357e03c77c606d5c98b98b1a97226180c752efe086800c95c9e5d89e442985c8875add96714443960005b969ddab640ef84ef6383cf169e46f1940f418ee0ee4
 MISC metadata.xml 747 BLAKE2B bb63a74ca71891f1e937e6bd41b4cef50f1e1d459ab389f83f881cbfcc5c39bf5c4b8e999ea6cab7406a97f3dca9644380eaf1930d811746c5b893b948085ecd SHA512 302b9f3cde6c404de62347415c1f02d6884a9327c88871ea67b986ac7eaadac6b79018d919f5e6a2d8dde5dfd9e12d6c7c4702120fb08bfbfa291df4d1baecae
diff --git a/net-misc/gallery-dl/gallery-dl-1.27.0.ebuild b/net-misc/gallery-dl/gallery-dl-1.27.0.ebuild
new file mode 100644
index 000000000000..fea34fbde450
--- /dev/null
+++ b/net-misc/gallery-dl/gallery-dl-1.27.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="sqlite,ssl,xml(+)"
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Download image galleries and collections from several image hosting sites"
+HOMEPAGE="https://github.com/mikf/gallery-dl/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
+else
+	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/requests-2.11.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Tests against real servers, some tests always fail and some are subject to change.
+	rm test/test_results.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_compile_all() {
+	emake PYTHON="${EPYTHON}" data/completion/{,_}gallery-dl man
+}
+
+pkg_postinst() {
+	optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
+	optfeature "video downloads" net-misc/yt-dlp
+}
diff --git a/net-misc/gallery-dl/gallery-dl-9999.ebuild b/net-misc/gallery-dl/gallery-dl-9999.ebuild
index 1e6696f28666..fea34fbde450 100644
--- a/net-misc/gallery-dl/gallery-dl-9999.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="sqlite,ssl,xml(+)"
 
 inherit distutils-r1 optfeature
diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest
index 3b303ebcbdf9..0d1652292a08 100644
--- a/net-misc/s3cmd/Manifest
+++ b/net-misc/s3cmd/Manifest
@@ -3,5 +3,5 @@ DIST s3cmd-2.3.0.tar.gz 136754 BLAKE2B 61feff68d008536d4d31009f4ad18da37ccd0cdab
 DIST s3cmd-2.4.0.tar.gz 144976 BLAKE2B d854281a029b9865dc40d6bebd0994840a201ad573dfc628916daec00a6b38022f3f3c80aa745870c0b594443da747b1967d24976701e4d97167cfc087ae6dd8 SHA512 78a7fb193ef94759e6b59c8bccc2e736f4195f7de781f6a5d11a5685a3cf93ca9ef946bdefbfe0b0dafd0ea0612c8944283c3177f280d14edfca6553e62e0b49
 EBUILD s3cmd-2.2.0.ebuild 687 BLAKE2B 0ac58660ed0b156a6ef1ea5e6b34c2df519e36464c8dc43cc38a0cafbfa92248739979347c23ef38232e7365efe216191330f53c8e110801b487078be4f9d6e3 SHA512 0d9e1d60f80c521b9c933dbe51a72ef8a5d34e39c4127753b60629da6262473ea62bd7ef8849c12e474a8ef91cbc23b80f5bf9962cfa0587a14f1f5e294e25be
 EBUILD s3cmd-2.3.0.ebuild 700 BLAKE2B 901fb46db5d4834c90ba1e13fda5bf44cab9ecf5f5f5516aecc3c5ee5d6c880104942336c25e6308be2cc8c67c3381602c4efa53574fe12d7adb4f2125325eec SHA512 b90e6ee33e140e7ce05709bbd3a117b7a9c1b611d28a4379613882dbfd3a48faf74ca8ce24d88812c5ce9c44f0bb41eb810561673b7fe1535bbac3328a05418c
-EBUILD s3cmd-2.4.0.ebuild 734 BLAKE2B 3c929c8bd9e0670e59a0e24d7c616fe05fb52968862d85221a9189f5e3899ef874ef10f7ac28893ef3cc05ff4e6e688ce9d8b0250dea39392a19bd802b8e669e SHA512 0ecd1c670cdeb8569f00615c94fd2eaad9b2b94872e42262aa9086f40b966764f6136420db01c3aa81b9a23c510818ec69b1e9216783a144c5c80ec473c9288a
+EBUILD s3cmd-2.4.0.ebuild 734 BLAKE2B 315cd4848fbc812bb4484a22b78ab3eacb7a69edd2b69dcd8237555dfccce2fea825e2cdcc2628a6550237956da11268b4788b3438fe6092304730194e5f0b50 SHA512 62418e219ced5bd5ef6536bc17d4950adece32998ef8bfe5a1fed49278fcbce98f69f47c4e7395fd88166940e91cabd7682e8b1039ac0e07d33e1c310b239fb6
 MISC metadata.xml 795 BLAKE2B f1d85ae68ca459fbf61bc0cfb20da9e3d5380f33f8ebbac3335ed7432e50a44612238331ceb725c6e6ec116a19a6cf6d41bfc4895f9a892e698dc2ccad185d51 SHA512 01531459d573097f668c7c584732f17bdff1dde9d49b2e9c424134e346f0b430957a64bfb4075ef41b08ca1f86d5b6a6b5285de81f9f1f9d3d52bb081ded06eb
diff --git a/net-misc/s3cmd/s3cmd-2.4.0.ebuild b/net-misc/s3cmd/s3cmd-2.4.0.ebuild
index 4dcbaecc0089..a3e56368e7f9 100644
--- a/net-misc/s3cmd/s3cmd-2.4.0.ebuild
+++ b/net-misc/s3cmd/s3cmd-2.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="xml(+)"
 DISTUTILS_USE_PEP517=setuptools
 
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 4953955fe469..4df81596f76d 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 58d8be77fdab..6c3c98f803f1 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -8,5 +8,5 @@ DIST freenet-build01497-source.tar.bz2 6387097 BLAKE2B 1476793b1084bef4c596648f0
 DIST freenet-build01497-source.tar.bz2.sig 566 BLAKE2B fb1d3169942d4a1fd50aadd03011cc8907c5f5784ddfa1a20ecf0956bb8b1e0e2fbd58d93d904edb93c1781bca39a8043e56f6e73a9da927dece905ce4c570e7 SHA512 0453a6bb146531bbcdd7c1e249d3d82731400985fad5d38277cb8687fa01fd8b43e7d3164c7c22d2e8605f6e03e125bc767ffcde51b880acedbcdd45f1009ffb
 DIST pebble-3.1.6.jar 318370 BLAKE2B c3ea059ebc960764cf32a2390773926f1c4e8b0be3aaee7739adfc9529a30dfd0dab3cec0c7519be991d43eed87025db9b64f230cca0622eba16e0e64371243d SHA512 abbf9f8d5c7e23cb658970f670e4e78e62d12433a6683506f14c9c0334257d0d93089d83348691b033704e661f7c1954859e9630e1d94a461a5acf7f336f88dd
 DIST seednodes-0.7.5_p1480.tar.gz 12364 BLAKE2B edb4e2a5c7424b51f0afb8234c7e486d56fe92e9201ab7ed7658366f070225f8def1b5412a31367e434ab4afae393caa16e7bdd7307f1d870607105fd5076638 SHA512 a2662a29f5721cd1523eb68b8787b074baec990327207b9ff444c91e644738a610e5216064aef00c62d6aca8ba66b2035a3175f63d45c1e0e8efc816b2a38660
-EBUILD freenet-0.7.5_p1497.ebuild 6441 BLAKE2B 289311485523ebafe721791d0fcc58a7a7f955753541580a8ce6a81845b6a6cebfacdbe03599f9a9d21d4ced4dd8bf3dfdd2b4215a917d31e1e2f6ff794b35e2 SHA512 d8f6481d0d715aac2d2ec5b254c692207eaaafe8c99bcb55d91bfdbfd3c3bb317371254dddc5347f3eeb52f91332fcddf9e765cb73dcfb6099806c69dabf4ebc
+EBUILD freenet-0.7.5_p1497-r1.ebuild 6464 BLAKE2B c6abdf637d61d75c3a9c8187533a229002e24350e7dfbb91fff4c93283e4959c6766e7b452339f0264e2d8c9191464ef336f08c5ecf940f2feed81b82720f242 SHA512 8c22a4c1a0da78a8195d1c7f0cb9afc76c3ca77d1525bf321d0e170f2e50dbd6585ba2624efacb6650e0a49244ca924e323bf5912fb9ffe2e93e0bba896c434c
 MISC metadata.xml 343 BLAKE2B 707e39491d683cb2d209ce3bb5dae43549ccef291cc72db30bbb5fecdac28cb8e5541c71fc3e23d08394db31a75048b59cb4019756adbd58ac192a209678fbaa SHA512 1c1e42b15ec4527191bed42ce236666bd9afd83189dd0cd7c4ec0e31c97e240d3a91ec7d503aafc73c24afbf25bcc56ff6e7332a2d0bef0afa4ab6ee8f9ff8ba
diff --git a/net-p2p/freenet/freenet-0.7.5_p1497.ebuild b/net-p2p/freenet/freenet-0.7.5_p1497-r1.ebuild
index 26367b300384..bdfa94e03022 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1497.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1497-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -31,6 +31,7 @@ IUSE="+nss"
 CP_DEPEND="
 	dev-java/bcprov:0
 	dev-java/commons-compress:0
+	dev-java/commons-io:1
 	dev-java/fec:0
 	dev-java/freenet-ext:29
 	dev-java/jbitcollider-core:0
diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index bbf80696a1ec..ba58c64eff8e 100644
--- a/net-p2p/nicotine+/Manifest
+++ b/net-p2p/nicotine+/Manifest
@@ -1,6 +1,6 @@
 DIST nicotine+-3.2.8.tar.gz 2984416 BLAKE2B 8ca996e67a296535a158d1929579c4f479630bf4b666b53e91939fd61dcac90de657bfccd30521da9cc4468f3beecf1be433790ca711c67d0cf6d1e0a901be90 SHA512 92298b97ce34d713b0a4626602757a9215b57a0c3ac00c2845ff66597f0a361243f47c8abf3e8548f9f8c1829e56eb036e202242340bf268bf008b6ad6d016a5
 DIST nicotine+-3.2.9.tar.gz 2985424 BLAKE2B 1768d9f13ee15593661997ac0ad49c6c2d3aead685f83b86ae0ca05615f5fda04ea3abd3137a595d8457ef9643c4fd77adb47a76417b90d6c876bf55c56c4b31 SHA512 bc828bf8e6b194b23df8c7cce900704b918b71669ff9e0cf17b2c954838e265cc074dcb54e0abbcf563b19f10cf3199cc1980771b57e0af613ef2eed2ee4a3a8
 EBUILD nicotine+-3.2.8.ebuild 721 BLAKE2B 089b974769e2925c3d2cb8aac5a97244a9c60925023f9f99fca1c527a12a4d717ef845cf3a6bfbc7171b62b89da187aada376447962ab431a0d20fb4492a508a SHA512 543b9cc834d4436c143929eb0d171d3bed09a5d98ac3eadb1ae271782fd8749686705d61fb9a6eb3b5e92ddc18d97e47a4c548f35f9136910247d274da14c0fe
-EBUILD nicotine+-3.2.9-r1.ebuild 773 BLAKE2B 665141ec1510b55c3315a65ca7387e900adc53669fbfb2e2d8716dde7c2503edf6246512257284566fa0326bb33235a37c24633a24e3254c15b8f76cedfcac05 SHA512 888945d26e7b2b51223166137cc9fae897bf79afa3351c639602ed90da5bfcc2d8bcef4af319b58662da601345620b07bb277a9de391bfb22d8e9907d225883f
+EBUILD nicotine+-3.2.9-r1.ebuild 770 BLAKE2B 8a82b788bb0042cb538f02c69e1cf4803804f957589f43d23de4df5d0feed39eb4ae263f89e295b040b0f86de6b8879dbbbc50e12ef611ca7dcbba13b11fa01a SHA512 b02cc667ddbc2727d4224baa182d6d2fe057278f9d1799607ba48b8898eba8bcfe023796891f965f0544f9292576545f7d7da5a5271f5f8bb1ac6dfed78bbe2b
 EBUILD nicotine+-3.2.9.ebuild 721 BLAKE2B 089b974769e2925c3d2cb8aac5a97244a9c60925023f9f99fca1c527a12a4d717ef845cf3a6bfbc7171b62b89da187aada376447962ab431a0d20fb4492a508a SHA512 543b9cc834d4436c143929eb0d171d3bed09a5d98ac3eadb1ae271782fd8749686705d61fb9a6eb3b5e92ddc18d97e47a4c548f35f9136910247d274da14c0fe
 MISC metadata.xml 260 BLAKE2B 10f0374180b8776d9abd3f9e7641e9f8c9b8814d1fb6fa9fc87437ba39dd0e9fecb21e25b9cc89891b11f36c2c781bac28ef36b6aaf7da48c44d3936a1387375 SHA512 23327f42e815a3821c4384a8e72134a4216a3cfc942cfb6eaefb1c33a1680406e59dfe7abc1ad1dc762c054a2cf58c58bb8ca6277ac7b6194ba54e753d6b1593
diff --git a/net-p2p/nicotine+/nicotine+-3.2.9-r1.ebuild b/net-p2p/nicotine+/nicotine+-3.2.9-r1.ebuild
index 5777413848c2..e3fd9346044d 100644
--- a/net-p2p/nicotine+/nicotine+-3.2.9-r1.ebuild
+++ b/net-p2p/nicotine+/nicotine+-3.2.9-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/nicotine-plus-${PV}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 BDEPEND="sys-devel/gettext"
 RDEPEND="${PYTHON_DEPS}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 3ac064d4b3a7..d50d9cb9193e 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 88c3383b5bbc..784627e80abb 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,6 +1,6 @@
 AUX PR7093.patch 3317 BLAKE2B d369dfa91c8de3c62d1c14be52f5ad9491bf10f8fb904295bb92497a43150bcf9d1576442f3087b439e54fb4dac572d421e3cac95d71d01604cf329284e7ff5a SHA512 01758de8ecb721fcaadd31d478551420290b5e59c9b8fa3d421d4170665915c21e50ed765a9647b81d4f6acf71099c98628b823a66897b4f5e57df3c3b2643ba
 DIST gnuradio-3.10.9.2.tar.gz 4413832 BLAKE2B 69443e9b6893c6cb9db1678c28ac0fd01fe57e81438903612f7f65908fede257dab06a98fa90da25fe8caa6befb731ba51759509ace10a5541cae3e9d055a5db SHA512 5eca8dd21def7354ab8bd3b98a5780f80bc71b0dd8f556a50def157964e121c7ba6a8a8dc96584f6b15a6b2d7e0391fe77f5c72ba31c1c5b49a76306dd6f78cd
-EBUILD gnuradio-3.10.9.2-r2.ebuild 6757 BLAKE2B 5c22e40e9cc0ff6c120636a557cb1701ddb59546f746fb429e8a027a60946b650b9163e685e839ed6671c664f2f8d7ff7234d76025a48b729d7110bf868c3484 SHA512 030735ff375c8e1967f3a0e13af85bab26a05fda5d32b78817fa10679e2090cb22f98f592e98e8e29488609b105e8574324d8dab9513dc785b492b297196089f
-EBUILD gnuradio-3.10.9.2-r3.ebuild 7160 BLAKE2B cccbbf235ab832c41d0b961d0da914f5f90da6adf4802db408a9aeebe3284c885997651c0c49aa13bfd7226168c0488efbdfee80ee33f5d3dfddb7c8827cc4e0 SHA512 91daa03c50893b916ea525b7ec2ae0504b0a3acc7457aa6dfe796c1a93312f96a4a6d398c8d4dd7f0dd852ec07ec0e44a388b6b117fdecca9e5c4b75bb32faae
-EBUILD gnuradio-9999.ebuild 6718 BLAKE2B 7a14301346e1793d47eb7a47810841de038053263c1ec0f0a1fa7d64540708cdf98d27fde46c12c8352e57c6dab75e367ab306d3ec2088ea372fc51dacb4b111 SHA512 6e9c48c7c730a2274c45a4b9b7331a57041e19d40711af7f37095c09535f6b18e003a1ae91aafff0e76084a6692101a5dbc86ac0782ee70382cdb41350d6f761
+EBUILD gnuradio-3.10.9.2-r4.ebuild 6714 BLAKE2B 7967f69ea02aeb7cffc3caa6747f0161819c089db77e2bf72233d011a04436d7d9b5bfea4259f7f6e7b34263b67ac6ff0df8d7358fc086da72b4de40ce31d040 SHA512 d758532032da8b77fa08af1bfe5f29d6478eb75b4c56827a040ed5c5412f72e3ffbcf748108e6b52547c7ae13baebc4246902082932a191d32f1977e8daa049a
+EBUILD gnuradio-3.10.9.2-r5.ebuild 7117 BLAKE2B ef8fe80066e1a9f9097a63a72668ba5820f42980c1df2859892796333f686a100eed0a0a0e5244b2eec62518521af4a34677a0c70fa2b81c935eaf6476ba2039 SHA512 0a116f6d060a93ff134715ddf14e88935f823adb5dc8b32f1971a511e6618b962859b02ef78a1dfdf8b0fb3abae3139081fa66307beb7fce2d66a8224e30a060
+EBUILD gnuradio-9999.ebuild 6675 BLAKE2B fad563acf07851d285129195c48c5846aa94b348a63531cc087985e63d18820b53b94b87e7327e8360a1f44091f381b5ea476b9fb42ae71346d9747b74b5e619 SHA512 c7a611592ebcf67a4330112b6b991ba81f223c07851d00232d6ce0b3a6c28407b1b0e4dd58da78a9574cd83a3f39f317781d6ecf104ca1b9a77b6d46a29703e5
 MISC metadata.xml 1869 BLAKE2B de75463e64f4f3352d8959d795de15d9345e52f491f61fc824db738bccc4e2ae0487d988c22c17149f80cda5478a5bfbda03a6c5239970423371a2a76f374003 SHA512 69477d22de9e60b7f7420b14437265771391320d7c362d51b81fb573671568cf6b6b39ba50be1ad7c8bb07ed219998cf474e19b663f4a65b0e2cc69feef017a0
diff --git a/net-wireless/gnuradio/gnuradio-3.10.9.2-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.10.9.2-r4.ebuild
index e18205314679..8f673a36f670 100644
--- a/net-wireless/gnuradio/gnuradio-3.10.9.2-r2.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.10.9.2-r4.ebuild
@@ -89,12 +89,12 @@ RDEPEND="${PYTHON_DEPS}
 		dev-qt/qtwidgets:5
 	)
 	soapy? (
-		$(python_gen_cond_dep 'net-wireless/soapysdr:=[${PYTHON_USEDEP}]')
+		net-wireless/soapysdr:=[${PYTHON_SINGLE_USEDEP}]
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
 	trellis? ( dev-python/scipy )
 	uhd? (
-		$(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
+		>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]
 	)
 	utils? (
 		$(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}]
diff --git a/net-wireless/gnuradio/gnuradio-3.10.9.2-r3.ebuild b/net-wireless/gnuradio/gnuradio-3.10.9.2-r5.ebuild
index 4bfd82679765..6136c45c0420 100644
--- a/net-wireless/gnuradio/gnuradio-3.10.9.2-r3.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.10.9.2-r5.ebuild
@@ -89,12 +89,12 @@ RDEPEND="${PYTHON_DEPS}
 		dev-qt/qtwidgets:5
 	)
 	soapy? (
-		$(python_gen_cond_dep 'net-wireless/soapysdr:=[${PYTHON_USEDEP}]')
+		net-wireless/soapysdr:=[${PYTHON_SINGLE_USEDEP}]
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
 	trellis? ( dev-python/scipy )
 	uhd? (
-		$(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
+		>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]
 	)
 	utils? (
 		$(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}]
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 04191082fbfe..ce5367b7d75a 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -89,12 +89,12 @@ RDEPEND="${PYTHON_DEPS}
 		dev-qt/qtwidgets:5
 	)
 	soapy? (
-		$(python_gen_cond_dep 'net-wireless/soapysdr:=[${PYTHON_USEDEP}]')
+		net-wireless/soapysdr:=[${PYTHON_SINGLE_USEDEP}]
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
 	trellis? ( dev-python/scipy )
 	uhd? (
-		$(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
+		>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]
 	)
 	utils? (
 		$(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}]
diff --git a/net-wireless/soapysdr/Manifest b/net-wireless/soapysdr/Manifest
index 3ae4f0f67631..84e5bb26d225 100644
--- a/net-wireless/soapysdr/Manifest
+++ b/net-wireless/soapysdr/Manifest
@@ -1,4 +1,5 @@
+AUX soapysdr-0.8.1-python3.12-distutils.patch 3044 BLAKE2B 04a24ef649a5a01c60e556b4ef51a16d3b1af4be28c0fe3dcad1fd040c57d450e0db07f7a614f6b61980700cff3d18cd129f8aecbf26cf4a5467ace085e613b5 SHA512 2ad79171bfad8358ecc170695199d2d23cefa54bb24e259b2ef6f9f7d6a3baaf4461495c7a0416318e7a2d918dee11949da1efa1d9e19bc550cb191b20a6fbd1
 DIST soapysdr-0.8.1.tar.gz 131252 BLAKE2B 4dc97b683063a1bc52717f15b12a2471a338cebc30dccfd58723792119a496f5170b67eeda1ff4dbcd34811948f70b9f0e5df11b5b1738b46839ca7377fe557b SHA512 50c8f1652bf9ca09215f9c4115175427ca7b5338add7591e31ca0e627093c94b73e7cf7f84fa71ff419cc010d3c1263931506c728bbaa00413a7915d56a87787
-EBUILD soapysdr-0.8.1.ebuild 1322 BLAKE2B 4c24133d544e06b804ee2a21d1ee9989ac7ff4e9dc2a3fb2deda2397ae7226fcd19c3c0b3059ecf3035ba2b07d13cbc870de0fd347717c2aead9057b5c5f2992 SHA512 7b30c925eb9db4ac8d351b409a71ba2c0dd1c2f26f1e15b27b6aaee1ad66d6381fb34263a971bb665d8e25f1acaaf7e5260cd734695b3ce15d7aee6bde9aa662
-EBUILD soapysdr-9999.ebuild 1323 BLAKE2B d0a6fec4e8a59b695c2e1475342344281db2cd0f41edc39ae61dfdc3fb8d2b69c0869f7d1a89997e6541aa56daefa06bebe17de8c46867e12bfcfcf80c36aeaf SHA512 9865b227d5a1c99db30a5b2dcb48a2319a6f88be8c04da7700ab96984a240f972a8b7d300ec320bba7fd65170a6534f9c978199eb60a73a826b76745fd6cd220
+EBUILD soapysdr-0.8.1-r1.ebuild 1431 BLAKE2B ceb72f09493caaf99dcabcc7b266ebbaa0841dfcfea133ef444ab9570024541aa6183830d7f38c0c382da721ed73525c6cd44a3d401d3bbc1a66613d58cb00be SHA512 bee2613088af90aa245b70f7bdc34b480d5061841d25f2ea07457675aff0275b7271b09e0e427347c2f841af8436b259a162eb4b903693fae339e40bc5bf81da
+EBUILD soapysdr-9999.ebuild 1271 BLAKE2B 4ae90ed7a26d63002744206d815aa56468df83ad2b3e56d4e0de5e719140debd68b648e4f20357be6cfb430413da1363b98e6f9f6b3738a963347871e7a25bfd SHA512 b88f43511c997ab1d4e7e9ab1f5873aa74145d5737f14fddbb1097753ffeb9431cfb83c36136a79015cdf1bd2c8cf0cec33c53261076417756c77085915e1800
 MISC metadata.xml 776 BLAKE2B e875dbd46723cba190cfe767f7c91518bbd73269fdef3bc64a67b1b48145f2eeb1ba6acbf258b4e1e578ad7f77225d37662ab70cb83b345c1acecbae4a113931 SHA512 4f92020b725b79bcb55b0e4fcb2f921d01fc582e53b56c333b83a3f04c24630200b7d72d49ee9d3aaa12c887c861744a660c4f0240b3c2d0ade6f29830b74de0
diff --git a/net-wireless/soapysdr/files/soapysdr-0.8.1-python3.12-distutils.patch b/net-wireless/soapysdr/files/soapysdr-0.8.1-python3.12-distutils.patch
new file mode 100644
index 000000000000..877bc9c15ba7
--- /dev/null
+++ b/net-wireless/soapysdr/files/soapysdr-0.8.1-python3.12-distutils.patch
@@ -0,0 +1,74 @@
+https://github.com/pothosware/SoapySDR/commit/1ee5670803f89b21d84a6a84acbb578da051c119
+
+From 1ee5670803f89b21d84a6a84acbb578da051c119 Mon Sep 17 00:00:00 2001
+From: Ryan Volz <ryan.volz@gmail.com>
+Date: Tue, 26 Sep 2023 14:56:59 -0400
+Subject: [PATCH] Remove deprecated use of distutils, fix for Python 3.12+
+
+This switches to using sysconfig from distutils, which is necessary for
+Python 3.12+ since distutils is deprecated and has been removed.
+
+It is necessary to specify the install scheme when a prefix other than
+the Python default is used so that changes to the default scheme made by
+distributions (e.g. Debian, Fedora) do not produce an incorrect Python
+installation directory. For example, Debian patches the default scheme
+to prepend the path with '/local', but if a user specifies a prefix of
+'/usr/local', then the path using the default scheme would be
+'/usr/local/local/...' with a duplicated 'local' directory. Specifying
+an unmodified install scheme fixes that.
+
+Signed-off-by: Ryan Volz <ryan.volz@gmail.com>
+---
+ python/get_python_lib.py | 36 ++++++++++++++++++++++++-----------
+ 1 file changed, 25 insertions(+), 11 deletions(-)
+
+diff --git a/python/get_python_lib.py b/python/get_python_lib.py
+index 0c716529..574f0b60 100644
+--- a/python/get_python_lib.py
++++ b/python/get_python_lib.py
+@@ -1,19 +1,33 @@
+ import os
++import pathlib
+ import sys
+-import site
+-from distutils.sysconfig import get_python_lib
++import sysconfig
+ 
+ if __name__ == '__main__':
+-    prefix = sys.argv[1]
++    prefix = pathlib.Path(sys.argv[1]).resolve()
+ 
+-    #ask distutils where to install the python module
+-    install_dir = get_python_lib(plat_specific=True, prefix=prefix)
++    # default install dir for the running Python interpreter
++    default_install_dir = pathlib.Path(sysconfig.get_path('platlib')).resolve()
+ 
+-    #use sites when the prefix is already recognized
++    # if default falls under the desired prefix, we're done
+     try:
+-        paths = [p for p in site.getsitepackages() if p.startswith(prefix)]
+-        if len(paths) == 1: install_dir = paths[0]
+-    except AttributeError: pass
++        relative_install_dir = default_install_dir.relative_to(prefix)
++    except ValueError:
++        # get install dir for the specified prefix
++        # can't use the default scheme because distributions modify it
++        # newer Python versions have 'venv' scheme, use for all OSs.
++        if 'venv' in sysconfig.get_scheme_names():
++            scheme = 'venv'
++        elif os.name == 'nt':
++            scheme = 'nt'
++        else:
++            scheme = 'posix_prefix'
++        prefix_install_dir = pathlib.Path(sysconfig.get_path(
++            'platlib',
++            scheme=scheme,
++            vars={'base': prefix, 'platbase': prefix},
++        )).resolve()
++        relative_install_dir = prefix_install_dir.relative_to(prefix)
+ 
+-    #strip the prefix to return a relative path
+-    print(os.path.relpath(install_dir, prefix))
++    # want a relative path for use in the build system
++    print(relative_install_dir)
+
diff --git a/net-wireless/soapysdr/soapysdr-0.8.1.ebuild b/net-wireless/soapysdr/soapysdr-0.8.1-r1.ebuild
index fae8341b7d65..f4f69287124e 100644
--- a/net-wireless/soapysdr/soapysdr-0.8.1.ebuild
+++ b/net-wireless/soapysdr/soapysdr-0.8.1-r1.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
-
-inherit cmake python-r1
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake python-single-r1
 
 DESCRIPTION="vendor and platform neutral SDR support library"
 HOMEPAGE="https://github.com/pothosware/SoapySDR"
@@ -22,39 +21,40 @@ fi
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}"
-
 IUSE="bladerf hackrf python rtlsdr plutosdr uhd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig:0 )
+DEPEND="${RDEPEND}"
+BDEPEND="python? ( dev-lang/swig:0 )"
+PDEPEND="
+	bladerf? ( net-wireless/soapybladerf )
+	hackrf? ( net-wireless/soapyhackrf )
+	rtlsdr? ( net-wireless/soapyrtlsdr )
+	plutosdr? ( net-wireless/soapyplutosdr )
+	uhd? ( net-wireless/soapyuhd )
 "
-PDEPEND="bladerf? ( net-wireless/soapybladerf )
-		hackrf? ( net-wireless/soapyhackrf )
-		rtlsdr? ( net-wireless/soapyrtlsdr )
-		plutosdr? ( net-wireless/soapyplutosdr )
-		uhd? ( net-wireless/soapyuhd )"
 
-src_configure() {
-	configuration() {
-		mycmakeargs+=(
-			-DENABLE_PYTHON=ON
-			-DBUILD_PYTHON3=ON
-		)
-	}
+PATCHES=(
+	"${FILESDIR}"/soapysdr-0.8.1-python3.12-distutils.patch
+)
 
-	if use python; then
-		python_foreach_impl configuration
-	fi
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_PYTHON3=$(usex python)
+		-DBUILD_PYTHON3=$(usex python)
+		-DUSE_PYTHON_CONFIG=ON
+	)
 
 	cmake_src_configure
 }
 
 src_install() {
 	cmake_src_install
-
-	if use python; then
-		python_foreach_impl python_optimize
-	fi
+	use python && python_optimize
 }
diff --git a/net-wireless/soapysdr/soapysdr-9999.ebuild b/net-wireless/soapysdr/soapysdr-9999.ebuild
index fa9402a85678..ad161a57c0f5 100644
--- a/net-wireless/soapysdr/soapysdr-9999.ebuild
+++ b/net-wireless/soapysdr/soapysdr-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
-
-inherit cmake python-r1
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake python-single-r1
 
 DESCRIPTION="vendor and platform neutral SDR support library"
 HOMEPAGE="https://github.com/pothosware/SoapySDR"
@@ -22,39 +21,33 @@ fi
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}"
-
 IUSE="bladerf hackrf python rtlsdr plutosdr uhd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig:0 )
+DEPEND="${RDEPEND}"
+BDEPEND="python? ( dev-lang/swig:0 )"
+PDEPEND="
+	bladerf? ( net-wireless/soapybladerf )
+	hackrf? ( net-wireless/soapyhackrf )
+	rtlsdr? ( net-wireless/soapyrtlsdr )
+	plutosdr? ( net-wireless/soapyplutosdr )
+	uhd? ( net-wireless/soapyuhd )
 "
-PDEPEND="bladerf? ( net-wireless/soapybladerf )
-		hackrf? ( net-wireless/soapyhackrf )
-		rtlsdr? ( net-wireless/soapyrtlsdr )
-		plutosdr? ( net-wireless/soapyplutosdr )
-		uhd? ( net-wireless/soapyuhd )"
 
-src_configure() {
-	configuration() {
-		mycmakeargs+=(
-			-DENABLE_PYTHON=ON
-			-DBUILD_PYTHON3=ON
-		)
-	}
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
 
-	if use python; then
-		python_foreach_impl configuration
-	fi
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PYTHON3=$(usex python)
+	)
 
 	cmake_src_configure
 }
 
 src_install() {
 	cmake_src_install
-
-	if use python; then
-		python_foreach_impl python_optimize
-	fi
+	use python && python_optimize
 }
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 26900ba6d85a..4e312645f34e 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index f4cd5a5e7e69..90ec7af71c71 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,11 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# James Le Cuirot <chewi@gentoo.org> (2021-08-20)
+# Requires FFmpeg 7.0, which we don't have yet, so force Chromium fork.
+>=www-client/vivaldi-6.8.3371.4 ffmpeg-chromium
+>=www-client/vivaldi-snapshot-6.8.3371.4 ffmpeg-chromium
+
 # Ionen Wolkens <ionen@gentoo.org> (2024-04-10)
 # Flipping the zstd USE state is unsafe and can break *tons* of Qt revdeps
 # including many KDE packages and Qt itself without rebuilds due to losing
diff --git a/profiles/default/linux/arm/23.0/armv6j_hf/musl/package.use.stable.mask b/profiles/default/linux/arm/23.0/armv6j_hf/musl/package.use.mask
index c021f45d8508..c021f45d8508 100644
--- a/profiles/default/linux/arm/23.0/armv6j_hf/musl/package.use.stable.mask
+++ b/profiles/default/linux/arm/23.0/armv6j_hf/musl/package.use.mask
diff --git a/profiles/default/linux/arm/23.0/armv7a_hf/musl/package.use.stable.mask b/profiles/default/linux/arm/23.0/armv7a_hf/musl/package.use.mask
index c021f45d8508..c021f45d8508 100644
--- a/profiles/default/linux/arm/23.0/armv7a_hf/musl/package.use.stable.mask
+++ b/profiles/default/linux/arm/23.0/armv7a_hf/musl/package.use.mask
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/package.use.stable.mask b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/package.use.mask
index c021f45d8508..c021f45d8508 100644
--- a/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/package.use.stable.mask
+++ b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/package.use.mask
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/package.use.stable.mask b/profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/package.use.mask
index c021f45d8508..c021f45d8508 100644
--- a/profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/package.use.stable.mask
+++ b/profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/package.use.mask
diff --git a/profiles/default/linux/x86/23.0/i486/musl/package.use.mask b/profiles/default/linux/x86/23.0/i486/musl/package.use.mask
index b794980bdad7..3ced25c30235 100644
--- a/profiles/default/linux/x86/23.0/i486/musl/package.use.mask
+++ b/profiles/default/linux/x86/23.0/i486/musl/package.use.mask
@@ -1,8 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2
 
+# Ian Jordan <immoloism@gmail.com> (2024-05-20)
+# Does not compile with musl-1.2.4+
+sys-devel/gcc sanitize
+
 # Anthony G. Basile <blueness@gentoo.org> (2020-09-06)
 # The patch added for 5.39-r1 breaks on musl i686
 # file-5.39-seccomp_sandbox.patch is okay
 # file-5.39-portage_sandbox.patch is broken
 sys-apps/file seccomp
+
diff --git a/profiles/default/linux/x86/23.0/i486/musl/package.use.stable.mask b/profiles/default/linux/x86/23.0/i486/musl/package.use.stable.mask
deleted file mode 100644
index c021f45d8508..000000000000
--- a/profiles/default/linux/x86/23.0/i486/musl/package.use.stable.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2024-03-20)
-# Does not compile with musl-1.2.4
-sys-devel/gcc sanitize
diff --git a/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.mask b/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.mask
index b794980bdad7..d3fa26567c1d 100644
--- a/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.mask
+++ b/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2
 
+# Ian Jordan <immoloism@gmail.com> (2024-05-20)
+# Does not compile with musl-1.2.4+
+sys-devel/gcc sanitize
+
 # Anthony G. Basile <blueness@gentoo.org> (2020-09-06)
 # The patch added for 5.39-r1 breaks on musl i686
 # file-5.39-seccomp_sandbox.patch is okay
diff --git a/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.stable.mask b/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.stable.mask
deleted file mode 100644
index c021f45d8508..000000000000
--- a/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.stable.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2024-03-20)
-# Does not compile with musl-1.2.4
-sys-devel/gcc sanitize
diff --git a/profiles/default/linux/x86/23.0/i686/musl/package.use.mask b/profiles/default/linux/x86/23.0/i686/musl/package.use.mask
index b794980bdad7..d3fa26567c1d 100644
--- a/profiles/default/linux/x86/23.0/i686/musl/package.use.mask
+++ b/profiles/default/linux/x86/23.0/i686/musl/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2
 
+# Ian Jordan <immoloism@gmail.com> (2024-05-20)
+# Does not compile with musl-1.2.4+
+sys-devel/gcc sanitize
+
 # Anthony G. Basile <blueness@gentoo.org> (2020-09-06)
 # The patch added for 5.39-r1 breaks on musl i686
 # file-5.39-seccomp_sandbox.patch is okay
diff --git a/profiles/default/linux/x86/23.0/i686/musl/package.use.stable.mask b/profiles/default/linux/x86/23.0/i686/musl/package.use.stable.mask
deleted file mode 100644
index c021f45d8508..000000000000
--- a/profiles/default/linux/x86/23.0/i686/musl/package.use.stable.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2024-03-20)
-# Does not compile with musl-1.2.4
-sys-devel/gcc sanitize
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.mask b/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.mask
index b794980bdad7..d3fa26567c1d 100644
--- a/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.mask
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2
 
+# Ian Jordan <immoloism@gmail.com> (2024-05-20)
+# Does not compile with musl-1.2.4+
+sys-devel/gcc sanitize
+
 # Anthony G. Basile <blueness@gentoo.org> (2020-09-06)
 # The patch added for 5.39-r1 breaks on musl i686
 # file-5.39-seccomp_sandbox.patch is okay
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.stable.mask b/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.stable.mask
deleted file mode 100644
index c021f45d8508..000000000000
--- a/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.stable.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2024-03-20)
-# Does not compile with musl-1.2.4
-sys-devel/gcc sanitize
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 5e6dbb5b962b..32b0a833df80 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -5001,12 +5001,8 @@ media-tv/mythtv:vpx - Enable VP8/VP9 support for media-libs/libvpx
 media-tv/mythtv:wrapper - Use Ubuntu mythtfrontend wrapper
 media-tv/mythtv:x265 - Enable h265 encoding using x265
 media-tv/mythtv:xmltv - Support media-tv/xmltv TV listing - not used by Schedules Direct]
-media-tv/tvheadend:capmt - Enable support for capmt (dvbapi) protocol
-media-tv/tvheadend:constcw - Enable support for the constcw protocol
-media-tv/tvheadend:cwc - Enable support for the cwc (newcamd) protocol
 media-tv/tvheadend:ddci - Enable support for DDCI hardware
 media-tv/tvheadend:dvbcsa - Enable decryption of the DVB Common Scrambling Algorithm
-media-tv/tvheadend:dvben50221 - Enable support for hardware CAM
 media-tv/tvheadend:hdhomerun - Enable support for the HDHomeRun device
 media-tv/tvheadend:imagecache - Enable support for image caching
 media-tv/tvheadend:iptv - Enable support for Internet Protocol TV
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 8f445bd0cb97..4de7281d96d8 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index 885eec26313e..668e7b267772 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -1,9 +1,11 @@
 AUX siril-1.2-exiv2-0.28.patch 1171 BLAKE2B 5e64f52fb1b2eb7ba05dde0d0d84f910d8238eac3d58ca15137fa394b7fb2a75aff26bc01616ef6a46007c95a546403960627b64cf675aa21d0039119f3afc47 SHA512 1e339d6e1bd843146e4dd8124a4ef2177f7596cd5d9864a05886a7a055e00093a48a7341b5ad9c1bf82d9e4b2c0cc2559ef429d2c8f986951c846a0bf097da03
 AUX siril-1.2-fseek64-musl.patch 1750 BLAKE2B d0c735b72c6856f9d965e3c145116384c3cc2da92db2b5bf25c7345b3b6dd511db5853ef8c280cc37eef421713ccb1571443104427b86b963065c7bcf13d2d8d SHA512 73cc6dbc0da759a2f127af9926ca7466ad31c400c4fd349c376058d0b64e8f8f65ab1c8486d2169160af24637aa10c1cbecd0d2fb934b0d4baf22bc919dd7798
+AUX siril-1.2.1-options.patch 4226 BLAKE2B da57338a600f4358d572a1d3618571152cc334ed6f23162b9d1199dc6d2245247c6431646d3af02ba7752eac95cf5f82d1fa587f2de38ff9956400e68a97e590 SHA512 0988ce57f43fe06fe2e0af2152295098fd91351d28d3c6dd8174b7e8cb8dddbfa80c06ef763f25ae6d2128d2e9ca7ff4100f473d7b74871b189f49d188dd4428
 AUX siril-docfiles.patch 433 BLAKE2B 3c781f4a0604f56ada235094eb481b4b51912921719ee198c7d2400a7dffbb4034d34505f5d7221b033efbbbe11b07332938a6dc0bc616bb6f6480e41475653e SHA512 2d770a2cb86d95c291beb6077ab01560e118bc84d838dfeef50bc9a812469fea568cdfe1c9b5d1a90b778527b65a397aac1656008739cff88ffc80ba6fd09c72
 DIST siril-1.2.0.tar.bz2 4500147 BLAKE2B 7ff4fa5bf1b578336c82bd0f67e404fe47715640edae9cb231da4a3c6a30638612e77515049d56dd1d444965ad58f12d5e2516ad13d3e726f13242b11d91b954 SHA512 7df7b17d65a2aad9e0edd4b5022c1d23688ad8884a973d2195391234151aff0824e155ce949b385a951eaef71065a811f33b54e08b865ab5fa6c1d331841663c
 DIST siril-1.2.1.tar.bz2 4596163 BLAKE2B c461a397e623164ccb2310b26aede120bf587b3491a2af3fab446af5ecbfb716169120b549c496bb615d3b7ac6175629258173fe66682ef4684ef5cf01d64761 SHA512 352b3e761a2d863d4ce4e01b0bf4181d8fefa903478973b50ace76ff419dbf07775099a994e685cd83cc2210b34ca10fb98004cedfdea34fe0c1520b4892bb6d
 EBUILD siril-1.2.0.ebuild 2172 BLAKE2B c2c1af672e50ee49f7e49011061c650a60d3507ab0bd7e2a4af76fdfc706260ef175523ae11a0072cc04e36e016c43412470cdc4c61c6368e6670558b5c7e8b5 SHA512 d30dd9d5d81e1f0c271d2613dc48ec97797675702b9f8eb3b27c85ed0ad82123bebaac89f90d4542aeaf1cdc159fc05390e23047aec8f079e51d2576529b61c6
+EBUILD siril-1.2.1-r1.ebuild 2203 BLAKE2B f0174a4ad630c840b53adad2496d967d380e8e9ba482d5b0c7c89c73981f0de821608ca212bb8a2dfeef2f241c5531565ff8cbed0ffc925ead265546d9b1d119 SHA512 fa6944438a8a2b4100ed884c87ea891e48b798c0ab587e5554951ac762f170929de4cd7776e030b553e0d62da550095566edf53055b5ab00a3a8d3f45dfb52b5
 EBUILD siril-1.2.1.ebuild 2161 BLAKE2B eebb0933a0480dee9630eae5e4366c86fd3f15c57e774171dee9e722d62cd72c9e1d906f09ea08546f42bb00cdd6aed6a1a65a8a395521f5fdd7c7a110ef327c SHA512 3fb563bcdce358272c3ea6ae6603879c24faa2b14faa224c56151b03d352e5c03981670307ecf255d16c8a1f8cb46e7ddc2da8c9d8cd2aa717634ef24d5bde5d
 EBUILD siril-9999.ebuild 2118 BLAKE2B ece544aded06995d0f87502c68558ec749b7a7f164df9abd6a1b3bc09b13683d701c49195651155192421082fa92c19706e3751637e35b09b54e9c411933e4c6 SHA512 49e5bf7f8d406ca42e13977fdc591fce9985bb9e6f76796b9bf38d123d380f11806a9590320dd8f065737bfe2b1a12b6f8fcc8b0e727e5d89fc4c66bb5ad4118
 MISC metadata.xml 1230 BLAKE2B a06f55d651e08bc453b4fcf214125668da4bfcd1b612ce00624329de275a28245ccfa842aaab294e043e06c057a0b92725ecc76f4d415d40451bdd2c05b9c462 SHA512 81480de0f4080e61c2d3528f8dfdfd3562f341680acd0084986849a16552970c219c01c2599a5e7e47dc4bc77f5fb3e51ac6e478f1d0bb78a029cb0f0b5d63e1
diff --git a/sci-astronomy/siril/files/siril-1.2.1-options.patch b/sci-astronomy/siril/files/siril-1.2.1-options.patch
new file mode 100644
index 000000000000..11a8bdeeef0c
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.2.1-options.patch
@@ -0,0 +1,101 @@
+From 241b4b17d83285eb4bf4151dd77198427ac9fde4 Mon Sep 17 00:00:00 2001
+From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date: Sun, 28 Apr 2024 14:09:19 +0200
+Subject: [PATCH] Fix multiple definition of struct options
+Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/668
+Bug: https://bugs.gentoo.org/927345
+
+--- a/src/filters/deconvolution/estimate_kernel.cpp
++++ b/src/filters/deconvolution/estimate_kernel.cpp
+@@ -33,7 +33,7 @@ extern "C" float *estimate_kernel(estk_data *args, int max_threads) {
+     if (!cppfftwmultithreaded)
+         max_threads = 1;
+     img_t<float>::use_threading(max_threads);
+-    options opts;
++    estimate_kernel_options opts;
+     opts.ks = args->ks;
+     opts.lambda = args->lambda;
+     opts.lambda_ratio = args->lambda_ratio;
+--- a/src/filters/deconvolution/estimate_kernel.hpp
++++ b/src/filters/deconvolution/estimate_kernel.hpp
+@@ -56,7 +56,7 @@ void gaussian_downsample(img_t<float>& out, const img_t<float>& _in, float facto
+     }
+ }
+ 
+-struct options {
++struct estimate_kernel_options {
+     bool verbose;
+     int ks;
+     float lambda;
+@@ -81,7 +81,7 @@ template <typename T>
+ class ImagePredictor {
+ public:
+     virtual void solve(img_t<T>& u, const img_t<T>& K, T lambda, T beta_init, T beta_rate, T beta_max,
+-                       const options& opts) = 0;
++                       const estimate_kernel_options& opts) = 0;
+     virtual ~ImagePredictor() {}
+ };
+ 
+@@ -114,7 +114,7 @@ public:
+     }
+ 
+     void solve(img_t<T>& u, const img_t<T>& K,
+-               T lambda, T beta_init, T beta_rate, T beta_max, const options& opts) {
++               T lambda, T beta_init, T beta_rate, T beta_max, const estimate_kernel_options& opts) {
+         assert(K.w % 2);
+         assert(K.h % 2);
+ 
+@@ -177,7 +177,7 @@ public:
+ template <typename T>
+ class KernelEstimator {
+ public:
+-    virtual void solve(img_t<T>& k, const img_t<T>& u, const struct options& opts) = 0;
++    virtual void solve(img_t<T>& k, const img_t<T>& u, const struct estimate_kernel_options& opts) = 0;
+     virtual ~KernelEstimator() {}
+ };
+ 
+@@ -198,7 +198,7 @@ public:
+     }
+ 
+     // implements Algorithm 3
+-    void solve(img_t<T>& k, const img_t<T>& u, const struct options& opts) {
++    void solve(img_t<T>& k, const img_t<T>& u, const struct estimate_kernel_options& opts) {
+         k.resize(ks, ks);
+ 
+         // solves the Equation (28)
+@@ -313,7 +313,7 @@ public:
+         fv = fft::r2c(v);
+     }
+ 
+-    void solve(img_t<T>& k, const img_t<T>& u, const struct options& opts) {
++    void solve(img_t<T>& k, const img_t<T>& u, const struct estimate_kernel_options& opts) {
+         if (k.w != ks || k.h != ks)
+             k.resize(ks, ks);
+ 
+@@ -407,7 +407,7 @@ public:
+ // estimates the sharp image and the kernel from a blurry image and an initialization of u
+ template <typename T>
+ void l0_kernel_estimation(img_t<T>& k, img_t<T>& u, const img_t<T>& v,
+-                          const img_t<T>& initu, struct options& opts) {
++                          const img_t<T>& initu, struct estimate_kernel_options& opts) {
+ //    static int it = 0;
+     ImagePredictor<T>* sharp_predictor = nullptr;
+     sharp_predictor = new L0ImagePredictor<T>(v);
+@@ -463,7 +463,7 @@ void l0_kernel_estimation(img_t<T>& k, img_t<T>& u, const img_t<T>& v,
+ // it assumes that the image was previously processed by preprocess_image
+ // the inner loop is implemented in l0_kernel_estimation
+ template <typename T>
+-void multiscale_l0_kernel_estimation(img_t<T>& k, img_t<T>& u, const img_t<T>& v, struct options& opts) {
++void multiscale_l0_kernel_estimation(img_t<T>& k, img_t<T>& u, const img_t<T>& v, struct estimate_kernel_options& opts) {
+     std::vector<img_t<T>> vs;
+     std::vector<int> kernelSizes;
+     printf("Multiscale kernel estimation...\n");
+@@ -511,7 +511,7 @@ void multiscale_l0_kernel_estimation(img_t<T>& k, img_t<T>& u, const img_t<T>& v
+ 
+ // preprocess the input blurry image as describe in Section 2.1
+ template <typename T>
+-void preprocess_image(img_t<T>& out, const img_t<T>& _v, struct options& opts) {
++void preprocess_image(img_t<T>& out, const img_t<T>& _v, struct estimate_kernel_options& opts) {
+     img_t<T> v(_v.w, _v.h);
+ 
+     // convert to grayscale
diff --git a/sci-astronomy/siril/siril-1.2.1-r1.ebuild b/sci-astronomy/siril/siril-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..8b3fc3865d24
--- /dev/null
+++ b/sci-astronomy/siril/siril-1.2.1-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature toolchain-funcs xdg
+
+DESCRIPTION="A free astronomical image processing software"
+HOMEPAGE="https://siril.org/"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/free-astro/${PN}.git"
+else
+	SRC_URI="https://gitlab.com/free-astro/siril/-/archive/${PV/_/-}/${PN}-${PV/_/-}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+LICENSE="GPL-3+ Boost-1.0"
+SLOT="0"
+IUSE="curl exif ffmpeg heif jpeg libconfig openmp png raw tiff wcs"
+
+DEPEND="
+	>=dev-libs/glib-2.56.0:2
+	>=dev-libs/json-glib-1.2.6
+	media-libs/librtprocess
+	>=media-libs/opencv-4.4.0:=
+	sci-libs/cfitsio:=
+	sci-libs/fftw:3.0=
+	sci-libs/gsl:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/cairo
+	x11-libs/pango
+	>=x11-libs/gtk+-3.20.0:3
+	curl? ( net-misc/curl )
+	exif? ( >=media-gfx/exiv2-0.25:= )
+	ffmpeg? ( media-video/ffmpeg:= )
+	heif? ( media-libs/libheif:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	libconfig? ( >=dev-libs/libconfig-1.4:=[cxx] )
+	png? ( >=media-libs/libpng-1.6.0:= )
+	raw? ( media-libs/libraw:= )
+	tiff? ( media-libs/tiff:= )
+	wcs? ( >=sci-astronomy/wcslib-7.7:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="dev-build/cmake
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-docfiles.patch"
+	"${FILESDIR}/${PN}-1.2-fseek64-musl.patch"
+	"${FILESDIR}/${PN}-1.2.1-options.patch"
+)
+
+DOCS=( README.md NEWS ChangeLog AUTHORS )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dffms2=false
+		-Dcriterion=false
+		$(meson_use exif exiv2)
+		$(meson_use ffmpeg)
+		$(meson_use heif libheif)
+		$(meson_use jpeg libjpeg)
+		$(meson_use libconfig)
+		$(meson_use openmp)
+		$(meson_use png libpng)
+		$(meson_use raw libraw)
+		$(meson_use tiff libtiff)
+		$(meson_use wcs wcslib)
+		$(usex curl -Denable-libcurl=yes -Denable-libcurl=no)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	optfeature "gnuplot support" sci-visualization/gnuplot
+}
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index b00432ffd6cc..375bb3febb00 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/ucsc-genome-browser/Manifest b/sci-biology/ucsc-genome-browser/Manifest
index 13c0c81fd95e..352d6f97739a 100644
--- a/sci-biology/ucsc-genome-browser/Manifest
+++ b/sci-biology/ucsc-genome-browser/Manifest
@@ -1,3 +1,3 @@
 DIST jksrc.v260.zip 59090224 BLAKE2B 755bb97f50cde97e7634f38aa81f0843de52710cac78f5b0a2ee6129cffc99f730b8e1ab41d24e2faebb3c0a3e1d1309c84307e2dc4af1efe9a30fb0b9ae1670 SHA512 48aa964ab3ae456ab7e7ddc5d73b91774bd4892f21f1498578a5de38d3a07e4684778ddb1ac1ae389d5bbb3586f9b8506ca3697acca1f6777b85d343cf5d9485
-EBUILD ucsc-genome-browser-260-r1.ebuild 3134 BLAKE2B f9b628c78939377f66c9aca6b68ca3cbebf7c41dde18a8d03dbc4533593069dff0381d0fe206b0287569739a96010661d275c2d43a8ffc9e1ad8f73b4d73be5e SHA512 6f33bd29ac24661d8a495913b6746d60ca4eb95e91e5ca7325420a9b430f9ca8fe990d9167ab2ffd500f151f8cce045601e1dde24efde05b185511c1b06593a7
+EBUILD ucsc-genome-browser-260-r2.ebuild 3247 BLAKE2B 7f8ece657ec2fa39c623712293009645f247f427149e617287d458a97364bf6070a3bc1c94ef2b447c6751e58b0b98f7996c7a941342ed937d9455a84a1233fb SHA512 99716737f5cb5e03ecc162a97a79e8f3369dea1452819c9dce4ae2ec593953b0c031929c0785b8677506483d6537c59d113888b89b804d9796b767f364bfc5cf
 MISC metadata.xml 436 BLAKE2B f0bf2e08eaadf20a1810abf0e3cd42494197b8fe2593c5f3ee243f58af5676a795009fefbc7f11d2d8e4d42ff9e34790dd7be9999a37839fe6ce780b12714116 SHA512 43d2b6e4519270b495122711c747c906ba64993811a6f4d63af5fc17a6752232dde3717f193432d673e2c183e35fb88421a39077d3d0dad18b712d26c6e64caa
diff --git a/sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r1.ebuild b/sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r2.ebuild
index f0bb0676ae85..ef96f491fb51 100644
--- a/sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r1.ebuild
+++ b/sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r2.ebuild
@@ -1,32 +1,40 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
+WEBAPP_MANUAL_SLOT="yes"
+# TODO: use WEBAPP_OPTIONAL?
 inherit toolchain-funcs flag-o-matic webapp
 
 DESCRIPTION="The UCSC genome browser suite, also known as Jim Kent's library and GoldenPath"
 HOMEPAGE="http://genome.ucsc.edu/"
 SRC_URI="http://hgdownload.cse.ucsc.edu/admin/jksrc.v${PV}.zip"
+S="${WORKDIR}/kent"
 
 LICENSE="blat"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+mysql +server static-libs"
-
 REQUIRED_USE="server? ( mysql )"
 
-WEBAPP_MANUAL_SLOT="yes"
-
+# TODO: test with other webservers
 RDEPEND="
-	dev-libs/openssl:0=
-	media-libs/libpng:0=
+	dev-libs/openssl:=
+	media-libs/libpng:=
 	!<sci-biology/ucsc-genome-browser-223
-	mysql? ( dev-db/mysql-connector-c:0= )
-	server? ( virtual/httpd-cgi )" # TODO: test with other webservers
-DEPEND="${RDEPEND} app-arch/unzip"
-
-S="${WORKDIR}/kent"
+	mysql? ( dev-db/mysql-connector-c:= )
+	server? ( virtual/httpd-cgi )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-alternatives/cpio
+	app-arch/unzip
+"
+
+pkg_setup() {
+	use server && webapp_pkg_setup
+}
 
 src_prepare() {
 	default
@@ -35,6 +43,8 @@ src_prepare() {
 
 	# bug #708064
 	append-flags -fcommon
+	# bug #831491, bug #919200, bug #921261
+	append-flags -std=gnu89
 
 	sed \
 		-e 's/-Werror//' \
@@ -64,10 +74,9 @@ src_compile() {
 
 	export MYSQLLIBS="none" MYSQLINC="none" DOCUMENTROOT="none" CGI_BIN="none"
 
-	# TODO: Change ${EPREFIX} to ${ESYSROOT} in EAPI 7
-	# (and ideally use pkg-config here)
-	use mysql && export MYSQLLIBS="-L${EPREFIX%/}/usr/$(get_libdir)/mysql/ -lmysqlclient -lz -lssl" \
-		MYSQLINC="${EPREFIX%/}/usr/include/mysql"
+	# TODO: use pkg-config here
+	use mysql && export MYSQLLIBS="-L${ESYSROOT}/usr/$(get_libdir)/mysql/ -lmysqlclient -lz -lssl" \
+		MYSQLINC="${ESYSROOT}/usr/include/mysql"
 
 	use server && export DOCUMENTROOT="${WORKDIR}/destdir/${MY_HTDOCSDIR}" \
 		CGI_BIN="${WORKDIR}/destdir/${MY_HTDOCSDIR}/cgi-bin"
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index efb35d27a819..7ebfb64a5f8d 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index e78c396654da..d3f66f2d73bc 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,10 +1,7 @@
 AUX gpsd.conf-2 198 BLAKE2B c72808d1b43c8f1d97d97369d3f95fe2726a7972ea08915dcd35e82f543265cd457646405b00bd15e45b4a131c5f8d0efefb910be6013476ba7b052650298934 SHA512 75dbfe39eb900cc9587dd70794ee77ae2230765bbede47760ca227145aa3f2290b6995335ffcfeae6cd86f56b01ca87367548f4fbcf810aff1bc012b7416deef
 AUX gpsd.init-2 825 BLAKE2B 340bd992093d81067cef4329e50e4daa6e663ae214e560080ee58f99fbde742272979ca8b843c47ad6f1c2038d5bcab5c7886a963881bcf09079fb1ec1730aae SHA512 51319247eb78c3021d3eb897cb5d6026cc09d46a532a245a835459ed525947ffb6239f08126dd7e344de52e3b0387226bce060191ec3f14f99fc9f255d96f8ea
-DIST gpsd-3.23.1.tar.xz 3450632 BLAKE2B 5057d2ee4734be169c909fd4b8fbe9b5bd65c99ab3ee7e5cc843ffc3e3a033f29f7a677e7dc0a09bbfba28a9a95336e43e4dda09455d90c7ad5a548848778cbc SHA512 21a14e1d8dfa7bef08560107c333c5ad8381914c68ff47ce091506733623a3e5c1dc79e1af303105aeec96490e17d2f10ba0a359250a58f9101af157baa5479d
-DIST gpsd-3.24.tar.xz 3596040 BLAKE2B 999963258aae883df4ae84b8011324971c25ebc84a04b169b1984bf61ecce6b20e4fdf112ff23c54d7647bcec374eeb285f377833cb303dad3449e4b3a028f07 SHA512 96b1967220ff8837271a8974883081a8254fc3b7f3ab3a111ef49ccfa88d86bc82081cf24d33ef849fb5867d6263bb4ec798972e15095501e1feafdc4c14777d
 DIST gpsd-3.25.tar.xz 3647488 BLAKE2B 0c6f4eff5d2489e88ef0a35b9c089e30805368d491603e644a917a189c95316750913ec1d393a5a2ae7ebaf9279a4d1f19907333c35652178304c69102262849 SHA512 efc26221deb08ef8f34aed7d56809c1056320700f55d08519f1b44fd0c3c8ffc49672980301970fc096d88a0022d7cf207d329356dd81ca3618b7bedc3b078d6
-EBUILD gpsd-3.23.1-r2.ebuild 6119 BLAKE2B f9624333fbd42a3f1c375f1778380c0415b19434b80df98d57166f388dae4d5608a9b1a941be6858c0aa57ce2903e6b30625766a5cea51ab7201e709f13b62a0 SHA512 4946929dc431a202f462fa3d72157f4da91c0ab27fa1c76406af73c0ae0ae408f5114df41256263ec77803ff31005e87b9563c8b495fdee8ac088697d3f36642
-EBUILD gpsd-3.24.ebuild 6325 BLAKE2B ea92cef7cce12c5d4ecbafb8293c5035eaafc3bc8a6c37ed43eee3f4de1d3a3412c0a57cc9ffbe782cdf77ac1c6a93beeebd3b6264fd6f5810302efd53b55ad0 SHA512 70a34f121b96ceca4d81d2e4081fc1d32ed3e141ae67427f54cbf3ae9048efecc6a4f86d6fbd226c7664a677281b47eace6491d5a6b6aa9522f9fc62084e167f
-EBUILD gpsd-3.25.ebuild 6385 BLAKE2B 8734efef57a8fcd80043a92411f13460122d251a5529e9728b8bb4d30ee0588899aecdcd5c358f855f2a1e00da0944ed94cf65e36b3f06284ff8d4495a8aafa3 SHA512 cb943f26603bf5dea6272118bda108eb5c1dc997ff966375ead0d54e1e19b0b19f92922bf0053be3250de86c2c85bb3bf0e5049b19a3ff0d587ef096fd6854b0
-EBUILD gpsd-9999.ebuild 6388 BLAKE2B 16b4828c24b1513c1b502f73f946266d2a517fd67424353beb23d1765f96fbf905c0a051a0bd8181342457cf4b76cf0a01a0ade43f8b6bbdcfb0c050a8fce1de SHA512 69f7b5cb7849290fa20545e9de14e860d2b2ee4fc18a30cfb95b32733b092a8fc55dafbb0ad3fa23ef994e4e4a927804fd8d683f5a9b0b5857e05905a91fcec7
+EBUILD gpsd-3.25-r1.ebuild 6704 BLAKE2B b62640bae0826558343a7b8c9d64b3c0a27efd61d0bc5db78589d125a3e17e52c1530d33d5679ae514e071cf9017730a1b8fb181611f67d2fec9326700279f49 SHA512 b2e628b4748342eabea0af2e814e81658e95ee720700ce9b97fd4810379b97ad3de2985fd90cc6f5c1f25c6aedc3733b3751ea0d6d34c349a955b50351b1a2c2
+EBUILD gpsd-3.25.ebuild 6387 BLAKE2B 70c809b4536acf564cef0e28c9f16ce170d1730f279c485017a4ebc6f840f59816ceaaa56f9faea7b804a4563a8449e0e02c46cdba092405396b6c2fd80890bb SHA512 c433d934a992ce2d75ea711d86b77d1ca7cdb6e988153dc9939f70c9dbb0766af88d3bd49f49b80ee4ab3cfff3e1efc7a2f6317f3a2bb1aafc3a7435cbb6a947
+EBUILD gpsd-9999.ebuild 6407 BLAKE2B 018bbb85f5bb580360715e36b7d1e48db34064c79886bd03a69d18201170a2ec831ae559c2dff3e379fe05ff3fc53634ced7465dc07e26965606025c2aaef3c1 SHA512 a5b75b0b6c4f2a6b431ff97d7a2f82ebb8ec58d806081677c00c62212de881e5c6741bf774a5c24574586805ba1833333139081525917e6c4ddfb44613288a50
 MISC metadata.xml 1029 BLAKE2B a8bd09a148ce75d7e8a390353834e87f05d4a21e4ac31a1264565c37bef7801542eef52955dae03470f7a8d965d7b2ae446014ad5c7b3a251aa3a9ad0bef0e9c SHA512 cad79d8d94442ecfca1cbe03c137e771d02999db08a494801c524edba6a6648a7b948a00c9f3ebf539f99fa58794acd09923bc077cf19ae126a64bfb4d1ff397
diff --git a/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild
deleted file mode 100644
index e2deae1550a1..000000000000
--- a/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_10 )
-SCONS_MIN_VERSION="2.3.0"
-
-inherit udev distutils-r1 scons-utils systemd toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
-fi
-
-DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
-HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
-
-LICENSE="BSD"
-SLOT="0/29"
-
-GPSD_PROTOCOLS=(
-	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
-	gpsclock greis isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip
-	oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq
-	superstar2 tnt tripmate tsip ublox
-)
-IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 +shm +sockets static systemd test udev usb X"
-REQUIRED_USE="X? ( python )
-	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
-	gpsd_protocols_isync? ( gpsd_protocols_ublox )
-	gpsd_protocols_ublox? ( python )
-	gpsd_protocols_greis? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	qt5? ( cxx )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/gpsd
-	acct-group/dialout
-	>=net-misc/pps-tools-0.0.20120407
-	bluetooth? ( net-wireless/bluez:= )
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	ncurses? ( sys-libs/ncurses:= )
-	ntp? ( || (
-		net-misc/ntp
-		net-misc/ntpsec
-		net-misc/chrony
-	) )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-	)
-	python? ( ${PYTHON_DEPS} )
-	gpsd_protocols_ublox? ( dev-python/pyserial )
-	gpsd_protocols_greis? ( dev-python/pyserial )
-	usb? ( virtual/libusb:1 )
-	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	$(python_gen_any_dep 'dev-build/scons[${PYTHON_USEDEP}]')
-	test? ( app-alternatives/bc )"
-
-# asciidoctor package is for man page generation
-if [[ ${PV} == *9999* ]] ; then
-	BDEPEND+=" dev-ruby/asciidoctor"
-fi
-
-python_check_deps() {
-	has_version -b "dev-build/scons[${PYTHON_USEDEP}]" || return 1
-}
-
-src_prepare() {
-	# Make sure our list matches the source.
-	local src_protocols=$(echo $(
-		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConscript | awk '{print $1}' | LC_ALL=C sort
-	) )
-
-	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
-		eerror "Detected protocols: ${src_protocols}"
-		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
-		die "please sync ebuild & source"
-	fi
-
-	# bug #807661
-	sed -i -e 's:$SRCDIR/gpsd.hotplug:$SRCDIR/../gpsd.hotplug:' SConscript || die
-
-	default
-
-	use python && distutils-r1_src_prepare
-}
-
-python_prepare_all() {
-	python_setup
-
-	# Extract python info out of SConscript so we can use saner distribute
-	pyarray() { sed -n "/^ *$1 *= *\\[/,/\\]/p" SConscript ; }
-	local pyprogs=$(pyarray python_progs)
-	local pybins=$("${PYTHON}" -c "${pyprogs}; \
-		print(list(set(python_progs) - {'xgps', 'xgpsspeed', 'ubxtool', 'zerk'}))" || die "Unable to list pybins")
-	# Handle conditional tools manually. #666734
-	use X && pybins+="+ ['xgps', 'xgpsspeed']"
-	use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"
-	use gpsd_protocols_greis && pybins+="+ ['zerk']"
-	local pysrcs=$(pyarray packet_ffi_extension)
-	local packet=$("${PYTHON}" -c "${pysrcs}; print(packet_ffi_extension)" || die "Unable to extract packet types")
-
-	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConscript ; }
-	pyvar2() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
-
-	# Post 3.19 the clienthelpers were merged into gps.packet
-
-	# TODO: Fix hardcoding https://gpsd.io/ for now for @URL@
-	sed \
-		-e "s|@VERSION@|$(pyvar2 gpsd_version | sed -e 's:\"::g')|" \
-		-e "s|@URL@|https://gpsd.io/|" \
-		-e "s|@DEVMAIL@|$(pyvar devmail)|" \
-		-e "s|@SCRIPTS@|${pybins}|" \
-		-e "s|@DOWNLOAD@|$(pyvar download)|" \
-		-e "s|@IRCCHAN@|$(pyvar ircchan)|" \
-		-e "s|@ISSUES@|$(pyvar bugtracker)|" \
-		-e "s|@MAILMAN@|$(pyvar mailman)|" \
-		-e "s|@PROJECTPAGE@|$(pyvar projectpage)|" \
-		-e "s|@SUPPORT@|https://gpsd.io/SUPPORT.html|" \
-		-e "s|@WEBSITE@|https://gpsd.io/|" \
-		"${S}"/packaging/gpsd-setup.py.in > setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	scons_opts=(
-		prefix="${EPREFIX}/usr"
-		libdir="\$prefix/$(get_libdir)"
-		udevdir="$(get_udevdir)"
-		rundir="/run"
-		chrpath=False
-		gpsd_user=gpsd
-		gpsd_group=dialout
-		nostrip=True
-		systemd=$(usex systemd)
-		unitdir="$(systemd_get_systemunitdir)"
-		shared=$(usex !static True False)
-		bluez=$(usex bluetooth)
-		libgpsmm=$(usex cxx)
-		clientdebug=$(usex debug)
-		dbus_export=$(usex dbus)
-		ipv6=$(usex ipv6)
-		timing=$(usex latency-timing)
-		ncurses=$(usex ncurses)
-		ntpshm=$(usex ntp)
-		pps=$(usex ntp)
-		python=$(usex python)
-		# force a predictable python libdir because lib vs. lib64 usage differs
-		# from 3.5 to 3.6+
-		$(usex python python_libdir="${EPREFIX}"/python-discard "")
-		qt=$(usex qt5)
-		shm_export=$(usex shm)
-		socket_export=$(usex sockets)
-		usb=$(usex usb)
-	)
-
-	if [[ ${PV} != *9999* ]] ; then
-		scons_opts+=( manbuild=False )
-	fi
-
-	use X && scons_opts+=( xgps=1 xgpsspeed=1 )
-	use qt5 && scons_opts+=( qt_versioned=5 )
-
-	# enable specified protocols
-	local protocol
-	for protocol in ${GPSD_PROTOCOLS[@]} ; do
-		scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) )
-	done
-
-	# bug #809260
-	python_setup
-}
-
-src_compile() {
-	export CHRPATH=
-	tc-export CC CXX PKG_CONFIG
-	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
-	escons "${scons_opts[@]}"
-
-	pushd "${P}" || die
-	ln -sf ../setup.py . || die
-	use python && distutils-r1_src_compile
-	popd || die
-}
-
-src_install() {
-	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install '')
-
-	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
-	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
-
-	# Cleanup bad alt copy due to Scons
-	rm -rf  "${D}"/python-discard/gps*
-	find "${D}"/python-discard/ -type d -delete
-	# Install correct multi-python copy
-	pushd "${P}" || die
-	use python && distutils-r1_src_install
-	popd || die
-}
diff --git a/sci-geosciences/gpsd/gpsd-3.24.ebuild b/sci-geosciences/gpsd/gpsd-3.25-r1.ebuild
index ea6badcf72b1..bbc8c829c5bd 100644
--- a/sci-geosciences/gpsd/gpsd-3.24.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.25-r1.ebuild
@@ -1,27 +1,28 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_10 )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
 SCONS_MIN_VERSION="2.3.0"
 
 inherit distutils-r1 scons-utils systemd toolchain-funcs udev
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
 HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
 
-LICENSE="BSD"
-SLOT="0/29"
+LICENSE="BSD-2"
+SLOT="0/30"
 
 GPSD_PROTOCOLS=(
 	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
@@ -29,14 +30,16 @@ GPSD_PROTOCOLS=(
 	rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt tripmate tsip ublox
 )
 IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 +shm +sockets static systemd test udev usb X"
-REQUIRED_USE="X? ( python )
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 selinux +shm static systemd test udev usb X"
+REQUIRED_USE="
+	X? ( python )
 	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
 	gpsd_protocols_isync? ( gpsd_protocols_ublox )
 	gpsd_protocols_ublox? ( python )
 	gpsd_protocols_greis? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	qt5? ( cxx )"
+	qt5? ( cxx )
+"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -59,14 +62,16 @@ RDEPEND="
 		dev-qt/qtnetwork:5
 	)
 	python? ( ${PYTHON_DEPS} )
-	gpsd_protocols_ublox? ( dev-python/pyserial )
-	gpsd_protocols_greis? ( dev-python/pyserial )
+	gpsd_protocols_ublox? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+	gpsd_protocols_greis? ( dev-python/pyserial[${PYTHON_USEDEP}] )
 	usb? ( virtual/libusb:1 )
 	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
 	$(python_gen_any_dep 'dev-build/scons[${PYTHON_USEDEP}]')
+	python? ( ${DISTUTILS_DEPS} )
 	test? ( app-alternatives/bc )"
+RDEPEND+=" selinux? ( sec-policy/selinux-gpsd )"
 
 # asciidoctor package is for man page generation
 if [[ ${PV} == *9999* ]] ; then
@@ -74,13 +79,14 @@ if [[ ${PV} == *9999* ]] ; then
 fi
 
 python_check_deps() {
-	has_version -b "dev-build/scons[${PYTHON_USEDEP}]" || return 1
+	python_has_version -b "dev-build/scons[${PYTHON_USEDEP}]" || return 1
 }
 
 src_prepare() {
 	# Make sure our list matches the source.
 	local src_protocols=$(echo $(
-		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConscript | awk '{print $1}' | LC_ALL=C sort
+		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' \
+		 "${S}"/SConscript | awk '{print $1}' | LC_ALL=C sort
 	) )
 
 	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
@@ -165,7 +171,7 @@ src_configure() {
 		$(usex python python_libdir="${EPREFIX}"/python-discard "")
 		qt=$(usex qt5)
 		shm_export=$(usex shm)
-		socket_export=$(usex sockets)
+		socket_export=True # Required, see bug #900891
 		usb=$(usex usb)
 	)
 
@@ -207,14 +213,21 @@ python_test() {
 	:;
 }
 
+python_install(){
+	mkdir -p "${T}/scripts" || die
+	grep -Rl "${D}/usr/bin" -e "/usr/bin/env python" | xargs mv -t "${T}/scripts"
+	python_doscript "${T}"/scripts/*
+	distutils-r1_python_install
+}
+
 src_install() {
-	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install '')
+	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usev udev udev-install)
 
 	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
 	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
 
 	# Cleanup bad alt copy due to Scons
-	rm -rf  "${D}"/python-discard/gps*
+	rm -rf "${D}"/python-discard/gps*
 	find "${D}"/python-discard/ -type d -delete
 	# Install correct multi-python copy
 	pushd "${P}" || die
diff --git a/sci-geosciences/gpsd/gpsd-3.25.ebuild b/sci-geosciences/gpsd/gpsd-3.25.ebuild
index c617497e8672..93bbf3abe0f0 100644
--- a/sci-geosciences/gpsd/gpsd-3.25.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.25.ebuild
@@ -20,7 +20,7 @@ fi
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
 HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
 
-LICENSE="BSD"
+LICENSE="BSD-2"
 SLOT="0/30"
 
 GPSD_PROTOCOLS=(
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 5e2024d52363..75899a3a66c3 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -4,7 +4,8 @@
 EAPI=8
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
 SCONS_MIN_VERSION="2.3.0"
 
 inherit distutils-r1 scons-utils systemd toolchain-funcs udev
@@ -20,23 +21,19 @@ fi
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
 HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
 
-LICENSE="BSD"
+LICENSE="BSD-2"
 SLOT="0/30"
 
 GPSD_PROTOCOLS=(
 	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
-	gpsclock greis isync itrax navcom nmea2000 oceanserver oncore
-	rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt tripmate tsip ublox
+	gpsclock greis isync itrax navcom nmea2000 oncore
+	sirf skytraq superstar2 tnt tripmate tsip
 )
 IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 selinux +shm +sockets static systemd test udev usb X"
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp qt5 selinux +shm static systemd test udev usb X"
 REQUIRED_USE="
-	X? ( python )
 	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
-	gpsd_protocols_isync? ( gpsd_protocols_ublox )
-	gpsd_protocols_ublox? ( python )
-	gpsd_protocols_greis? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
+	${PYTHON_REQUIRED_USE}
 	qt5? ( cxx )
 "
 RESTRICT="!test? ( test )"
@@ -60,14 +57,14 @@ RDEPEND="
 		dev-qt/qtcore:5
 		dev-qt/qtnetwork:5
 	)
-	python? ( ${PYTHON_DEPS} )
-	gpsd_protocols_ublox? ( dev-python/pyserial )
-	gpsd_protocols_greis? ( dev-python/pyserial )
+	${PYTHON_DEPS}
+	dev-python/pyserial[${PYTHON_USEDEP}]
 	usb? ( virtual/libusb:1 )
 	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
 	$(python_gen_any_dep 'dev-build/scons[${PYTHON_USEDEP}]')
+	${DISTUTILS_DEPS}
 	test? ( app-alternatives/bc )"
 RDEPEND+=" selinux? ( sec-policy/selinux-gpsd )"
 
@@ -77,13 +74,14 @@ if [[ ${PV} == *9999* ]] ; then
 fi
 
 python_check_deps() {
-	has_version -b "dev-build/scons[${PYTHON_USEDEP}]" || return 1
+	python_has_version -b "dev-build/scons[${PYTHON_USEDEP}]" || return 1
 }
 
 src_prepare() {
 	# Make sure our list matches the source.
 	local src_protocols=$(echo $(
-		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConscript | awk '{print $1}' | LC_ALL=C sort
+		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' \
+		 "${S}"/SConscript | awk '{print $1}' | LC_ALL=C sort
 	) )
 
 	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
@@ -97,7 +95,7 @@ src_prepare() {
 
 	default
 
-	use python && distutils-r1_src_prepare
+	distutils-r1_src_prepare
 }
 
 python_prepare_all() {
@@ -113,7 +111,7 @@ python_prepare_all() {
 		print(list(set(python_progs) - {'xgps', 'xgpsspeed', 'ubxtool', 'zerk'}))" || die "Unable to list pybins")
 	# Handle conditional tools manually. #666734
 	use X && pybins+="+ ['xgps', 'xgpsspeed']"
-	use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"
+	pybins+="+ ['ubxtool']"
 	use gpsd_protocols_greis && pybins+="+ ['zerk']"
 	local pysrcs=$(pyarray packet_ffi_extension)
 	local packet=$("${PYTHON}" -c "${pysrcs}; print(packet_ffi_extension)" || die "Unable to extract packet types")
@@ -137,6 +135,12 @@ python_prepare_all() {
 		-e "s|@SUPPORT@|https://gpsd.io/SUPPORT.html|" \
 		-e "s|@WEBSITE@|https://gpsd.io/|" \
 		"${S}"/packaging/gpsd-setup.py.in > setup.py || die
+
+	if [[ "${PV}" == *9999* ]]; then
+		# Distutils doesn't like the tilde
+		sed -i s/~dev/-dev/ setup.py || die
+	fi
+
 	distutils-r1_python_prepare_all
 }
 
@@ -162,13 +166,12 @@ src_configure() {
 		ncurses=$(usex ncurses)
 		ntpshm=$(usex ntp)
 		pps=$(usex ntp)
-		python=$(usex python)
 		# force a predictable python libdir because lib vs. lib64 usage differs
 		# from 3.5 to 3.6+
-		$(usex python python_libdir="${EPREFIX}"/python-discard "")
+		python_libdir="${EPREFIX}"/python-discard
 		qt=$(usex qt5)
 		shm_export=$(usex shm)
-		socket_export=$(usex sockets)
+		socket_export=True # Required, see bug #900891
 		usb=$(usex usb)
 	)
 
@@ -195,9 +198,9 @@ src_compile() {
 	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
 	escons "${scons_opts[@]}"
 
-	pushd "${P}" || die
+	pushd "${PN}"-* || die
 	ln -sf ../setup.py . || die
-	use python && distutils-r1_src_compile
+	distutils-r1_src_compile
 	popd || die
 }
 
@@ -210,6 +213,13 @@ python_test() {
 	:;
 }
 
+python_install(){
+	mkdir "${T}/scripts" || die
+	grep -Rl "${D}/usr/bin" -e "/usr/bin/env python" | xargs mv -t "${T}/scripts"
+	python_doscript "${T}"/scripts/*
+	distutils-r1_python_install
+}
+
 src_install() {
 	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usev udev udev-install)
 
@@ -219,9 +229,10 @@ src_install() {
 	# Cleanup bad alt copy due to Scons
 	rm -rf "${D}"/python-discard/gps*
 	find "${D}"/python-discard/ -type d -delete
+
 	# Install correct multi-python copy
-	pushd "${P}" || die
-	use python && distutils-r1_src_install
+	pushd "${PN}"-* || die
+	distutils-r1_src_install
 	popd || die
 }
 
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 29ea3b0b389e..96e666779331 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index 4ee055734139..df2452d04073 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -3,6 +3,6 @@ AUX lapack-3.12.0-test-summary.patch 822 BLAKE2B be2a941b02a444cf3e5d0edc387c239
 DIST lapack-3.11.tar.gz 7723909 BLAKE2B b3f8ec8cd439d790ba5869b8b071fe924a4ac53328bce77d46032602b45353670966ed9223324a0780aabc2e95624f439e03f90a89586f96afbe1374c4261bc5 SHA512 d2f23c5f6ae14fb868312a25235459bd0c04f4b43b82a5ade01314776ade9a75dc518a457eb58595f29f64cb0bb86f1a12ce8beea3ec87ef9caf49493ce29fb3
 DIST lapack-3.12.0.tar.gz 7933607 BLAKE2B dafb1f9a717f2cbc00a26f8cff2c7a1ebb720714fe6d7bd5fabb511a2f4af317165814340864c9d601e4e16c7762f643fbbafc058170ebcdc6529a9b4f2d70b6 SHA512 f8f3c733a0221be0b3f5618235408ac59cbd4e5f1c4eab5f509b831a6ec6a9ef14b8849aa6ea10810df1aff90186ca454d15e9438d1dd271c2449d42d3da9dda
 EBUILD lapack-3.11.ebuild 3438 BLAKE2B 53233fc499ed64ea2894de24a98fe9a3f9f4be980457640b9f808dff92529d4658f649df3821d66293c5a49b3582d50eaa43e704327bdecacd91df39210adb3c SHA512 f12cbd959ccbfadbbceb5ce37a0237dc69f31f7e80a389ed17f9ec4ca76a60af49d51eb6bf9bd5d5d9e62678b2b7047378bd279e88fa54336aa0b46bd0124b8e
-EBUILD lapack-3.12.0-r1.ebuild 3771 BLAKE2B 8637e3fd104c65753f898bf657fb296ba771c0b2916b89a281ee2f3995ee503fa074b20b68175a783d7e20d6bb63068f33a3dbfa97d8fcfce3733081b1fb5f9c SHA512 c9541b580042ee20012900d76c49ac6c553d7773c26a604a1cb698d18f3c375f7a33cb344524abe90f8452c3c5227295572d610462ca1e3efcd730e22afd6beb
+EBUILD lapack-3.12.0-r1.ebuild 3771 BLAKE2B 46f1f1974c81f3c205fd3a08305d881f6f8c370e66d0e6319349ac47258cb025a0bba7764f71564b009c5a14ea449d9e8f623ae3e046e93b692893c93b86c7df SHA512 b02cd2531bc34c641451ea46b339a5dec566bf5928f776e28ddad076e71c9fc188174141ce1cd48594cd07108047410499266957c27b34133d20639e41b11d0a
 EBUILD lapack-3.12.0.ebuild 3547 BLAKE2B 4a5c295efd2d0bb7edc523bede66a9fb7d7e10d95183a3cbd22c17f84c6c72d167f6228f585e8ba37ea76875ebffeea240602b41b68c37d64a46c2dc649fb166 SHA512 da82c1a22d1aa446f89f059c4bb992dc9c549ee96fd805cfff41eec2e1a730e6eaea3c060aede4163a46ee648d2b38ebc85e21ae0c738f146e427249c4fd89f9
 MISC metadata.xml 1583 BLAKE2B 8db26f3744a6ee5f88f7ad37e749843eb8b63cd11af4182dd9d6408a854a5b060a651abd5f2f2098252a38b68b34c464a99f9654be9e6cba8f444eff23e4e297 SHA512 d8e8eb140e1a05f297b9e6edcc9aeb48e958baa7741be2a693ea4fca1a6d3f66a60d72c4c61e2dac8b8efd6210daf10ea9350fdbcfbaf801ac6366d0025ad2ca
diff --git a/sci-libs/lapack/lapack-3.12.0-r1.ebuild b/sci-libs/lapack/lapack-3.12.0-r1.ebuild
index c8770940f40e..3432143696f3 100644
--- a/sci-libs/lapack/lapack-3.12.0-r1.ebuild
+++ b/sci-libs/lapack/lapack-3.12.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 # Some additional tests are run if Python is found
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit cmake flag-o-matic fortran-2 python-any-r1
 
 DESCRIPTION="BLAS, CBLAS, LAPACK, LAPACKE reference implementations"
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 1981a9cf1a33..78329d77fd8a 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 8377fc39f4fe..994e7a2f7d98 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -2,5 +2,5 @@ AUX 60singular-gentoo.el 298 BLAKE2B 5b42e2083037e2ff2ace5597ddebfb079920e09ed91
 AUX singular-4.3.2_p16-lto.patch 825 BLAKE2B e5adfbb5febd9722330362815be23c49431a8953d17fb63669749971b8a0aba59f242a1ea17c5b06c5054146853e2f480eb74b91af4db80dac4c0101415275e7 SHA512 efd33048a125b8e3026583802ac5060947c2313c98cd4ba6046f2de62703a2923212b28a0f633ff801f58592b7deaef1f0f84c643f4131a0e672e12ff506008f
 AUX singular-4.3.2_p16-test-underlinking.patch 8292 BLAKE2B 9b63377bf203be189be2f4840f098f9b0ce72857030eb2ac8abc6d7f768b5c0e1fbc268c732b08811e8fdab77fd49c26463adadc764114dca23d4ca6eeac6225 SHA512 8fcccfdbb40904972a70ba11a3cc9f9d15852f370d842883d21a19bc7aea45feb7516037e49ff1396a9520e277d7c497c7394f339112332c6594b0205a1965c0
 DIST singular-4.3.2p16.tar.gz 20880476 BLAKE2B ce226a6867b764e593ddbf2c71220d9ea14ccdfd956046d5a94dfb768a97927ca3cf961a9ea808cb77028f2c65d989032202d3a0bde555ace945df1e987077a8 SHA512 1dae0e229e124db03e5e240c3ab2f1049c9f77cf369f701c4a2d0767ba9c23baab2d5d14271e415a3ccbf7b9a9297fcf324b8ccc2841a5156d6ee846cb409de2
-EBUILD singular-4.3.2_p16.ebuild 2625 BLAKE2B 6af469b319421cb9c95b99eb991cc13ae511d9c05e5be4d4f7369fce036c41757fac75c9b4467082df4c32dd6fcf31a841e4798ff94d47c7d85e164a63badb7b SHA512 bb1d9d7de957da3cca77ec1d0f8f03c130f08846548fca317fe7ce31d8ba24e773bbd118d2139ae384fbe9cfacfbaacff14321b0c23ecf04c207850f1e5808ee
+EBUILD singular-4.3.2_p16-r1.ebuild 2630 BLAKE2B abd50d631f7407043c5fc6a8748fb798a3548c643c5b88bf1303fa63a3da36753668cd9d8293a6659c52664d3c0e33fee5f90221ec56404a49c0f5514bf7602e SHA512 56f62d3035e33937f641e4242063f6176ab6cc4391f0575240ce06591fbb40f51efdcbd60c19be68c84fe2d2dc9295233613158e7be8f81020cf0622506bd654
 MISC metadata.xml 862 BLAKE2B a6e991149cb925158806177b1b4a76da2b747b3273b395c14455993a99f4cf83de141980303a068b9068983b8adf4da884b81e80546a3d2dd162f188dc759385 SHA512 9e40cf7b3841bcf8289f24903e392df2a812b6d815f71da41d95a81bb89f493ab1afcef749ef47960ba683dc3433d2c4488015990806dde0b560ffe3bb6ca545
diff --git a/sci-mathematics/singular/singular-4.3.2_p16.ebuild b/sci-mathematics/singular/singular-4.3.2_p16-r1.ebuild
index 740e1050ee78..ec9fb1763617 100644
--- a/sci-mathematics/singular/singular-4.3.2_p16.ebuild
+++ b/sci-mathematics/singular/singular-4.3.2_p16-r1.ebuild
@@ -27,14 +27,14 @@ IUSE="emacs examples polymake +readline"
 # The interactive help uses "info" from sys-apps/texinfo.
 RDEPEND="
 	dev-lang/perl
-	dev-libs/gmp:0
+	dev-libs/gmp:0=
 	dev-libs/ntl:=
 	sci-libs/cddlib
-	sci-mathematics/flint
+	sci-mathematics/flint:=
 	sys-apps/texinfo
 	emacs? ( app-editors/emacs:* )
 	polymake? ( sci-mathematics/polymake )
-	readline? ( sys-libs/readline )
+	readline? ( sys-libs/readline:= )
 "
 DEPEND="${RDEPEND}"
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 4258dc1707f6..848dfe26a850 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index efc6f0d70e0e..1060f4e66fb2 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -1,8 +1,9 @@
 AUX dtc-1.7.0-meson-macos.patch 1303 BLAKE2B 1b479891e150a990fb560aac8e74604ee97373ab7bb26f3171552bcad6c8c649e0c4a57630ab85bdcff1cf49c7318a3e154112be65e70a2fd078774d4ed17ed1 SHA512 ff70b6396410ad45dd49fb83cf2762ba081a8f221e9713934497b562b119951f0a50eb041680ba2318059537af54015047aacf03f38259005cfb86b0f002961f
 AUX dtc-1.7.0-meson-tests.patch 1265 BLAKE2B f121b676e2f711e6be75ff4f2c7a077b7e9efd682cd29dea08135958e8c9f29ce9b4ff42c1bfc22d77927d749d44264647e47e49d260a7760151fa1dae93648b SHA512 4afb9bc6b2615ba58ae5d997807563ec8672a9253a9d5a15ea5ed476ab1cf80229de3ca0289f2b016c31d6bb9adc2ecae46d004425244cc699768159b8929761
+AUX fix-tests-for-Python3.12.patch 1914 BLAKE2B bdb612e1aa3d42a6d17bf1663f40cec2ebc2222ebedcd67bcb6f20c4cdb389f9cc0c4f7513d56de659996f76d0311551dc0e513612cdd7cc367126ca26398de7 SHA512 2fc10469b4c1f5016cdccd1a1e24d1f0984267c88efe88d268d52d9a49c441d832f53bf004a5223810c82e0f10cf5b515d6a6ddb56e49ca5bb86b55724634f0b
 DIST dtc-1.6.0.tar.xz 158584 BLAKE2B 47b15b5df7f5d87369d6daaad87f2989a80865f2fab19f89d050d390a9f8319bcd86a36e12f7cc8d62947bb4d1335769071d0e3ea0a6e16861aea163e78f4696 SHA512 15433b24f1d6b7ed1f8066d050bd1bcbf988731aa38147564e3dd04b5f69af8d69e03befdc621a768526c620425a9bdd24aad4f9ff135930d6a1eeb0625f7de3
 DIST dtc-1.7.0.tar.xz 165548 BLAKE2B de433a1034b7ef75559bf39f85695d0b275cfd17bf100c12b6186e226a65659053f9b5a053f20e64a5a0670ea3e728edd0e624c26287bd264594569408065bab SHA512 d3ba6902a9a2f2cdbaff55f12fca3cfe4a1ec5779074a38e3d8b88097c7abc981835957e8ce72971e10c131e05fde0b1b961768e888ff96d89e42c75edb53afb
 EBUILD dtc-1.6.0.ebuild 1504 BLAKE2B f9159399aec94cb17d0920543031bd7c076f22bac9cce5ad8cb7f45d762d4ff67b287e35cbca287c1e3cd951be0cd01bc45dff3fa978990b064e827a0d43ee9f SHA512 89d8c7de7ef502b13874f4cdb48b0fd2a545f817ba568659a2e8741455a70a4a22406a58f59a8ebaddacceceb32df421b956113901e8c6071e52eb3cb3e99ddb
-EBUILD dtc-1.7.0.ebuild 1610 BLAKE2B b84a90679c2decf914e5990957aef4237ff03d31682faf2ad52c7193c86734a02a2ece35165e2385ead1f3147ed2f10bea9f8d7eb9f631d6e11f5286a283b30a SHA512 77080099ec63babd08559edef3b8c0187ffe481734aa4a93e252203de112623fc9d99854d3320c5c83b8d58549ab23d0b0842ccf0bbe43e19d61adf3a979a888
-EBUILD dtc-9999.ebuild 1529 BLAKE2B aa7b0c6f73db039a802f67bb51cf90dc1adf88f6f8df8bbb71f2b2817b22cfd9570d569eeed9c0c8a21cd74b2ef1a618cb297693017ff487d593a983783745e1 SHA512 7945f2fffb16faf25444962323b17f20023da742e2cba209c187777935c8220f026b78033bb6e9b4d30ca6742761a303d189780f5a1ac0a4d823e9ef37066eac
+EBUILD dtc-1.7.0.ebuild 1656 BLAKE2B 75d792778b89f1af2328c1246eaedac5f8da391c9d72a91765357080103102caf31205e82008bb761fa113380631b7b51d1bfc98110ec96c108031eabddbf6ff SHA512 4f78ed0eee341e1779f4b0b87afde3e6522848c49fec376995990879bb63eaa618e1dd8267397c7cc57f1038cff5da00314b0032f425339604b9628992176022
+EBUILD dtc-9999.ebuild 1529 BLAKE2B 72c6452b6b76364eccb0ae7176871cc669ecd5bce5764342f7c91402385e05fe15fd7feb7f32af78b6caaf43fa26af48a7810e4bb3b5f0969b40c2f6171111f8 SHA512 9705931992cf9b108532f79f5ce4dd0ee98dc464e9eef0a75694c0641cb1e00dace8ffdd9ec15a40a2c74acc362e5a644d529859a510d19f082590354673967b
 MISC metadata.xml 492 BLAKE2B dc331e157119b6db3bb419e04722511406295b39ee40bcae29dbbe3f8fa3737aa221c2d61b16b45b8361c1b6ffadd634ffa65377d33cc808d11a8128389bdfd0 SHA512 cf2441cf6ea1075cf633edf903a54a637cbaff2545ccd65290c1c1b3f5452ce3d74df5ce4ffe68ab15857eaea1ffeac7f3e80b42fb4dae3af1c3636e4b0766fb
diff --git a/sys-apps/dtc/dtc-1.7.0.ebuild b/sys-apps/dtc/dtc-1.7.0.ebuild
index f674774c831b..bcb50ad71a85 100644
--- a/sys-apps/dtc/dtc-1.7.0.ebuild
+++ b/sys-apps/dtc/dtc-1.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit meson python-single-r1
 
 if [[ ${PV} == 9999 ]] ; then
@@ -44,6 +44,7 @@ DOCS=(
 PATCHES=(
 	"${FILESDIR}"/${P}-meson-tests.patch
 	"${FILESDIR}"/${P}-meson-macos.patch
+	"${FILESDIR}"/fix-tests-for-Python3.12.patch
 )
 
 pkg_setup() {
diff --git a/sys-apps/dtc/dtc-9999.ebuild b/sys-apps/dtc/dtc-9999.ebuild
index dd2aadfad28a..ad87023887a3 100644
--- a/sys-apps/dtc/dtc-9999.ebuild
+++ b/sys-apps/dtc/dtc-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit meson python-single-r1
 
 if [[ ${PV} == 9999 ]] ; then
diff --git a/sys-apps/dtc/files/fix-tests-for-Python3.12.patch b/sys-apps/dtc/files/fix-tests-for-Python3.12.patch
new file mode 100644
index 000000000000..7a08648f3835
--- /dev/null
+++ b/sys-apps/dtc/files/fix-tests-for-Python3.12.patch
@@ -0,0 +1,43 @@
+Description: Python3.12 causes breakage for get_mem_rsv in pylibfdt.
+ 
+ Author: Héctor Orón Martínez <zumbi@debian.org>
+
+---
+
+Bug: https://github.com/dgibson/dtc/issues/123
+Bug-Debian: https://bugs.debian.org/1061318
+Bug-Ubuntu: https://launchpad.net/bugs/2051399
+Last-Update: 2024-01-30
+
+--- device-tree-compiler-1.7.0.orig/tests/pylibfdt_tests.py
++++ device-tree-compiler-1.7.0/tests/pylibfdt_tests.py
+@@ -418,9 +418,14 @@ class PyLibfdtBasicTests(unittest.TestCa
+     def testReserveMap(self):
+         """Test that we can access the memory reserve map"""
+         self.assertEqual(2, self.fdt.num_mem_rsv())
+-        self.assertEqual([ 0xdeadbeef00000000, 0x100000],
+-                          self.fdt.get_mem_rsv(0))
+-        self.assertEqual([123456789, 0o10000], self.fdt.get_mem_rsv(1))
++        if sys.version_info.major >= 3 and sys.version_info.minor >= 12:
++            self.assertEqual([0, 0xdeadbeef00000000, 0x100000],
++                             self.fdt.get_mem_rsv(0))
++            self.assertEqual([0, 123456789, 0o10000], self.fdt.get_mem_rsv(1))
++        else:
++            self.assertEqual([0xdeadbeef00000000, 0x100000],
++                             self.fdt.get_mem_rsv(0))
++            self.assertEqual([123456789, 0o10000], self.fdt.get_mem_rsv(1))
+ 
+     def testEmpty(self):
+         """Test that we can create an empty tree"""
+@@ -615,7 +620,10 @@ class PyLibfdtSwTests(unittest.TestCase)
+ 
+         fdt = sw.as_fdt()
+         self.assertEqual(2, fdt.num_mem_rsv())
+-        self.assertEqual([TEST_ADDR_1, TEST_SIZE_1], fdt.get_mem_rsv(0))
++        if sys.version_info.major >= 3 and sys.version_info.minor >= 12:
++            self.assertEqual([0, TEST_ADDR_1, TEST_SIZE_1], fdt.get_mem_rsv(0))
++        else:
++            self.assertEqual([TEST_ADDR_1, TEST_SIZE_1], fdt.get_mem_rsv(0))
+ 
+         # Make sure we can add a few more things
+         with sw.add_node('another'):
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index b158327f5ccd..99f8965850ad 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -1,5 +1,7 @@
 DIST ethtool-6.6.tar.xz 352476 BLAKE2B dfbc5f9a6ac63210d1ae305c2458cc44d38d44fcc272c9b0397a13a93e0aa0a09e3750e330a27dcf4dce796c6bd302c4d4c1fd91faab824a81949c31f1ed3504 SHA512 1e7eae3abe59e6af4bce0ebedd0a7ea84d1b0adc7693a0f03021c4096677096a022fdae521ac02413f9db46ee232b89dd2015a116845aa6ca7686fdda50a5b21
 DIST ethtool-6.7.tar.xz 352772 BLAKE2B 94a6fd8d29ff479eb894fe56bf991f522fff9af5a94c176d06be2819fe2520125cb48dbded229df1a9f5a0308aeaec503c55caf5d248eef87640c7f90f1132ec SHA512 07d13f9a8f980dab73c07e7c68179cfee272f53103c6dfbce1814b768e3313dc671a0cbefc63d4d53a616876bc1f96db8db2444617e4d58d741fae3acf0be524
+DIST ethtool-6.9.tar.xz 358640 BLAKE2B e04fa530084ad14abfea8c3802f272eb61eae9ee07aa2a12d16eeb77708b5ab021f1cdee10c24f83f77d65f2740ba5aceda99c21c47ef6cbcd65834af8334b00 SHA512 bc7e56a1a27a0679119491d6fce076e68374cf47a86fa4c0533851df0aa737cb9139920a9f3f3733deca672923d01bbb579f3d79bd17a2c6738f9f93aa469570
 EBUILD ethtool-6.6.ebuild 597 BLAKE2B 8b3815d7ae1c0299034324a1ed58f0279796941284df7d71a4c6238a30ebbe997c4250d538e4f7fcfb0e4e4e6ee2ae8bd3ec5d99526ec44bdc5b885ebd3e45b3 SHA512 3d4d11b7a5a392618b0214485baa852bad92dafba66b8f44c9abfd25052019b1d11840a842283344a8f83ae6806d83c0e8b33fdfdb0fb8418b0211528e1ba6dc
 EBUILD ethtool-6.7.ebuild 597 BLAKE2B 8b3815d7ae1c0299034324a1ed58f0279796941284df7d71a4c6238a30ebbe997c4250d538e4f7fcfb0e4e4e6ee2ae8bd3ec5d99526ec44bdc5b885ebd3e45b3 SHA512 3d4d11b7a5a392618b0214485baa852bad92dafba66b8f44c9abfd25052019b1d11840a842283344a8f83ae6806d83c0e8b33fdfdb0fb8418b0211528e1ba6dc
+EBUILD ethtool-6.9.ebuild 605 BLAKE2B bbd695bc614b44c12e38b08e026b1dbea5dc8aee84dccc9bafd56734ef1b2fc005a345b3fb5ea486828672c92738ca348372a246347934df80afd5475ca3dd22 SHA512 4f5ced2b28468b5c2d5833461bdc8746338d98355891a0f9a800aa214bfd075d193c1d1e44c550c8636121d069c444c770e66d4744e00a4ca32aa1edebaf922d
 MISC metadata.xml 993 BLAKE2B 92777546a5d0d904b319409448ce71991ddd4b89941888b19d2cb093b9f3227361fac1ef39535524a5bcb7b1cfd91c90fb4557d5501b46d44df64e647fb7d3aa SHA512 696f633f299189a01bc9ff309faac585a849323e0d471e1ddb7631bc917c83220844bae7ba1568a181b08029f4109bb2cf0c3063cee5f0d91705a04abe353793
diff --git a/sys-apps/ethtool/ethtool-6.9.ebuild b/sys-apps/ethtool/ethtool-6.9.ebuild
new file mode 100644
index 000000000000..e2e14f39f01b
--- /dev/null
+++ b/sys-apps/ethtool/ethtool-6.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
+HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
+SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+netlink"
+
+RDEPEND="netlink? ( net-libs/libmnl )"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/xz-utils"
+
+src_configure() {
+	econf $(use_enable netlink)
+}
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index b45dbfb43650..d00f2c4cf50b 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,5 +1,8 @@
 AUX findutils-4.9.0-dash-tests.patch 1196 BLAKE2B 36b35d9632e240882363de795b8b0fef236cdc95eda4d182f4bef2c166d0bd4897c5ec65ae62232cf1ff1ae99c5f8da3a00e570a1d61164f4f17d9146c974718 SHA512 9e3ecc4edeb4998849dbf1d5e053925809a7d4749ea4f19eb17a1794c98d7cb0b568151174083dbe278cbaf06cc13fcc13801b168a0e1f7812ebc54c6382e258
+DIST findutils-4.10.0.tar.xz 2240712 BLAKE2B 2eebdcb425c04170d17afb80e7270ba095bd691660d961dcfa731141633d3bb597d0b47d69ed17e891ef884a36d4c232885097e45b41d3d3ac79dbeae6ee2282 SHA512 b8b683d21cd26c6da4f41c56e83cadbda4780f8610a2bbd4b4e34bb1f339c3209721974b03e076d5eef0331fd876d947b398197aad37c29bbcc2e0405c641b34
+DIST findutils-4.10.0.tar.xz.sig 488 BLAKE2B fadd7dbf80a52965d6da641bda21ce00790623cf2c959ed03c1193a22c19f30417733511a739edcb1a0a97892a1257e0e88e32d872f94e71e3ade04776337d3c SHA512 a835153a0671309021be187bf78afee58d9682acb40545aaa9dd187f0ebdea0cfa5583bd03f363243633ea056ddb0a7a6603987ab5e34a608426cb4265ac6d8f
 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.10.0.ebuild 2347 BLAKE2B 7a7c138f7ead545c3c9885f64aa703491539205ffe5d8a908f9d4819a67b9aeed3256fb9f6bd33c59c923c578c7b09219c03517cbc97a93784a2a9805944f84b SHA512 1b207e2c778e0d2f698d16182f5d9a72dac01316706e1d5ee7ece66de91eeae40b9ca5167daa0e866380fa68dc5162c5e73675dabda0bd02e2306f0f2a6b0d84
 EBUILD findutils-4.9.0-r2.ebuild 2396 BLAKE2B cbe790df642bd27f266854bd1b608fa8e65700147b64bcfb4677cca440020c2fa201da7ae6d88538533ac91a1b259eb026c05b5a833fa404d1353d3a0b8119c9 SHA512 cf654ce1aed5809b1a78f61487013929d0450a49efb4e245bcfb826f60400bb1714bbcf29c696113c01c304797f7072b0a928979eb5d6af81bf66545769387de
 MISC metadata.xml 383 BLAKE2B 19523d687c23d0f2e1edc4f9f9f183642d34717f29e0ddb0215c3fecabc4af9eb36443451044dd41e0b379c5b69d11ea60332f777c4ebc17dd8569483b88e3b2 SHA512 355aca11f02d0770f684a423dad09a107b28f4d4bcfdbede4b5dd80523803fe6f0d03dea23569c1d728a51c7545ee3ac041068492038ace55093d738f81d04d1
diff --git a/sys-apps/findutils/findutils-4.10.0.ebuild b/sys-apps/findutils/findutils-4.10.0.ebuild
new file mode 100644
index 000000000000..fd4180661649
--- /dev/null
+++ b/sys-apps/findutils/findutils-4.10.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/findutils.asc
+inherit flag-o-matic python-any-r1 verify-sig
+
+DESCRIPTION="GNU utilities for finding files"
+HOMEPAGE="https://www.gnu.org/software/findutils/"
+SRC_URI="
+	mirror://gnu/${PN}/${P}.tar.xz
+	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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="nls selinux static test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	selinux? ( sys-libs/libselinux )
+	nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	test? (
+		${PYTHON_DEPS}
+		dev-util/dejagnu
+	)
+	verify-sig? ( sec-keys/openpgp-keys-findutils )
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Don't build or install locate because it conflicts with mlocate,
+	# which is a secure version of locate. See bug #18729.
+	sed \
+		-e '/^SUBDIRS/s@locate@@' \
+		-e '/^built_programs/s@ frcode locate updatedb@@' \
+		-i Makefile.in || die
+
+	default
+}
+
+src_configure() {
+	if use static; then
+		append-flags -pthread
+		append-ldflags -static
+	fi
+
+	append-lfs-flags
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00050.html
+		# https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00051.html
+		append-cppflags '-D__nonnull\(X\)='
+	fi
+
+	local myeconfargs=(
+		--with-packager="Gentoo"
+		--with-packager-version="${PVR}"
+		--with-packager-bug-reports="https://bugs.gentoo.org/"
+		$(use_enable nls)
+		$(use_with selinux)
+		--libexecdir='$(libdir)'/find
+		# rename to gfind, gxargs for better BSD compatibility
+		--program-prefix=g
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# We don't build locate, but the docs want a file in there.
+	emake -C locate dblocation.texi
+	default
+}
+
+src_test() {
+	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict /
+	default
+}
+
+src_install() {
+	default
+
+	# symlink to the standard names
+	dosym gfind /usr/bin/find
+	dosym gxargs /usr/bin/xargs
+	dosym gfind.1 /usr/share/man/man1/find.1
+	dosym gxargs.1 /usr/share/man/man1/xargs.1
+}
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 5555ccda3448..8ddbbb6c1333 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -4,8 +4,6 @@ AUX profile_display.local 158 BLAKE2B 7bb73bfa3d1a6556f9e4840e425e0bb2ee6a1e9510
 AUX profile_patch.local 198 BLAKE2B 6a84eca54c8fa5429b171707d6d2b7617c918798f40a1ea26fd1c6778a3688aa1db2be9d74025b7b8b863969c94c22de92a610d2b872b37ba216377f50f0ceae SHA512 86829f6b4867564447d06c73119a38e4ae7b5a386253229d5d0603398b9ed4ca64714221fa8aee8a9660644c3c38d762386a7a5a161fb717e6b7d7df723aa9ad
 AUX profile_pdftotext.local 132 BLAKE2B 2c98ecf386cdceae4cbaf4e3623187c66ff81540d86f978467a6a0106d57a0f41f7626f1049602fee8b7545fa413ed6ca8e21e1fb1448a374b8d80e6ae72451b SHA512 c0121f1ba4db0a737acdd250834ccd73fcd441b5d7f8d5740f75230edbb10bd6bb038dd09772ba21cb24cf4224a474749a2e0f3d0e9567b4e207f4adf67c19d0
 AUX profile_wget.local 128 BLAKE2B d2069517fce414faec2b23f8704fe15683a956af210e6e39321ca9f65bde939c71a7980506fdd3b01a6b15fb6733ebb013c684a63589839c60c53616a52ca5b6 SHA512 ef0b97b11fac742464b6520c6e6293017519b84c137c4aa60976b53b3d072bc9a69588267ac0a79c9647cee1e802fb0cd0d28e1647778e30473518415ce4d699
-DIST firejail-0.9.70.tar.xz 485096 BLAKE2B d5164ba5ee08e80415a84999e4152f1f9c897f50def669731098126cec117aed3cf4b21603aeb13ccbdb1bffa9d48de69dcb19fe7135691e891b9b83f48a5ca1 SHA512 a790ccb711da6c3e52677011d7eb38c482ffb5066498d4586018671ab4ee533e02edb31fda872e0647fd27c00014b04305eafcb56f1f1b07f470aa4fb701cbe5
 DIST firejail-0.9.72.tar.xz 503192 BLAKE2B 3d57b345476cb62399859622c88f5d6c22842da5894045c09bc7d84229ec2a01c494e4e9393b6fba6c668f73c6b7046f9a014a315baa5bc56d1479b9cad178a7 SHA512 846fa5caf6e68c669f76a07d6321ed365bf3c45f7992e8be3784ed99ef508ea8dffc5d6cc5da75eeb37964ad358d61b7959e8590051950951de8ca904d8a49de
-EBUILD firejail-0.9.70.ebuild 3046 BLAKE2B 48f9fc8719e87d123dbb65b2dcc7856c4a6fd5f33c309cef18e4d643b94089fb8af97bd9bf214722fa1255853477839495b71d9dedb7ea7ab5ae66ca702f31cb SHA512 28a1c279e453a27b57a2759f9624bbfbb6d9c372bba58b4fb33a2a1e440dbc3b97b23449bffee9102d869c881f2743930c68fcf45335103017b7439c2cec37a8
 EBUILD firejail-0.9.72.ebuild 3567 BLAKE2B 256542643d8cae9c808bb56dd8513ef53cdeacc25cdbf6cee6ef6d3a26fe6bae4cdbcbfb7a146cdf4e40bd99729cd4dfb349d584f77bb8357372f16c14ad9ce8 SHA512 80e279a187cbf556cae30db5104494b2f43d614de89f52c7fb9140056cc72db7885b1b5443101eeec81813b02df16d25f722528436b9d82b063fd38ec692697a
 MISC metadata.xml 1674 BLAKE2B ccb5e94f6e55a8d1864cb6a1d15239ed0a5dd76173a9c20c1162bb55f1ca97e48f1c09902d429bd1086c7b1b014a146c9eb27f0115941e6f7a44cf8aff690e27 SHA512 e8b6c84d5413f6dd33cfe60c111e51a59c89dc95f874c02e38451639ebd05646e49421852cedeef1f101309d73f2aabf6dea1da664f1a6596fce00c0bb2fffae
diff --git a/sys-apps/firejail/firejail-0.9.70.ebuild b/sys-apps/firejail/firejail-0.9.70.ebuild
deleted file mode 100644
index a35fe516d656..000000000000
--- a/sys-apps/firejail/firejail-0.9.70.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit toolchain-funcs python-single-r1 linux-info
-
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/netblue30/firejail.git"
-	EGIT_BRANCH="master"
-fi
-
-DESCRIPTION="Security sandbox for any type of processes"
-HOMEPAGE="https://firejail.wordpress.com/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home test +userns X"
-# Needs a lot of work to function within sandbox/portage
-# bug #769731
-RESTRICT="test"
-
-RDEPEND="!sys-apps/firejail-lts
-	apparmor? ( sys-libs/libapparmor )
-	contrib? ( ${PYTHON_DEPS} )
-	dbusproxy? ( sys-apps/xdg-dbus-proxy )"
-
-DEPEND="${RDEPEND}
-	sys-libs/libseccomp
-	test? ( dev-tcltk/expect )"
-
-REQUIRED_USE="contrib? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-envlimits.patch"
-	"${FILESDIR}/${P}-firecfg.config.patch"
-	)
-
-pkg_setup() {
-	CONFIG_CHECK="~SQUASHFS"
-	local ERROR_SQUASHFS="CONFIG_SQUASHFS: required for firejail --appimage mode"
-	check_extra_config
-	use contrib && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	find -type f -name Makefile.in -exec sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' {} + || die
-
-	sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die
-
-	# fix up hardcoded paths to templates and docs
-	local files=$(grep -E -l -r '/usr/share/doc/firejail([^-]|$)' ./RELNOTES ./src/man/ ./etc/profile*/ ./test/ || die)
-	for file in ${files[@]} ; do
-		sed -i -r -e "s:/usr/share/doc/firejail([^-]|\$):/usr/share/doc/${PF}\1:" "${file}" || die
-	done
-
-	# remove compression of man pages
-	sed -i -r -e '/rm -f \$\$man.gz; \\/d; /gzip -9n \$\$man; \\/d; s|\*\.([[:digit:]])\) install -m 0644 \$\$man\.gz|\*\.\1\) install -m 0644 \$\$man|g' Makefile.in || die
-
-	if use contrib; then
-		python_fix_shebang -f contrib/*.py
-	fi
-}
-
-src_configure() {
-	econf \
-		--disable-firetunnel \
-		--enable-suid \
-		$(use_enable apparmor) \
-		$(use_enable chroot) \
-		$(use_enable dbusproxy) \
-		$(use_enable file-transfer) \
-		$(use_enable globalcfg) \
-		$(use_enable network) \
-		$(use_enable private-home) \
-		$(use_enable userns) \
-		$(use_enable X x11)
-
-	cat > 99firejail <<-EOF || die
-	SANDBOX_WRITE="/run/firejail"
-	EOF
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	default
-
-	# Gentoo-specific profile customizations
-	insinto /etc/${PN}
-	local profile_local
-	for profile_local in "${FILESDIR}"/profile_*local ; do
-		newins "${profile_local}" "${profile_local/\/*profile_/}"
-	done
-
-	# Prevent sandbox violations when toolchain is firejailed
-	insinto /etc/sandbox.d
-	doins 99firejail
-
-	rm "${ED}"/usr/share/doc/${PF}/COPYING || die
-
-	if use contrib; then
-		python_scriptinto /usr/$(get_libdir)/firejail
-		python_doscript contrib/*.py
-		insinto /usr/$(get_libdir)/firejail
-		dobin contrib/*.sh
-	fi
-}
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 2434df469a50..67c30c6213f8 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,9 +1,7 @@
 AUX conf.d-pciparm 988 BLAKE2B c51b826806c58411939d8987e103cba5775806abcbf12a9320cdba2d410dde4f2b3198b4e07d3341b2b7fcafcfd6cafea648909bdaa4976703c764d5d4a0e312 SHA512 7c3513a9112318736907f4a1f3e94910d59752d8f51cf4f9f8ccd33b563250aca17a507e0937507bd9352d12a2b9a47e7419306908990b21a3460e6527dab6a4
 AUX init.d-pciparm 1758 BLAKE2B a9dd930da942c73d7a150938b2b58543f517542c4c675334cca8f9eb02b83dad456e36ae1bf77ed8fcc0eac52e0dc638f19a41682fa3e1d3623011d09301945b SHA512 c5a527236039edf29f6876d3b07909045dd04e40d863d68014dd96cc021b7b61356470e67541b5b68487d996a299b60b3da46272259f9d0724ea1392e6243646
 DIST pciutils-3.10.0.tar.gz 931711 BLAKE2B 2e1255eb5508c9d1339f5bc772c2592a03cae4d8d097e8939748c9bb5d5d949be53d705d1b7d903f7ea88b2abeea91e39de16e39d2f46f0a1f62f8a9e32c6faa SHA512 3da1af4af8b0fa3cf4d3f06095524e25dc292182beec10aa2c16c5c6ba751fe469d0e7f54e43413b6f3f5bcdbd1fba3c66df1d8e39d2e1962ae36a2d9c06238e
-DIST pciutils-3.11.1.tar.gz 660457 BLAKE2B 447d0e3fa209d2d27a0310a5824a75b543b539c459caed23e9218f4ff3f9a3c2a99c65dd5ddf92a56c2b880ecfaeff6f3edc458c3e5973a1a4937325740915ac SHA512 6bbb248364831a384a2f521d7300cc53b046ce3765c3f7aca08c9e839174b02687543ee697b8ffc24258bcd39ac625d1ce53d6ca02fdc718eea86a50c95a33de
 DIST pciutils-3.12.0.tar.gz 668358 BLAKE2B 6d57b0654a26e959d2a953a102fd616ba0a0a183ec6d40f65a1274ad33330df9c81b95d4b2274edc240cbcf576ce93a0b61252bae0b6348a29df659b3fc219eb SHA512 b1efd3e24efad4f80e1a942d23d6ea12acec9642714e47d24bff7f7c53ff475b0252c6f75c0053b7ec64635037e72b150b3e313229b36479dc0cbf96902096c5
 EBUILD pciutils-3.10.0.ebuild 4905 BLAKE2B fc998bbc04dd08d1707890bafc62deaa9a282640a7ca946b37e24841b2bf00205d4ee18678786a3616293fa211a1ada48da41bd564e0d6716cd5c7ab2edf2fe0 SHA512 5435ab9fef31732c00f278c4ba19501f99cb13aa2ab84974bef5571798121747c2a9cf68c1d20b4d4a0ea2db4f93b842f7149ac46ab3ed615a5793209c97f297
-EBUILD pciutils-3.11.1.ebuild 4913 BLAKE2B 301520e077afbd9406e5f330b1a3013d8e89cacaa8f72757da44935db7c9b532cc732e4131366db4b79972df85ecc5df0219c7a46f7e0f39796baa99499421e4 SHA512 8e1d393c8c32b3dde40fd0f80f1a99284cc24c8f4ed1a80c34d7f0fff830947ee7e04328d1ad47bbf9ded42f57bd4d831d846af0d27c23c2821ba10b0d6c4cbe
 EBUILD pciutils-3.12.0.ebuild 4906 BLAKE2B 7f34d5ff16c89d7fe6112c252b0db3d6afa919d037d82709ef8fc1e4decd17e1c813653baa873dc3d195bf543ae2198ccf8229b5c3143c7c846cda26ae00682e SHA512 ea32c95dbffc4fe0d5a0e04a482355b5e59ba78f2c0ee3a190e99b7d384fed6673433b6b7cd05bbba370b54ada69d3fd0051b8bd924da3a781fa1669ce96777a
 MISC metadata.xml 616 BLAKE2B 0aefbd7995f4bf549cba3e9c60066675efb8dc8e4d38e320c8cb28f7f6a275527e90d2526248c57fd34d09125693e3f185f51c05d0ae10fd8a61d058d4f8a9d0 SHA512 5f44a15a2a18a40ac7a46a5c1dfed741082e48321d5ee3f53bebb6b12e310ea05070e03853cf15655ef800a768d49515f174e3a73ca923177ce0be3963154a59
diff --git a/sys-apps/pciutils/pciutils-3.11.1.ebuild b/sys-apps/pciutils/pciutils-3.11.1.ebuild
deleted file mode 100644
index dd3c7a05627e..000000000000
--- a/sys-apps/pciutils/pciutils-3.11.1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs multilib-minimal flag-o-matic
-
-DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
-SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="dns +kmod static-libs +udev zlib"
-REQUIRED_USE="static-libs? ( !udev )"
-
-# Have the sub-libs in RDEPEND with [static-libs] since, logically,
-# our libpci.a depends on libz.a/etc... at runtime.
-LIB_DEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )"
-DEPEND="
-	kmod? ( sys-apps/kmod )
-	udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )
-	static-libs? ( ${LIB_DEPEND} )
-	!static-libs? ( ${LIB_DEPEND//static-libs([+-]),} )
-"
-RDEPEND="
-	${DEPEND}
-	sys-apps/hwdata
-"
-# See bug #847133 re binutils check
-BDEPEND="
-	|| ( >=sys-devel/binutils-2.37:* sys-devel/lld sys-devel/native-cctools )
-	kmod? ( virtual/pkgconfig )
-"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
-
-switch_config() {
-	[[ $# -ne 2 ]] && return 1
-	local opt=$1 val=$2
-
-	sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
-	return 0
-}
-
-check_binutils_version() {
-	if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]] && ! tc-ld-is-gold && ! tc-ld-is-lld ; then
-		# Okay, hopefully it's Binutils' bfd.
-		# bug #847133
-
-		# Convert this:
-		# ```
-		# GNU ld (Gentoo 2.38 p4) 2.38
-		# Copyright (C) 2022 Free Software Foundation, Inc.
-		# This program is free software; you may redistribute it under the terms of
-		# the GNU General Public License version 3 or (at your option) a later version.
-		# This program has absolutely no warranty.
-		# ```
-		#
-		# into...
-		# ```
-		# 2.38
-		# ```
-		local ver=$($(tc-getLD) --version 2>&1 | head -n 1 | rev | cut -d' ' -f1 | rev)
-
-		if ! [[ ${ver} =~ [0-9].[0-9][0-9] ]] ; then
-			# Skip if unrecognised format so we don't pass something
-			# odd into ver_cut.
-			return
-		fi
-
-		ver_major=$(ver_cut 1 "${ver}")
-		ver_minor=$(ver_cut 2 "${ver}")
-
-		# We use 2.37 here, not 2.35, as https://github.com/pciutils/pciutils/issues/98 mentions
-		# because we've had other miscompiles with older Binutils (not just build failures!)
-		# and we don't want people running any unsupported versions of Binutils. An example
-		# of this is where glibc is completely broken with old binutils: bug #802036. It's
-		# just not sustainable to support.
-		if [[ ${ver_major} -eq 2 && ${ver_minor} -lt 37 ]] ; then
-			eerror "Old version of binutils activated! ${P} cannot be built with an old version."
-			eerror "Please follow these steps:"
-			eerror "1. Select a newer binutils (>= 2.37) using binutils-config"
-			eerror " (If no such version is installed, run emerge -v1 sys-devel/binutils)"
-			eerror "2. Run: . /etc/profile"
-			eerror "3. Try emerging again with: emerge -v1 ${CATEGORY}/${P}"
-			eerror "4. Complete your world upgrade if you were performing one."
-			eerror "5. Perform a depclean (emerge -acv)"
-			eerror "\tYou MUST depclean after every world upgrade in future!"
-			die "Old binutils found! Change to a newer ld using binutils-config (bug #847133)."
-		fi
-	fi
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_binutils_version
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && check_binutils_version
-}
-
-src_prepare() {
-	default
-
-	if use static-libs ; then
-		cp -pPR "${S}" "${S}.static" || die
-		mv "${S}.static" "${S}/static" || die
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# bug #640836, bug #852929
-	# Still broken in 3.10.0, see https://github.com/pciutils/pciutils/pull/144.
-	filter-lto
-
-	# bug #471102
-	append-lfs-flags
-}
-
-pemake() {
-	emake \
-		HOST="${CHOST}" \
-		CROSS_COMPILE="${CHOST}-" \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		RANLIB="$(tc-getRANLIB)" \
-		DNS=$(usex dns) \
-		IDSDIR='$(SHAREDIR)/hwdata' \
-		MANDIR='$(SHAREDIR)/man' \
-		PREFIX="${EPREFIX}/usr" \
-		SHARED="yes" \
-		STRIP="" \
-		ZLIB=$(usex zlib) \
-		PCI_COMPRESSED_IDS=0 \
-		PCI_IDS=pci.ids \
-		LIBDIR="\${PREFIX}/$(get_libdir)" \
-		LIBKMOD=$(multilib_native_usex kmod) \
-		HWDB=$(usex udev) \
-		"$@"
-}
-
-multilib_src_compile() {
-	pemake OPT="${CFLAGS}" all
-
-	if use static-libs ; then
-		pemake \
-			-C "${BUILD_DIR}"/static \
-			OPT="${CFLAGS}" \
-			SHARED="no" \
-			lib/libpci.a
-	fi
-}
-
-multilib_src_install() {
-	pemake DESTDIR="${D}" install install-lib
-
-	use static-libs && dolib.a "${BUILD_DIR}"/static/lib/libpci.a
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog README TODO
-
-	rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/man/man8/update-pciids.8* || die
-	rm -r "${ED}"/usr/share/hwdata || die
-
-	newinitd "${FILESDIR}"/init.d-pciparm pciparm
-	newconfd "${FILESDIR}"/conf.d-pciparm pciparm
-}
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 237d044c6265..f863b99ed629 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -1,11 +1,9 @@
-AUX 99-pcscd-hotplug-r1.rules 363 BLAKE2B 65049122751de2d50f60449cebaa948ce276680d969ef1a13700a3fc7577c90e24b96b69f2285389361aeb6dfbdd7f0eb49faa953855ba39473270aa530c395f SHA512 45c1d50175844b4f46d0a5a15855bfb929d4848f9570e92c3327a95fce7aeb11fda7cecd1c24338aed96b696134baa1715ab59ac578af7c11e43bbc73b27a990
+AUX 99-pcscd-hotplug-r2.rules 377 BLAKE2B a7dcc09ec990eb7022d0622d4d480e39f72b754bc332ad388d8e73ef800d387ff5ad5f309d8d47baf8f9b5c178bc2c2dd8ad3a1f45536157f260e8a9a57decda SHA512 ca5435113cfebe64f05f05e16a53e7d7a3a733c765a69ee9d7d74a0185aa38acd9378e2c2c817b04e5e3c1f5a0dff8761935d55ed8d6768a080c6e7e2058ab2e
 AUX pcsc-lite-1.8.11-polkit-pcscd.patch 744 BLAKE2B b9a846a989d1708a30bb62e93ab19fbf5cfe4c2c601d435b53a8933117d919a4fbac8835e68b895507840a25a9aab85e35f6b4c2e7461ec3c7893d483e12f759 SHA512 4f8b774ec888d51c0ad82431cb9d041be6b69af0bfa2a535c6b7e47afb0056147c08ab9265d7da2259a74347ceba9dba320ad0892d3a25797efc64b79113f4a5
 AUX pcsc-lite-1.9.8-systemd-user.patch 415 BLAKE2B dd29a0965167cde394e95bb751f6d193935234f15b2eb6ab03a1c70fb5c7fcf43d2c2b81be9c8c9e29d87affca68d1b236ea1db3fbb1ca7ddcd63e4e3da4c35c SHA512 8c1fde18596e1642aef08adb6a23be36930f0f1a6946c6e27b283cff6556afd75f54e6995ca0c62cbf86aa56157961637981cf046a04d17ede93518408ffe65a
 AUX pcscd-init.7 408 BLAKE2B 54e4995a169b7f816b0de9b409ae94a8328e792b50872d583988cc87ad20b5c2d20559f3702dc4525dcc46c4afabf817c1e76f4a080ca277f9ab01ebcf67441f SHA512 24fbd0fe2847f6c7bb961e4e0d9fa5197d408971fc33fa7652893ce9dbba958d19b02be7688afd4e9617520f93b6544af74968d6fcc3b31ad73b3ac585e87500
 AUX pcscd-udev 330 BLAKE2B 50e99953aec238fe98c6aee5219d3978b44d37c90ce74c9cb8e19b37c8677001e9b1b3701df8246bf051c6cf8b5c971f86bf1f580bfcbff270b8937328ca887d SHA512 06b672135fda9f83af4f030ff8078f8e1194ced529334c17c1a93f81ee9a5d4448bcea5ffec398f01d957a6607fbde7f69fbc23d727bb3ffad48a305cefe5c26
 AUX pcscd.conf 32 BLAKE2B 2407e00c654d7e259ebf69ab420800f5605cb3ead23eb4aa07317928c38b6328eae2e566fab84c8844fb80e8a165cd32982fee753498b20c7a750f52fbb1f995 SHA512 ae27cdab8a60201639b9d9aca2d7f760146a5c5238878a0ebb562740385bf58f04bbc37a19cd1a2c8c69ee463f10beecc6531dde733cb6a6d4b06816f54b1569
-DIST pcsc-lite-2.0.0.tar.bz2 799011 BLAKE2B d93fffebbe3daf389fcd8195c9fb3d76db64dbb98ac9c7ecd08338331389298e710ca71187cb73165868b0b5e66cb9735b60e22d508db1c1a81e04555103948a SHA512 4b34628d3269ae1859f19d2ab7eb74a76a55f3d76fbc9e4e420a081a065b1d0d7b98680552c7208f3265c684bed844afc6be1c2e5f103ad916ce7f38b52ee68c
 DIST pcsc-lite-2.0.1.tar.bz2 815103 BLAKE2B a9eea4a4da1a78fc22797b17c128889b2f7caf8c4aa02dd77f4ac79e4ec458fb0162578b5422552545cd39303750d5396f3687f8cfee7603fad8d60cb54ee1e8 SHA512 af007f00f43e8d897710580f6f27814c9e7d3ca489ff01edf2e3b979e46267915aa04d9c15f225a420fa681de936e42a1d4779d962717cf9a9f4a3d1ca31502b
-EBUILD pcsc-lite-2.0.0.ebuild 3348 BLAKE2B e631a5f8290d238b99c12846c824c408f6f03e0326589d9c8485c59829d1aa7512e806b6760db8b23ffe113ba10dceb099f2b5454e536394c960ddc724a723e2 SHA512 a62dd910e493483c30d6b9c65b627aecf3e3ec1979a41e1c2696f28296eef80bdad1b25b6d7473b6bd498c0af442e562d050b476c9c756595de4039389035ed2
-EBUILD pcsc-lite-2.0.1.ebuild 3348 BLAKE2B ab4c779003df5c234b83dddf62ec045d032faef917427406064765c46f21a403412c12cc60a827cc67204084e741375f4b66183a2e9bd36f0713726b5149bc74 SHA512 e421f379dfcfc7353d1bcdc9f65d4705d838d73b4291cbafc5a5829b19fc08c32d8b176ea3ac8019e4e62420f4347c096ac78ff112099aa52fa799d4b552f61a
+EBUILD pcsc-lite-2.0.1-r1.ebuild 3348 BLAKE2B 7383ca56e9a93ff11896c7610eb2ce8bdbac12154a9ed34bd0bcf10440c1ac96b992559b748f97e7209f3660af7c1170c4d9aca96c03facff867415360562548 SHA512 c3d29ebad8e80d54df5339b2860c0e560e8a5962abc16b8cbb28d6e6d6948eedb156171325e34cb04d4df3573515806f51ab7c0ba0ce3ee30076580e819951f4
 MISC metadata.xml 1147 BLAKE2B c89b7f5443b81af35a0debe239b95ffa3dea06c4e86c1cb3bfe50dfc81e49d32939ae2eaaabcc5b4c5947c69c8ae90ce278efafc324ff6ab10a9ed514fa0a8b3 SHA512 96aea50c57df7bf05d5e05d7dd19f985193638592526a1357680f3e3489c0680b38f2f732714a0726097e40503bf1573b5458d4917fbcf1cbfeb56953d05293f
diff --git a/sys-apps/pcsc-lite/files/99-pcscd-hotplug-r1.rules b/sys-apps/pcsc-lite/files/99-pcscd-hotplug-r2.rules
index fc612d5e25f3..218417932aa2 100644
--- a/sys-apps/pcsc-lite/files/99-pcscd-hotplug-r1.rules
+++ b/sys-apps/pcsc-lite/files/99-pcscd-hotplug-r2.rules
@@ -1,6 +1,6 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # We add this here so that it runs after ccid's and ifd-gempc's rules;
 # if we just added a pcscd-owned device, we hotplug the pcscd service.
-ACTION=="add", ENV{PCSCD}=="1", GROUP="pcscd", TAG+="systemd", ENV{SYSTEMD_WANTS}+="pcscd.service", RUN+="pcscd.sh"
+ACTION=="add", ENV{ID_SMARTCARD_READER}=="1", GROUP="pcscd", TAG+="systemd", ENV{SYSTEMD_WANTS}+="pcscd.service", RUN+="pcscd.sh"
diff --git a/sys-apps/pcsc-lite/pcsc-lite-2.0.0.ebuild b/sys-apps/pcsc-lite/pcsc-lite-2.0.0.ebuild
deleted file mode 100644
index 661385f197ba..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-2.0.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit python-single-r1 systemd tmpfiles udev multilib-minimal
-
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
-SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
-
-# GPL-2 is there for the init script; everything else comes from
-# upstream.
-LICENSE="BSD ISC MIT GPL-3+ 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"
-# This is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="doc embedded libusb policykit selinux systemd +udev"
-REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
-
-# No dependencies need the MULTILIB_DEPS because the libraries are actually
-# standalone, the deps are only needed for the daemon itself.
-DEPEND="
-	libusb? ( virtual/libusb:1 )
-	udev? ( virtual/libudev:= )
-	policykit? ( >=sys-auth/polkit-0.111 )
-	acct-group/openct
-	acct-group/pcscd
-	acct-user/pcscd
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-pcscd )"
-BDEPEND="
-	app-alternatives/lex
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
-	"${FILESDIR}"/${PN}-1.9.8-systemd-user.patch
-)
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-maintainer-mode \
-		--disable-strict \
-		--enable-usbdropdir="${EPREFIX}"/usr/$(get_libdir)/readers/usb \
-		--enable-ipcdir=/run/pcscd \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$(multilib_native_use_enable doc documentation) \
-		$(multilib_native_use_enable embedded) \
-		$(multilib_native_use_enable systemd libsystemd) \
-		$(multilib_native_use_enable udev libudev) \
-		$(multilib_native_use_enable libusb) \
-		$(multilib_native_use_enable policykit polkit)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dodoc HELP SECURITY
-
-	newinitd "${FILESDIR}"/pcscd-init.7 pcscd
-	dotmpfiles "${FILESDIR}"/pcscd.conf
-
-	if use udev; then
-		exeinto "$(get_udevdir)"
-		newexe "${FILESDIR}"/pcscd-udev pcscd.sh
-
-		insinto "$(get_udevdir)"/rules.d
-		newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
-	fi
-
-	python_fix_shebang "${ED}"/usr/bin/pcsc-spy
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
-	elog "the pcscd group, to avoid running as root."
-	elog
-	elog "This also means you need the newest drivers available so that the"
-	elog "devices get the proper owner."
-	elog
-	elog "Furthermore, a conf.d file is no longer installed by default, as"
-	elog "the default configuration does not require one. If you need to"
-	elog "pass further options to pcscd, create a file and set the"
-	elog "EXTRA_OPTS variable."
-	elog
-
-	if use udev; then
-		elog "Hotplug support is provided by udev rules."
-		elog "When using OpenRC you additionally need to tell it to hotplug"
-		elog "pcscd by setting this variable in /etc/rc.conf:"
-		elog
-		elog "    rc_hotplug=\"pcscd\""
-	fi
-
-	tmpfiles_process pcscd.conf
-
-	use udev && udev_reload
-}
-
-pkg_postrm() {
-	use udev && udev_reload
-}
diff --git a/sys-apps/pcsc-lite/pcsc-lite-2.0.1.ebuild b/sys-apps/pcsc-lite/pcsc-lite-2.0.1-r1.ebuild
index 5d5823a7adbb..a3a1b872c2cd 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-2.0.1.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-2.0.1-r1.ebuild
@@ -70,7 +70,7 @@ multilib_src_install_all() {
 		newexe "${FILESDIR}"/pcscd-udev pcscd.sh
 
 		insinto "$(get_udevdir)"/rules.d
-		newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
+		newins "${FILESDIR}"/99-pcscd-hotplug-r2.rules 99-pcscd-hotplug.rules
 	fi
 
 	python_fix_shebang "${ED}"/usr/bin/pcsc-spy
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index e2094beb9c2c..ddb44ab28303 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -11,8 +11,8 @@ DIST systemd-stable-254.10.tar.gz 14428960 BLAKE2B 488c27b9657ec7452f876ab6c18bb
 DIST systemd-stable-254.12.tar.gz 14529517 BLAKE2B ed6e4a78363930840e505c4bd789d1d44c238f30d3c0768d435e1cacb43ac3ab07e0dc9085546b4142152bbb4ceb4e2c0a9560e74e1a2b8c09fc885620695e73 SHA512 fa3679915392e641bed73ccb48f5def386ab13ba5ff7efdac952214193c3311543bec4c4370d6880f9599f63e377506b343805c3c56b7dde7eb5e3bbc0dc7a87
 DIST systemd-stable-254.13.tar.gz 14533359 BLAKE2B 6f37bf5f1868840f122652fdca270e1f97ba78f8280f45100b1b5b33c3531cf79587b596ccbbe594f1e623d918c1fdf19f2231d677e27b5421f1852fbe3225b3 SHA512 852cbc992128dc3ab6ded4215c2540fa3c0b7c7ad98e54036f3981d77a2162f5393ee50960773419133e0d584844af329d3726f45829a56c00b1827e33edf3e1
 DIST systemd-stable-255.4.tar.gz 14952427 BLAKE2B 27f5080f83a9e870fbe8e3ebcb500a63c42022f1f96f26f35c76eeeea85dab691291c31ee716cab330b76df5e576910a6a82f51267eff4f766b1d4c304d815c9 SHA512 8a2bde11a55f7f788ba7751789a5e9be6ce9634e88d54e49f6e832c4c49020c6cacaf2a610fe26f92998b0cbf43c6c2150a96b2c0953d23261009f57d71ea979
-EBUILD systemd-utils-254.10-r1.ebuild 13329 BLAKE2B a86c581f5fb3af69a590a994169aca5ded7d9cc34c07542ca86292991db5d39a023bd859c9b7bc1dfd9f8fde95b50348cd959c9e6bff08e94675a8753e16483d SHA512 b3f8c8d3c0647ee8701d7a6ebc921a0760540d8e38410fd6e8d257b6b6f11ceb72e1dc12e55df009a52f0d4e15ee7302a1d309bedef4da2a770ed625d0fc60e0
-EBUILD systemd-utils-254.12.ebuild 13337 BLAKE2B ca4405757ee54acc143f1f2af2c974cfd90c36a11681d62ee07f3da0c82972aa239dbb280c9bb179022f2da9628e1a37bbae5e0a9c186534e1bf0c937fed4502 SHA512 bcb56e7d0ca145789f7b293155937e7b7d7e3cbf4416b592aafac8fe64641014947606ac950102c6dc0c9371dbb080e4d0603fd915177127a57dcfa5559dc7cd
-EBUILD systemd-utils-254.13.ebuild 13337 BLAKE2B ca4405757ee54acc143f1f2af2c974cfd90c36a11681d62ee07f3da0c82972aa239dbb280c9bb179022f2da9628e1a37bbae5e0a9c186534e1bf0c937fed4502 SHA512 bcb56e7d0ca145789f7b293155937e7b7d7e3cbf4416b592aafac8fe64641014947606ac950102c6dc0c9371dbb080e4d0603fd915177127a57dcfa5559dc7cd
-EBUILD systemd-utils-255.4.ebuild 13753 BLAKE2B 96ae2f52c47ff4a22d5fe9c8d42bff6e70c00656c50cefc6353e9c96cfe58977b05c589567ef334f591ef0ee8459b44472c9ff06917227a5e563f0eba72d4540 SHA512 e2242b212c0f79cc2a06b0491fa1903b4381b2436dd5e8e844b8be9f39d3c01b8f351f6c20adb6e5d96f0cf1b5bd842e0751b93e44c9745bb637788be0dbd513
+EBUILD systemd-utils-254.10-r1.ebuild 13317 BLAKE2B b7694b1f3d640819a80c299ab825ebfc8b4c37d0b6b4f5dbb507af8b31534ffdcfd572132b3062ed93a146bb2173b4e04cebf0e09f9190025903d9ad11a02259 SHA512 c2bbf5f8b8b009386ae680b352c3b1ae3e16e445d21ecc84540d68ac4375b24bfbca9ffd3cc1d633c92a740b2c25b092c22221e527f64239872f122525a99441
+EBUILD systemd-utils-254.12.ebuild 13325 BLAKE2B d2653bcb36e4a3af84ea28c8ddd1fb5fbb6015a297d519827f3f2895366fb7e37217830470eb2e352ca47d197fee067fe075774c23946322afbcc9a59caf4969 SHA512 74de09c449345a8d3817a5b87a99ad66a0caec148e365da13b992cb0d2cd94426fc5db535b84b483361a0236e89a26814ae8cbac9972b6b721bc7aab855f67d6
+EBUILD systemd-utils-254.13.ebuild 13325 BLAKE2B d2653bcb36e4a3af84ea28c8ddd1fb5fbb6015a297d519827f3f2895366fb7e37217830470eb2e352ca47d197fee067fe075774c23946322afbcc9a59caf4969 SHA512 74de09c449345a8d3817a5b87a99ad66a0caec148e365da13b992cb0d2cd94426fc5db535b84b483361a0236e89a26814ae8cbac9972b6b721bc7aab855f67d6
+EBUILD systemd-utils-255.4.ebuild 13741 BLAKE2B b4ae33f57c5edcbba98c274ac65af9314f3eb10bc994377bf30bfff36acd7fb88cde52acd1e1e70f496852b98cf5890d6fad9cfb4d555074eb154e95d8a57334 SHA512 dc4468c9265b1c501fc708529ffcf770843e72b3a65545ff9618fb95712fad1d3fc953a2c03581e00e9ca7d95f88c9f4d1e4c89bb0814cf77988f34beab24222
 MISC metadata.xml 888 BLAKE2B b799e1d62a1208dbbec1a1cfb47592b069d5c79cb18efffef922c72b0d61e30938d26c6f4e0d3951f9c327601dd71de14062dad0a47e6b84a61b1a8b125f1a6b SHA512 6debd964f9c127ba4332e0c0b86e506d3cf10cbe3cd45442bf7955b16e790a9eccdd928d473b3722b11b4a75d34fe5bb91f4867a5dc92e786ba73d9ec3f54712
diff --git a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
index ca3697269cd2..b906b6110034 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
@@ -375,7 +375,7 @@ multilib_src_compile() {
 	fi
 	if use udev; then
 		targets+=(
-			udev:shared_library
+			libudev
 			src/libudev/libudev.pc
 		)
 		if use test; then
diff --git a/sys-apps/systemd-utils/systemd-utils-254.12.ebuild b/sys-apps/systemd-utils/systemd-utils-254.12.ebuild
index 9ba529076182..4e14021f3732 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.12.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.12.ebuild
@@ -375,7 +375,7 @@ multilib_src_compile() {
 	fi
 	if use udev; then
 		targets+=(
-			udev:shared_library
+			libudev
 			src/libudev/libudev.pc
 		)
 		if use test; then
diff --git a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
index 9ba529076182..4e14021f3732 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
@@ -375,7 +375,7 @@ multilib_src_compile() {
 	fi
 	if use udev; then
 		targets+=(
-			udev:shared_library
+			libudev
 			src/libudev/libudev.pc
 		)
 		if use test; then
diff --git a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
index 4c64afbd80c1..ea1032f738dc 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
@@ -384,7 +384,7 @@ multilib_src_compile() {
 	fi
 	if use udev; then
 		targets+=(
-			udev:shared_library
+			libudev
 			src/libudev/libudev.pc
 		)
 		if use test; then
diff --git a/sys-apps/xdg-desktop-portal-xapp/Manifest b/sys-apps/xdg-desktop-portal-xapp/Manifest
index 21e984264ffa..3eb32e090176 100644
--- a/sys-apps/xdg-desktop-portal-xapp/Manifest
+++ b/sys-apps/xdg-desktop-portal-xapp/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-desktop-portal-xapp-1.0.4.tar.gz 88429 BLAKE2B 7f45a252a5c0dd433238a58012c65369240e7974a93d3d2b5b73bdbc91509480977ad1ce381a6f4ee3a0c87bfabd11ce87bf99839018811a84378e54be1ef36f SHA512 3f861473a763c37a1af95e3beb13c3364a04f557310d5a6520845bc754941149eb3d80a4e2893699715ff11b135edb2859f6349b6aa6fbe0aa1e173263e22dba
-EBUILD xdg-desktop-portal-xapp-1.0.4.ebuild 806 BLAKE2B 714d9163aed078d2b82859a61744125dce309d2c487b6ae176d9c6911d584df31ee265831db03fb9d6056de22dbb78adf76484d3d009d3e6cbf4058a9b5b95b9 SHA512 dfb1f964ab78da32c43a2b10177a456d248f443014b9a68c4b3863b7911bdc2c574ec3ae846b968273384425916faac3e18da3e176c222fc9b93614c07772cfc
+EBUILD xdg-desktop-portal-xapp-1.0.4.ebuild 805 BLAKE2B 20f517488cbb30bb208b172c51368b534269b6d1fc35a1cb54b3bb9712c18a74b505a58fe2f2925ccc945d41256f4ad4ffe3b6ae28c745fe53a313c411cc7622 SHA512 617025a97676ebe35cdf298b0ac6b9cdb043dc9870f7c9fb50b53fb2ad36ba7557228fcff2cd2fef81fc995b243897bf6f2f969857e7724ecf25299a3b6e93d9
 MISC metadata.xml 503 BLAKE2B d18cb4ecc008c396116061965eb5a07fccdab52684891a4200da5141d7f2f26d519eef4c81980e05f86d8ab337e5b8aadc5da19ee73b951ff632cb0e998ff7bc SHA512 72cae90440ff0c8d50361d9a2bc5b9e1dc6c4e4f59e12197aeb664b75cfc1d38f5f00e2bb051c953451932198ce0bbb53e295f8391ddc9090b0cde26e06be98e
diff --git a/sys-apps/xdg-desktop-portal-xapp/xdg-desktop-portal-xapp-1.0.4.ebuild b/sys-apps/xdg-desktop-portal-xapp/xdg-desktop-portal-xapp-1.0.4.ebuild
index 9d6c9bec552a..837fea0d5546 100644
--- a/sys-apps/xdg-desktop-portal-xapp/xdg-desktop-portal-xapp-1.0.4.ebuild
+++ b/sys-apps/xdg-desktop-portal-xapp/xdg-desktop-portal-xapp-1.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxmint/xdg-desktop-portal-xapp/archive/${PV}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 DEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 311850b0c549..36452d1f6a78 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 936098763275..14bbb0f0aa96 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -28,6 +28,7 @@ DIST gcc-13.2.0-patches-16.tar.xz 44792 BLAKE2B 0b6b584d68e69685638695596b780249
 DIST gcc-13.3.0.tar.xz 87909952 BLAKE2B 0f3728b026bd8aab0e469dda54facf157a4b753d3405a74b0be6105a6e3a493d26df4007d90ae4e05d86277d41873312638f9589d1757cee80ca84de7f2099e3 SHA512 ed5f2f4c6ed2c796fcf2c93707159e9dbd3ddb1ba063d549804dd68cdabbb6d550985ae1c8465ae9a336cfe29274a6eb0f42e21924360574ebd8e5d5c7c9a801
 DIST gcc-14-20240518.tar.xz 87946040 BLAKE2B 83e567d680b1463cc672fb461aa180cf46555911f0e91a3fb89b11fe8b81d12d64b3a3419953849cf2deb38f1cdf0defc05169c145964f74c1105d942b5519f9 SHA512 73dae806add90e8b3cdfe1c56754ae886f6f6150ef4ef217664b48507ff19d20933648bb6a19ab62756146e83e4df037ced30e4504d562966c40b3750475f28f
 DIST gcc-14-20240525.tar.xz 87961136 BLAKE2B 89898dfb5ce7e135f02e88e476df6aa48d7f809ac695328d51d1dc8deec89537c0da80d542a0063d718aad45f10fc192d2540caeb0ba8f6aa61a88410de47166 SHA512 ad4a3ada606df91836a145b9b78d96251760a42ff6c879a558a16889f708aca3626dfbb2abbaff3c87107ea17a088a216dbe139399bd766ba8bb0b9231285f1c
+DIST gcc-14-20240601.tar.xz 87970588 BLAKE2B bd2ac4252b1fc7173bad17116249f66559a894888b844e41e3502cb370a3571ae5736e1a733d291656e16e753f80d77fc4c7377882eaea24035e63712f2609ce SHA512 ac8db89eef701f54b57581808833817d4c27e07e23a80d83f5a597003ae34297d22c7da807ea68985ae79f487b91f1fbc8d43b0e70864da2c0df8a8ceb800e52
 DIST gcc-14.1.0-musl-patches-1.tar.xz 3600 BLAKE2B 4cd920b7ca1f122cae806707564d8e45bfd48e78c88788a12a301f6068b5a5f335d8885e67479ac536c66aeaa81f2ecb7240ae56e9fc821a7246ab66b453711f SHA512 61c48d90a55dfc2129d96aee69d939d6a89f6407f69f7bd12c1a619f28989f471fd219d731958f8e62b0fd650c32300f0ad8dc06d5df23d9fc8c1a77fe210c25
 DIST gcc-14.1.0-patches-1.tar.xz 11584 BLAKE2B d483f4e3324acdc26b9837028d5e20ad0cdcf3ef4bcc78a6902d63ceebc7e5ff70c8163f6a8c8e36405df47c59dd2df506147c53ce51a8ec73494e65b5902647 SHA512 3d7aea113b594d1896c93e9e6be85f467488fa75de2800ed76eab2f87cef26829b235d1f361b187e38cf13b0fb9518cd4431c3106ec1e49d0f744e7eb703eaa0
 DIST gcc-15-20240519.tar.xz 88058724 BLAKE2B b9a9a93132fac8f827cd9f293fa09a4705084a420072da27161792a9c5f84a8fc9f28b15e878a5e7872579d4e89ae2e383b025d0529cf9e11c7f87454d61d62f SHA512 00eaf263d3eafb8b1ff101d703d9d82a770a79dd5484a6e69adb53889313ad300b65ac5159564950921985178546475cc26d760395ca68b4a6d4433ff26a6ffc
@@ -60,6 +61,7 @@ EBUILD gcc-13.3.1_p20240531.ebuild 1727 BLAKE2B 065a4591a1dfdd5dc6fa3a8ccf646a26
 EBUILD gcc-13.4.9999.ebuild 1722 BLAKE2B cabfc4c8611616f03565bdb7666005357f6fe7094efa4a14fde7537f859166e0e195865040fe5141cd9391b1e97fd6dd436cfda61e3cd8c6661cbe536bf5f653 SHA512 7bce4bb5e4ca395c954f0e458cb43453e31af06b1cba5dfb00f7915a442d83ae53a3c8500f0dd8e491ac1238e3d954ffff78e4b332cde912623689e44fe2c127
 EBUILD gcc-14.1.1_p20240518.ebuild 1619 BLAKE2B 45cf6627b223638287177489e67c70cbcb09bedacefcadbe0165c05270ee2d56459fe9bc1d209e84ebb9470a038ec75c7e57881bd7e202ae0aae66ef94bc3b98 SHA512 2ab7c3c0d46b690e60ebaa3582b71cc3b0cd7930767888699825674b82e680dddcb4ff40552ad77c9c1d576f21ad98e6255b46cf6e7dc21f10252f8a73db9308
 EBUILD gcc-14.1.1_p20240525.ebuild 1620 BLAKE2B a10ec2a07311f6cc493133883aedb1b9525a3b01397600e2d6e9e86f13a7d01a662545d962e5c5583f502257451c8c122c4afda0a36cd58fe8ca7952a9a98c5b SHA512 73649bcec11370de89a572bbbda1a1bb2dd0df68ca27e72a97b22b46558349f0aa643a656007f7c9619206e5eb112476e44043c563c7ed4747df014fd1a8a31f
+EBUILD gcc-14.1.1_p20240601.ebuild 1620 BLAKE2B a10ec2a07311f6cc493133883aedb1b9525a3b01397600e2d6e9e86f13a7d01a662545d962e5c5583f502257451c8c122c4afda0a36cd58fe8ca7952a9a98c5b SHA512 73649bcec11370de89a572bbbda1a1bb2dd0df68ca27e72a97b22b46558349f0aa643a656007f7c9619206e5eb112476e44043c563c7ed4747df014fd1a8a31f
 EBUILD gcc-14.1.9999.ebuild 1453 BLAKE2B caee7ba2e0323b0953b53c822cfe76c70eebd466d80575612ae6daffdfbdb663266a9272691b33c4396bf8c70c81cf3c64035d9c5159f1ba9ed1e231ce739c1f SHA512 b1cc3de6f9f03b6e6558824cec9c19c8b4c424c769f8d02c0675c20f6c687b2ac27fb8d19646feb221570611e35248b8c22334b9207d27c401a5c34a54e34652
 EBUILD gcc-15.0.0_pre20240519.ebuild 1402 BLAKE2B 9fa3487167283d7c6fe3f45dcf92bc5895bd261554dd5238fb42f0477de509e6d8843378831a0a2498827dbcd4b1cc887266292e2f30d80e4884761b654a94e5 SHA512 c6e5f95caa03472a0f030f8a0d84c29b226eadbb28bd542baca56dbe9b03121f1bfbe52a42d7b2700be00412b8b6f0d40292520352cbe25ac27114856f4a8e11
 EBUILD gcc-15.0.0_pre20240526.ebuild 1402 BLAKE2B 9fa3487167283d7c6fe3f45dcf92bc5895bd261554dd5238fb42f0477de509e6d8843378831a0a2498827dbcd4b1cc887266292e2f30d80e4884761b654a94e5 SHA512 c6e5f95caa03472a0f030f8a0d84c29b226eadbb28bd542baca56dbe9b03121f1bfbe52a42d7b2700be00412b8b6f0d40292520352cbe25ac27114856f4a8e11
diff --git a/sys-devel/gcc/gcc-14.1.1_p20240601.ebuild b/sys-devel/gcc/gcc-14.1.1_p20240601.ebuild
new file mode 100644
index 000000000000..05c6bd6ce397
--- /dev/null
+++ b/sys-devel/gcc/gcc-14.1.1_p20240601.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="14.1.0"
+PATCH_VER="1"
+MUSL_VER="1"
+MUSL_GCC_VER="14.1.0"
+PYTHON_COMPAT=( python3_{10..12} )
+
+if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# Don't keyword live ebuilds
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	# m68k doesnt build (ICE, bug 932733)
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+	BDEPEND="amd64? ( >=${CATEGORY}/binutils-2.30[cet(-)?] )"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch
+	eapply_user
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 9413ea7fcd08..7e3a52b4a928 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 04f3923235e3..68a29750d024 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,15 +1,11 @@
-AUX btrfs-progs-6.8-musl-1.2.5.patch 6548 BLAKE2B 6c49be6ca93f12772a98b109c13c70b66e52837f037a019d79aa56a3fc7863a8971319ee61215626873ec8e1704ddd69777922a53afe72577e1bd2e181747106 SHA512 d662d5d19bfa2458dc26c8b3fec3819b10a2f1192458f9ba036b50fad120da2ad3c65e85e69e8738d9d3747a65166b04548a0ad47ce8104f21925df5a00c5d7b
 DIST btrfs-progs-v6.6.3.tar.sign 566 BLAKE2B 9f8a14405f78c8eb5a92d59f9ca776cd15bfd43bc323a0f5a98cc2d9a6f782e999a792ddb266fef4dfe189e1cb8eebbd021a12b615e22bdd4097a74bf3b277a9 SHA512 07f062cf66c0e5f0bd833f0a1c9901ec06ac4eb258acec8e96ffbb0b85007a67bdc992492b25f6039fcf603352131fca8c57162fa61007e8ccf1f4edf71dab97
 DIST btrfs-progs-v6.6.3.tar.xz 2557216 BLAKE2B 274fad52bcab45bd0f6496c1bc10e1736e7b766f53b712790996a8a38f74eedcc570783599bed62cd4f84e5629f2216340a66941d9fbe0c7890f1c56ed66df8a SHA512 93e1defacf0f280fc02e10a20fd2bc3775c52956a0339e30b829cc3bef85629d565cf3f6a9af126e38bbb73e8e9b9a0069abbe0e57957a56ca1a8826f5de624a
 DIST btrfs-progs-v6.7.1.tar.sign 566 BLAKE2B e5aba64e199f26cef84a8cbbb034c0a5c24572e43fef2fdce79f0dbd892b1609876f681bf79de53e6473345f3de8b8fee6aac2d33673e0b080ab33fb935bd32d SHA512 8fad1c2c47356a04434e12621c526603bf651bdcb0a08deb4022d83953d8c501b8aaa2da05cbf94e0bde43b48a4135fff78a5746423466036ff4899dd79b9589
 DIST btrfs-progs-v6.7.1.tar.xz 2565576 BLAKE2B 4e05e9dd80e5531425490970318389aef280f61cc636a80aa2bbc630399afd4f1f3ce649d194822ff93ff4b1774d65a504e3bed6f1426ff60830e4c0d0ac87b0 SHA512 8a2e735f036a0778a2482d42c813012269903174232bc2924af41b72bbcfb49783d5f3b7d0af085285a68754748bd76b6534a498a47cdcea94020f4262281ffc
 DIST btrfs-progs-v6.8.1.tar.sign 566 BLAKE2B 843eada2b00a2370522edc95d79bcfed88bd24233e647946d4807322550593e4d5f5bb5efa6652c754dd0965dc3e389bc97698a0bd8fc5d0e850bea94de98e72 SHA512 84ebaa6ec27aa5bc87a323f5c6cc82a860fada7311ab8319127de3592294c1076d25959e412f8387d54bad3b8ff838ce39c4db4b04a658b2de2eaa7c976e2b09
 DIST btrfs-progs-v6.8.1.tar.xz 2652968 BLAKE2B 34406dedc6d97bd94a498c3bbb424d34a59b8251b37f9a40a87740f96db77780a4cd76c88055b4d9e4f673b4a3621503a6bedb67ceaf20870fb26c10f49b74e0 SHA512 b5f0694e56eecf1956313b3406610c2e22658ace51a636d79efe996780bb0b03fed95e68a8c9a11dd8649958c0e7dbc7417bb479859365d47b52e478f6830d46
-DIST btrfs-progs-v6.8.tar.sign 566 BLAKE2B 2f063015b515980a88980d02ac359363506d8445bf6ebffccd0f224b09b457b9d859ec7ae1371d3dcb04cfcb29ceee75ec8f73c2adee4765ca8287a79929234c SHA512 d858033046af03d9f7bedb492eadaaae92c8d3dde451e52fc78a8a1c4dbf57078e8d907dbd3344f1414b4dad9646aef616ddec0c0fefaf65340411e84c36c96f
-DIST btrfs-progs-v6.8.tar.xz 2587804 BLAKE2B 0f4cc83fa896bc932fdcd34fffae72b0fad44424ac0b5e2b7bde44dd91fcef33f2fa2ef36eb77299de753e4d4b47794cabad5d84760b9d34a9b6765a834d15b7 SHA512 adce7c15ef5a19c4fc513f1743b4f65f2c72aa4490703d36c93230abb305c576bd69a32c4bcf19c2b58aee5b5755e0d54fb82fe649a5fe021366eb0d89af4261
 EBUILD btrfs-progs-6.6.3.ebuild 4581 BLAKE2B c5fd9d72bfe270bf54838e0b0eff08cb9405711792cdd1775f21ff853a6202ba0f7ccff8a043f39da02d8cdcd36a253d03c53812ad293f64b6ce26df9e1c505e SHA512 a8af6e0941002d70cebef2fd96838c1bf630ad95bd4871e83097fd552ec5f01d253f675c05551f56c92871d5a40acae697c1f69e194c1cc9b915bb9acdb1cdc9
 EBUILD btrfs-progs-6.7.1.ebuild 4581 BLAKE2B c5fd9d72bfe270bf54838e0b0eff08cb9405711792cdd1775f21ff853a6202ba0f7ccff8a043f39da02d8cdcd36a253d03c53812ad293f64b6ce26df9e1c505e SHA512 a8af6e0941002d70cebef2fd96838c1bf630ad95bd4871e83097fd552ec5f01d253f675c05551f56c92871d5a40acae697c1f69e194c1cc9b915bb9acdb1cdc9
-EBUILD btrfs-progs-6.8.1.ebuild 4581 BLAKE2B c5fd9d72bfe270bf54838e0b0eff08cb9405711792cdd1775f21ff853a6202ba0f7ccff8a043f39da02d8cdcd36a253d03c53812ad293f64b6ce26df9e1c505e SHA512 a8af6e0941002d70cebef2fd96838c1bf630ad95bd4871e83097fd552ec5f01d253f675c05551f56c92871d5a40acae697c1f69e194c1cc9b915bb9acdb1cdc9
-EBUILD btrfs-progs-6.8.ebuild 4664 BLAKE2B 0b4ecbac2a6303d8d58434c438f585c2f429ee0ee73fa1dc3e1662bdb8197cdf9d24b31c246dbfbb2f2835398c12be332f8dfb264faa1e64b29858f5443ed731 SHA512 96aff43e2b197f568cf72e17eaa17b2289024804d1c2a5aef2cff4ffde92c6db8e20752df7de9cb53df1548b29e71eb7bb5d058ebd36868359d5bbb560f4a3b6
-EBUILD btrfs-progs-9999.ebuild 4587 BLAKE2B 56fdeba0f5693caac717e63dba5c5cc62068f4b0a013c07c5407b1c19c114c8a2697ded9bcd4974e8fddb87631c8d324150e076eb7e744e4ddb650eb4684ef40 SHA512 a71b38d90bb773e5beafadae60411815f18e33c561e31c5c089d574043e7332a28968486a35fcab24893876728bceb10006b0f772bd7fdc55776afc7c9484ba7
+EBUILD btrfs-progs-6.8.1.ebuild 4581 BLAKE2B d396df46d93764918662ebef638bffd6383d959e924dcbd130851d8ea853d4e8999e4144b171080c694e1dd8d531fcaa0dfe7049a8b3479c2b40884d38f019b4 SHA512 7a26a82542bb82e3d429342b9421c8bda1b0ce5cfe516329dfca2ae8545ebdc97fa951a5755c43e981e5298a9a5bbf867e018929d74cc9bfb8b2486f4785e003
+EBUILD btrfs-progs-9999.ebuild 4587 BLAKE2B eeb427390e6c7cc2834214201d7eac292bdc83c305923110d9d512e103deb43b4206425b6efcd5843ec27dda8371755554a5e9d9ab3a6a5f1aa419351fc695ff SHA512 ff6baffe50f9c881ba5969403dd12c5d1f525677dc37acabb4344cf355ddd56328ad392e81708940582a3f93cdcbc130fa88a4935a9218258689d3d276caf5c6
 MISC metadata.xml 610 BLAKE2B 70361c4d5434a98f73a3d38ed47d7be830783529db6217396f2235cdedd58744fc6e52e4de1994d28184fe9d8aa5d2982c433d47eda1868cfdb79edf0769a620 SHA512 8958c02574adb1395a9d21d9e9ad5db38570b82a1c7211752eb007eecbd0e541e880a060649641f40be877f167e14f278f14d5ef8775766ef9a6fa5d3843dc53
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.8.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.8.1.ebuild
index 565618d2fca3..0b8a3e9f25c2 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-6.8.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.8.1.ebuild
@@ -157,7 +157,7 @@ src_configure() {
 	export EXTRA_PYTHON_CFLAGS="${CFLAGS}"
 	export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}"
 
-	# bash as a tepmorary workaround for https://github.com/kdave/btrfs-progs/pull/721
+	# bash as a temporary workaround for https://github.com/kdave/btrfs-progs/pull/721
 	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
 }
 
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.8.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.8.ebuild
deleted file mode 100644
index 1f531bde0013..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.8.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 2008-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit bash-completion-r1 python-single-r1 udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-	WANT_LIBTOOL="none"
-	inherit autotools git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dsterba.asc
-	inherit verify-sig
-
-	MY_PV="v${PV/_/-}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="
-		https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz
-		verify-sig? ( https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.sign )
-	"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	fi
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-SLOT="0/0" # libbtrfs soname
-IUSE="+convert python +man reiserfs static static-libs udev +zstd"
-# Could support it with just !systemd => eudev, see mdadm, but let's
-# see if someone asks for it first.
-REQUIRED_USE="static? ( !udev ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tries to mount repaired filesystems
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:=[static-libs(+)?]
-	sys-libs/zlib:=
-	convert? (
-		sys-fs/e2fsprogs:=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	udev? ( virtual/libudev:= )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-5.10
-	convert? ( sys-apps/acl )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd[static-libs(+)] )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	man? (
-		dev-python/sphinx
-		dev-python/sphinx-rtd-theme
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+=" sys-devel/gnuconfig"
-else
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dsterba )"
-fi
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		return
-	fi
-
-	if in_iuse verify-sig && use verify-sig ; then
-		mkdir "${T}"/verify-sig || die
-		pushd "${T}"/verify-sig &>/dev/null || die
-
-		# Upstream sign the decompressed .tar
-		# Let's do it separately in ${T} then cleanup to avoid external
-		# effects on normal unpack.
-		cp "${DISTDIR}"/${MY_P}.tar.xz . || die
-		xz -d ${MY_P}.tar.xz || die
-		verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign
-
-		popd &>/dev/null || die
-		rm -r "${T}"/verify-sig || die
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	# bug 926288
-	use elibc_musl && eapply "${FILESDIR}/${P}-musl-1.2.5.patch"
-
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR="m4" eautoreconf
-
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-
-		--enable-lzo
-		--disable-experimental
-		$(use_enable convert)
-		$(use_enable man documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable udev libudev)
-		$(use_enable zstd)
-
-		# Could support libgcrypt, libsodium, libkcapi, openssl, botan
-		--with-crypto=builtin
-		--with-convert=ext2$(usev reiserfs ',reiserfs')
-	)
-
-	export EXTRA_PYTHON_CFLAGS="${CFLAGS}"
-	export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}"
-
-	# bash as a tepmorary workaround for https://github.com/kdave/btrfs-progs/pull/721
-	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_test() {
-	emake V=1 -j1 -C tests test
-
-	if use python ; then
-		cd libbtrfsutil/python || die
-
-		local -x LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}"
-		${EPYTHON} -m unittest tests/test_*.py || die "Tests failed with ${EPYTHON}"
-	fi
-}
-
-src_install() {
-	local makeargs=(
-		$(usev python install_python)
-		$(usev static install-static)
-	)
-
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-
-	newbashcomp btrfs-completion btrfs
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index c9770f5998ae..e83177d9b9ef 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -157,7 +157,7 @@ src_configure() {
 	export EXTRA_PYTHON_CFLAGS="${CFLAGS}"
 	export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}"
 
-	# bash as a tepmorary workaround for https://github.com/kdave/btrfs-progs/pull/721
+	# bash as a temporary workaround for https://github.com/kdave/btrfs-progs/pull/721
 	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
 }
 
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-6.8-musl-1.2.5.patch b/sys-fs/btrfs-progs/files/btrfs-progs-6.8-musl-1.2.5.patch
deleted file mode 100644
index 19737515b616..000000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-6.8-musl-1.2.5.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-From 45ca77f9e4cfe5fd5814d553502ef99877c9e972 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.com>
-Date: Thu, 18 Apr 2024 18:57:08 +0200
-Subject: [PATCH] btrfs-progs: add basename wrappers for unified semantics
-
-What basename(3) does with the argument depends on _GNU_SOURCE and
-inclusion of libgen.h. This is problematic on Musl (1.2.5) as reported.
-
-We want the GNU semantics that does not modify the argument. Common way
-to make it portable is to add own helper. This is now implemented in
-path_basename() that does not use the libc provided basename but preserves
-the semantics. The path_dirname() is just for parity, otherwise same as
-dirname().
-
-Sources:
-- https://bugs.gentoo.org/926288
-- https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
-
-Issue: #778
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- cmds/subvolume.c      | 26 +++++++++++++-------------
- common/device-utils.c |  4 ++--
- common/path-utils.c   | 28 ++++++++++++++++++++++++++++
- common/path-utils.h   |  2 ++
- 4 files changed, 45 insertions(+), 15 deletions(-)
-
-diff --git a/cmds/subvolume.c b/cmds/subvolume.c
-index 5d53efe6f..869d7077d 100644
---- a/cmds/subvolume.c
-+++ b/cmds/subvolume.c
-@@ -24,7 +24,6 @@
- #include <string.h>
- #include <unistd.h>
- #include <errno.h>
--#include <libgen.h>
- #include <getopt.h>
- #include <dirent.h>
- #include <stdbool.h>
-@@ -149,7 +148,7 @@ static int create_one_subvolume(const char *dst, struct btrfs_qgroup_inherit *in
- 	int	fddst = -1;
- 	char	*dupname = NULL;
- 	char	*dupdir = NULL;
--	char	*newname;
-+	const char *newname;
- 	char	*dstdir;
- 
- 	ret = path_is_dir(dst);
-@@ -170,7 +169,7 @@ static int create_one_subvolume(const char *dst, struct btrfs_qgroup_inherit *in
- 		ret = -ENOMEM;
- 		goto out;
- 	}
--	newname = basename(dupname);
-+	newname = path_basename(dupname);
- 
- 	dupdir = strdup(dst);
- 	if (!dupdir) {
-@@ -178,7 +177,7 @@ static int create_one_subvolume(const char *dst, struct btrfs_qgroup_inherit *in
- 		ret = -ENOMEM;
- 		goto out;
- 	}
--	dstdir = dirname(dupdir);
-+	dstdir = path_dirname(dupdir);
- 
- 	if (!test_issubvolname(newname)) {
- 		error("invalid subvolume name: %s", newname);
-@@ -364,7 +363,8 @@ static int cmd_subvolume_delete(const struct cmd_struct *cmd, int argc, char **a
- 	int res, ret = 0;
- 	int cnt;
- 	int fd = -1;
--	char	*dname, *vname, *cpath;
-+	char	*dname, *cpath;
-+	const char *vname;
- 	char	*dupdname = NULL;
- 	char	*dupvname = NULL;
- 	char	*path = NULL;
-@@ -482,9 +482,9 @@ static int cmd_subvolume_delete(const struct cmd_struct *cmd, int argc, char **a
- 		goto out;
- 	}
- 	dupdname = strdup(cpath);
--	dname = dirname(dupdname);
-+	dname = path_dirname(dupdname);
- 	dupvname = strdup(cpath);
--	vname = basename(dupvname);
-+	vname = path_basename(dupvname);
- 	free(cpath);
- 
- 	/* When subvolid is passed, <path> will point to the mount point */
-@@ -670,7 +670,7 @@ static int cmd_subvolume_snapshot(const struct cmd_struct *cmd, int argc, char *
- 	bool readonly = false;
- 	char	*dupname = NULL;
- 	char	*dupdir = NULL;
--	char	*newname;
-+	const char *newname;
- 	char	*dstdir;
- 	enum btrfs_util_error err;
- 	struct btrfs_ioctl_vol_args_v2	args;
-@@ -727,13 +727,13 @@ static int cmd_subvolume_snapshot(const struct cmd_struct *cmd, int argc, char *
- 
- 	if (res > 0) {
- 		dupname = strdup(subvol);
--		newname = basename(dupname);
-+		newname = path_basename(dupname);
- 		dstdir = dst;
- 	} else {
- 		dupname = strdup(dst);
--		newname = basename(dupname);
-+		newname = path_basename(dupname);
- 		dupdir = strdup(dst);
--		dstdir = dirname(dupdir);
-+		dstdir = path_dirname(dupdir);
- 	}
- 
- 	if (!test_issubvolname(newname)) {
-@@ -1557,7 +1557,7 @@ static int cmd_subvolume_show(const struct cmd_struct *cmd, int argc, char **arg
- 	struct btrfs_util_subvolume_iterator *iter;
- 	struct btrfs_util_subvolume_info subvol;
- 	char *subvol_path = NULL;
--	char *subvol_name = NULL;
-+	const char *subvol_name = NULL;
- 	enum btrfs_util_error err;
- 	struct btrfs_qgroup_stats stats;
- 	unsigned int unit_mode;
-@@ -1669,7 +1669,7 @@ static int cmd_subvolume_show(const struct cmd_struct *cmd, int argc, char **arg
- 		subvol_path = strdup("/");
- 		subvol_name = "<FS_TREE>";
- 	} else {
--		subvol_name = basename(subvol_path);
-+		subvol_name = path_basename(subvol_path);
- 	}
- 
- 	if (bconf.output_format == CMD_FORMAT_JSON) {
-diff --git a/common/device-utils.c b/common/device-utils.c
-index 36108ec4e..d086e9ea2 100644
---- a/common/device-utils.c
-+++ b/common/device-utils.c
-@@ -343,14 +343,14 @@ static u64 device_get_partition_size_sysfs(const char *dev)
- 	char path[PATH_MAX] = {};
- 	char sysfs[PATH_MAX] = {};
- 	char sizebuf[128] = {};
--	char *name = NULL;
-+	const char *name = NULL;
- 	int sysfd;
- 	unsigned long long size = 0;
- 
- 	name = realpath(dev, path);
- 	if (!name)
- 		return 0;
--	name = basename(path);
-+	name = path_basename(path);
- 
- 	ret = path_cat3_out(sysfs, "/sys/class/block", name, "size");
- 	if (ret < 0)
-diff --git a/common/path-utils.c b/common/path-utils.c
-index 181737c4d..929e5c8fa 100644
---- a/common/path-utils.c
-+++ b/common/path-utils.c
-@@ -28,6 +28,11 @@
- #include <string.h>
- #include <errno.h>
- #include <ctype.h>
-+/*
-+ * For dirname() and basename(), but never use basename directly, there's
-+ * path_basename() with unified GNU behaviour regardless of the includes and
-+ * conditional defines. See basename(3) for more.
-+ */
- #include <libgen.h>
- #include <limits.h>
- #include "common/path-utils.h"
-@@ -482,3 +487,26 @@ int test_issubvolname(const char *name)
- 		strcmp(name, ".") && strcmp(name, "..");
- }
- 
-+/*
-+ * Unified GNU semantics basename helper, never changing the argument. Always
-+ * use this instead of basename().
-+ */
-+const char *path_basename(const char *path)
-+{
-+	const char *tmp = strrchr(path, '/');
-+
-+	/* Special case when the whole path is just "/". */
-+	if (path[0] == '/' && path[1] == 0)
-+		return path;
-+
-+	return tmp ? tmp + 1 : path;
-+}
-+
-+/*
-+ * Return dirname component of path, may change the argument.
-+ * Own helper for parity with path_basename().
-+ */
-+char *path_dirname(char *path)
-+{
-+	return dirname(path);
-+}
-diff --git a/common/path-utils.h b/common/path-utils.h
-index 08ae0ff10..697fa6b48 100644
---- a/common/path-utils.h
-+++ b/common/path-utils.h
-@@ -39,6 +39,8 @@ int path_is_dir(const char *path);
- int is_same_loop_file(const char *a, const char *b);
- int path_is_reg_or_block_device(const char *filename);
- int path_is_in_dir(const char *parent, const char *path);
-+const char *path_basename(const char *path);
-+char *path_dirname(char *path);
- 
- int test_issubvolname(const char *name);
- 
diff --git a/sys-fs/mergerfs-tools/Manifest b/sys-fs/mergerfs-tools/Manifest
index 9ced628d3717..ce59313a2295 100644
--- a/sys-fs/mergerfs-tools/Manifest
+++ b/sys-fs/mergerfs-tools/Manifest
@@ -1,3 +1,5 @@
 DIST mergerfs-tools-0_p20210502.gh.tar.gz 15575 BLAKE2B 0b111c8a37c7679cb5a331d942f11ad8315eb58d0e686a53ddf6ce9262fb04cde69654d6d8c597d94fba48914b5b7fc4fc35d0b6413bd817e587e1d8e70ad1b6 SHA512 8f0fefe65b277d01aa893bd8af3dad5618b403126817982740a59c7997af33480ee858158b430775d63f0aa5ade854a71d88ab99ee0d7eac8cc4cb95933204f2
+DIST mergerfs-tools-0_p20230912.gh.tar.gz 15573 BLAKE2B 3af6fe712697c3855e67282e9f0a287b71db88368d161db72569e5382325fe7b3b43b9ce20d92789e0f8295586d4b52f4fb649dd82a8fe164cc1d3ff83674e6e SHA512 1e8ce355bfa3783dedaf035b9f39b4aa4a7ec1e4280afe1f0fc761aecd0357a416de1f9d870480ac941104410824da5713fbb80b804abb13589fa0251c62ae14
 EBUILD mergerfs-tools-0_p20210502-r4.ebuild 730 BLAKE2B 19befc5f77ee47de69c9ab3b683f5f28d3976e9b82e02bdb1a06e905106eb288753019b3f2b5a9b6ce9ea4aedebe5274474582518b7b49031b275df9002ea525 SHA512 14b422412db01016828089cc5bef7665abb96eecad7294c7a287d996d9e17f10f85c63814adb993bb2d5eede2b8196f433d852b18d474f1714c610268fa07606
+EBUILD mergerfs-tools-0_p20230912.ebuild 792 BLAKE2B f75d7c1b2d013de00589ed4ca0a3e729b68603f84125f7b084789e751ae8c440396b51e365ebb33f0803cd7082a163ef25256576d34a78377ac48cc7bb180c8a SHA512 53af73ae1d9b6ba8dd4121d8b0d0085e89a96ac55cf3e619918aa2d84c73c4b35d4fe2b4adc15930e6d6f98c3eb959287bee2e090cb5fc99910a725ebbe30d98
 MISC metadata.xml 256 BLAKE2B b261be947390837c70e604761d31e7322ee4a45e4ddd910cb628aacd192312253ac1e6e635473c135615abeba9a30e57e11291ad54bfb00fd4557876fd05efde SHA512 41d6bd432d9c75fa0303b14a1948e53dc14f0fb135e016e8222ae52b8b77d5b8b82b848cbe64f3b16dc756a45291b14a3e37e669b07fb2aed6f3a8cd2b6426fe
diff --git a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20230912.ebuild b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20230912.ebuild
new file mode 100644
index 000000000000..137700575d1f
--- /dev/null
+++ b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20230912.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit python-single-r1
+
+MY_COMMIT="80d6c9511da554009415d67e7c0ead1256c1fc41"
+
+DESCRIPTION="Optional tools to help manage data in a mergerfs pool"
+HOMEPAGE="https://github.com/trapexit/mergerfs-tools"
+SRC_URI="https://github.com/trapexit/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="${PYTHON_DEPS}"
+
+src_compile() {
+	# no build system.
+	true
+}
+
+src_install() {
+	# Explicit INSTALL= to avoid `which`
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr INSTALL=install install
+	python_fix_shebang "${ED}"
+}
diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index 19daebdd07ae..9bff5c6cd703 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -1,5 +1,5 @@
-DIST mergerfs-2.35.1.tar.gz 669100 BLAKE2B 25b442f0451b525509bd908ac1cd2e70ab33db599aab58e2baeca47eeb3a0d0b93f7fddb880e8fdbf1b6928d40c650e0df23c116741cad279cdf169cea000768 SHA512 09de354ae7a7c69f6e873145a754c3ed8a840d59ccc455c8913f2562babbe8787c7eb929c0ea2571b5292928e3cee7b547b0a52cdd833b03e679e11191b4a5b5
 DIST mergerfs-2.36.0.tar.gz 680473 BLAKE2B c0380834c7610724f058bd13b073622082ad8bdf4fe32815cf8a5450d1f962478a6ba3d0033d0ade446861786db6c8d3ae3dbacd6a61a526a79d849b6c7b40e7 SHA512 f20879aa5fb9ab56b1e7bba0e08aacda7e26af7e1fdcf3d57b77a2dce70fda8aa15c20e947dde6ffab3dfae8698005c9d8383c9ab2402cc4ce5de0810ce1298d
-EBUILD mergerfs-2.35.1.ebuild 1077 BLAKE2B 5416ad8a60a26e808614064c4dfa45be6552e0dfeab16d4c0c203fe39196a5cdd3390f6f9ebd76838267d7a9beb75d51e429a0bd45841eb70f8ddd0cabc4bde1 SHA512 ed5f77c414351d64620b82a93ee4038204656e4afb2104f75f95a3847d99e406d419d841b87de3180219f03a66e43fb5f4fef568e927b4d1ffa2b0bec2399e3f
+DIST mergerfs-2.40.2.tar.gz 743230 BLAKE2B c248397288465a0acb735040777504a9deca51c5d6b92753bc7ca1dc078bbba69867b93f94c049d5ae1aa75b77410bc228d270267e3550cb3b67226395337dc9 SHA512 b491007ef14ebd9c9193e730cccd7a178fb7d96426066d5a61cc654eae0b81824a3bf25258b1fafd248f4454ebe55787653f3d906cdc2e89a5cd0884db534876
 EBUILD mergerfs-2.36.0.ebuild 1077 BLAKE2B 5416ad8a60a26e808614064c4dfa45be6552e0dfeab16d4c0c203fe39196a5cdd3390f6f9ebd76838267d7a9beb75d51e429a0bd45841eb70f8ddd0cabc4bde1 SHA512 ed5f77c414351d64620b82a93ee4038204656e4afb2104f75f95a3847d99e406d419d841b87de3180219f03a66e43fb5f4fef568e927b4d1ffa2b0bec2399e3f
+EBUILD mergerfs-2.40.2.ebuild 1061 BLAKE2B ab303840588c4f520a0ac18f13f567b17b00f762667cf3e95d347a235f03699b3ba9f92a189237c8cada71c3f4b99483444b726ebc7a8049ef02965c13435f94 SHA512 7f77636b84139fd6048ca80af42dc2dd277cde06971acf8ff54743f4485c815ac2cb875c31f4680254469b8f2c0835e4be914a2287eb7fe03a96fd5e6161281c
 MISC metadata.xml 250 BLAKE2B 468e37e94b1911acd9d0623757a3d00c0e9437893e4962b4e56ae03abbbed0b26d30fb832f855805be3aeec08bd7b543452253bd1adcc06deffa0ac6e2af37ce SHA512 ad5b1a555e5ebf2b604ef1fa16c8b7a630b6c6733d9404adca0def5d01bc43819fc59a0bb7c433a265311ea19288aded36d70a23c711e838ad1ba47889d0002a
diff --git a/sys-fs/mergerfs/mergerfs-2.35.1.ebuild b/sys-fs/mergerfs/mergerfs-2.40.2.ebuild
index a534d6068490..12c52da625d1 100644
--- a/sys-fs/mergerfs/mergerfs-2.35.1.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.40.2.ebuild
@@ -1,39 +1,38 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="A featureful union filesystem"
 HOMEPAGE="https://github.com/trapexit/mergerfs"
-
 SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~riscv x86"
 
 # Vendorized libfuse that's bundled is under LGPL-2.1.
 LICENSE="ISC LGPL-2.1"
 SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="+xattr"
 
 DEPEND="
 	xattr? ( sys-apps/attr )
 "
-
 RDEPEND="${DEPEND}"
-
 BDEPEND="sys-devel/gettext"
 
 src_prepare() {
 	default
 
-	# Hand made build system at it's finest.
-	echo -e "#!/bin/sh\ntrue" >tools/update-version || die
-	echo "#pragma once" >src/version.hpp || die
-	echo "static const char MERGERFS_VERSION[] = \"${PV}\";" >>src/version.hpp || die
+	# Hand made build system at its finest.
+	echo -e "#!/bin/sh\ntrue" > buildtools/update-version || die
+	cat <<-EOF > src/version.hpp || die
+	#pragma once
+	static const char MERGERFS_VERSION[] = "${PV}";
+	EOF
 
 	if ! use xattr; then
-		sed 's%USE_XATTR = 1%USE_XATTR = 0%g' -i Makefile || die
+		sed -i -e 's%USE_XATTR = 1%USE_XATTR = 0%g' Makefile || die
 	fi
 }
 
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 68e13c6306aa..16bebb848383 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/xpra-html5/Manifest b/www-apps/xpra-html5/Manifest
index 91f448632846..657fbf86caee 100644
--- a/www-apps/xpra-html5/Manifest
+++ b/www-apps/xpra-html5/Manifest
@@ -1,5 +1,5 @@
 DIST xpra-html5-10.1.tar.gz 2354055 BLAKE2B f67b2f15903c1bef93cd93db0d363c067a4dd0455f3013aa86bfff070b91e40946c0500cff270f10f8cbbf654cd4b2d5908cb06f4d86c7ec612fec78ecf3103c SHA512 a5a9c1d09ae767ad339225e1b130c2e285a20a57cc90f22728d12eec3d8cac4b1c00c7f38153972dbb2d2f6c3836ec532fcba14a4456114f70524b8ec2de38be
-DIST xpra-html5-6.1.tar.gz 1416380 BLAKE2B ba0e2bdcae91b30a1f46655dc505f5338cd8c516414f55871c6bc01b6bdcd81d351d66c575c6a7a219cb0c29e7da17e8db558b928dc89067b5ad3289520005f2 SHA512 3539c235f38a66f0a8eaea679df4b4bb4a1ef778ab31baf705acc29b0d4b3998ae84081eeac085db973d170afaa1ee0f167124efc3e48266145fdbef255a6bf5
-EBUILD xpra-html5-10.1.ebuild 948 BLAKE2B 86383c1c87c67455addca674d458d8c072dd8211979098bbfb8e587105391006ec5ff6df6473edafd974965fce502d629e6c170a1ca27183703b93af92a4c919 SHA512 b9312d294ada9846821a622c59018f18677c14ea81bd697f4f976d7f908533499971102623c9ee511826bcd92c0061fec6c56a9a28cf8a6f02e189dc3eeac5ba
-EBUILD xpra-html5-6.1.ebuild 950 BLAKE2B 7b58f757aa4ac2df4cfedc55c427fb627f12f8edce2041d99a1c8c7fe686c04ac61c693bf07e3bd02f59187d34bdc76bf536476d69459d6ea1c3571b1ff534f7 SHA512 2b7ba2a31d3211323ae39913c0715e857df464715b910e157c7c0e9d5e0503e3ca0e69ae3236a314334c9ceb00f66ae55da81e686282fc14f9faa1a73814a3bf
+DIST xpra-html5-13.tar.gz 2360764 BLAKE2B 81ff150047ff9e422fd6b590ac115f71c3641dc2cec5e2364276e05260a527128845b84813ffa4cf7bb9354c416600a69737c41c3f1b0529a6bb1979a262e128 SHA512 583a9bb6dce718d1066237d0558eaa4cef2b0d9816d99d9bc9d4ce66dcfdc79bb3c21f9a8b55732a3716e752044864643ccc3bfbfca3b459169739ea3e099bf1
+EBUILD xpra-html5-10.1.ebuild 949 BLAKE2B d356d162bf4a088f0ff58c31472edbeaaa93f6d9d1d6233f681b86d1b73932ff8936ff3903248c12ee93e290c223a0495b7454e917b3e9ee4ae6639be98a138d SHA512 bc3d2ac497beb062751a26728cdabe910b12e505169023c7e1073e08777fa6dfa220df7b710e742c4eef2e44189e835a05058b4e919a9ad9e29eb22a23e3be4d
+EBUILD xpra-html5-13.ebuild 951 BLAKE2B 064a3f07eccc4a9d4fa136c49ead8a5afa47a202dcdd8656627284f7f3b632119c50a5355f953ad1454b6b0e3631659b81aa2aaaa10fa7961d8956f1a43867fc SHA512 efbf8605b51f1cdb05c5f2763b4fc9bdda863a5832002ca086a1a82ed3980efeb1247676aa3c4940a68af602880d04f13a48e256b7663aa758c2d94943cd5848
 MISC metadata.xml 551 BLAKE2B 6d62f17a775361ec0b066cb994bc5a6ccc841e61991aa44a72512e82ac94c6a66ad7fbf3998c784cf830cfe44f03e496edd9b491e95f173fea71f328349bd457 SHA512 d839ba317b8d58e5849de92243408096799b1328baa3d46e0ca06e4c038639a35566a9a636f7da491820bc0e3af0cbd5e18043bf815b873f3ead4d68ff54c960
diff --git a/www-apps/xpra-html5/xpra-html5-10.1.ebuild b/www-apps/xpra-html5/xpra-html5-10.1.ebuild
index eaa42523ae29..abec1c97274a 100644
--- a/www-apps/xpra-html5/xpra-html5-10.1.ebuild
+++ b/www-apps/xpra-html5/xpra-html5-10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit python-any-r1
 
 DESCRIPTION="HTML5 client to connect to any xpra server"
diff --git a/www-apps/xpra-html5/xpra-html5-6.1.ebuild b/www-apps/xpra-html5/xpra-html5-13.ebuild
index 009477138249..5731073a8d3b 100644
--- a/www-apps/xpra-html5/xpra-html5-6.1.ebuild
+++ b/www-apps/xpra-html5/xpra-html5-13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit python-any-r1
 
 DESCRIPTION="HTML5 client to connect to any xpra server"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Xpra-org/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="brotli +gzip minify"
 
 BDEPEND="
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 7ad9567fe626..604eb0873c32 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 735703175a20..95de0c481520 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,5 +1,6 @@
 AUX elinks-0.16.1.1-perl-5.38.patch 1527 BLAKE2B 1a39c77ef9d29490c745e58998e6798dbb74faf399a50cbba32beac2b5e09ec55f047594d120c9c8db79201ef0f24633e5cd96b16a7eb9c201a061bf5372636b SHA512 64dbe341b15eea0cb0795909e745f74bee17ff6a3e38425a3fc48c5881fccf48d510ca4e2737e44e87dee9700b774a86700ec256a5fc0c6fe6540fca0ad33d2e
 DIST elinks-0.16.1.1.tar.xz 2037292 BLAKE2B 05578eaa7a88f0abe4472b876a1f72645d32119ce807a61962f8d24a5b444240d3b94189bf25142c0e51e2d404d5992ace07ecc23ef1316d5f3942736b265267 SHA512 49e03ff4766e29b6fd4324d226e415ca1329a84d4a44fac40ecd72186dd104de88c3e541810a008dc6f1d1ed889a45edbef159cbc6ac3860756ca21261ffec8a
 EBUILD elinks-0.16.1.1-r2.ebuild 4769 BLAKE2B e141e9a71a8a20dec53491bfa2178a58c920d1592970883fc169850b48f6b7dea4bbbc1cfb10676f3c287f5bceb55e681a048c531f549093019ad3bfb6245229 SHA512 62b64d6335da8478ee7ee5bc89b0eae20207fb3bcf51b65147d10e60b3495d1e6e4586d6d575efa2742aee9b3f757b8bf5384cc706d3f4578ea41fd7e8fda7a8
-EBUILD elinks-9999.ebuild 4718 BLAKE2B 444631466adeea0a6b528e7108537345ca6460246338dfbd3ea9078ff3677b1e52dedbddb7b37dc1b591df495db72d3c524d694a51c22a58875de8e246201ab3 SHA512 96da6f39a97c079a9064fa24757f0f27f21f727472fab90373d71b46aa9cd2878e1a7dc95c18a2421188b033d4aaa654cdf6b716545117c381cb8e838aaecc31
+EBUILD elinks-0.16.1.1-r3.ebuild 4875 BLAKE2B 0aac775dfbf7f58c4a1e0fbcb670efca6553bf61e9e84a326aa18a911004065767296b8916762a9ac09f0fc3643b58e161a739b64da745ed6e9a1e42ee6ad8d0 SHA512 a57d29a004232103edbfe5b1c0e5a6616b09441fb65722d648b1c04c8bcd14d10f5d46bf644eabf4afec02eb3150400ef6a78672a9bb89d5cf1c62fa25b6344e
+EBUILD elinks-9999.ebuild 4818 BLAKE2B d1290f6f99f4bf2b6664226dfe7ddcfd29aaccc06f44a821e46ed6970d459ee35a368b3d2648f08d5eaf505e031abc81ec97a74d8e9ff5a9dc49e1be2ce5ba87 SHA512 889cd16fb6ad851d2c1668538179bb430586b88b58de193ede00a8b588872a3d48da53ed5432c4a71513e36337ace59e0f5c4022d63d370bd520345de0a4811f
 MISC metadata.xml 938 BLAKE2B 93a927137d89d306b73f04faad6f43714b00349810b0531e274b90d086fda7285d992734263dee5b5274857af1d615e61871d9348e0e8dc759717a7fc4332e50 SHA512 9ba6c3d9228c5f74304447d469afa2ff2984fa3d637faaee7946d442b979c6c99eab87726b4f88aef4af43c515f3105c97fc8d6d64965794bbd6c4c539ac199c
diff --git a/www-client/elinks/elinks-0.16.1.1-r3.ebuild b/www-client/elinks/elinks-0.16.1.1-r3.ebuild
new file mode 100644
index 000000000000..f879db1c426e
--- /dev/null
+++ b/www-client/elinks/elinks-0.16.1.1-r3.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+LUA_COMPAT=( lua5-{1,2,3,4} luajit )
+
+inherit flag-o-matic meson lua-single python-single-r1
+
+DESCRIPTION="Advanced and well-established text-mode web browser"
+HOMEPAGE="http://elinks.or.cz/"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/rkd77/felinks"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/rkd77/elinks/releases/download/v${PV}/${P}.tar.xz"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn"
+IUSE+=" javascript lua lzma +mouse nls nntp perl python samba ssl test tre unicode X xml zlib zstd"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.2:=[unicode(+)]
+	brotli? ( app-arch/brotli:= )
+	bzip2? ( >=app-arch/bzip2-1.0.2 )
+	gpm? (
+		>=sys-libs/gpm-1.20.0-r5
+	)
+	guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] )
+	idn? ( net-dns/libidn:= )
+	javascript? (
+		dev-cpp/libxmlpp:5.0
+		dev-lang/mujs:=
+	)
+	lua? ( ${LUA_DEPS} )
+	lzma? ( app-arch/xz-utils )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	samba? ( net-fs/samba )
+	ssl? (
+		!gnutls? ( dev-libs/openssl:= )
+		gnutls? ( net-libs/gnutls:= )
+	)
+	tre? ( dev-libs/tre )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	xml? ( >=dev-libs/expat-1.95.4 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? (
+		net-dns/libidn
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.16.1.1-perl-5.38.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# This file is severely broken w.r.t. strict-aliasing and upstream acknowledges it:
+	# https://github.com/rkd77/elinks/blob/d05ce90b35d82109aab320b490e3ca54aa6df057/src/util/lists.h#L14
+	# https://github.com/rkd77/elinks/blob/d05ce90b35d82109aab320b490e3ca54aa6df057/src/meson.build#L44
+	#
+	# Although they force fno-strict-aliasing, they do so inconsistently and not for the testsuite (!!!).
+	# Just add it again.
+	#
+	# DO not trust the LTO either.
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		-Dhtmldoc=false
+		-Dpdfdoc=false
+		-Dapidoc=false
+		-D88-colors=true
+		-D256-colors=true
+		$(meson_use bittorrent)
+		$(meson_use brotli)
+		$(meson_use bzip2 bzlib)
+		$(usex debug '-Ddebug=true' '-Dfastmem=true')
+		$(meson_use finger)
+		$(meson_use ftp)
+		-Dfsp=false
+		-Dgemini=false
+		$(meson_use nls gettext)
+		$(meson_use gopher)
+		$(meson_use gpm)
+		$(meson_use guile)
+		-Dgssapi=false
+		-Dhtml-highlight=true
+		$(meson_use idn)
+		$(meson_use javascript mujs)
+		-Dipv6=true
+		-Dleds=true
+		-Dlibev=false
+		-Dlibevent=false
+		-Dluapkg=$(usex lua ${ELUA:-0} '')
+		$(meson_use lzma)
+		$(meson_use mouse)
+		#-Dmujs=false
+		$(meson_use nls)
+		$(meson_use nntp)
+		$(meson_use perl)
+		$(meson_use python)
+		-Dquickjs=false
+		-Druby=false
+		$(meson_use samba smb)
+		-Dsm-scripting=false
+		-Dspidermonkey=false
+		-Dterminfo=true
+		$(meson_use test)
+		$(meson_use tre)
+		-Dtrue-color=true
+		$(meson_use xml xbel)
+		$(meson_use X x)
+		$(meson_use zlib)
+		$(meson_use zstd)
+	)
+
+	if use ssl ; then
+		if use gnutls ; then
+			emesonargs+=( -Dgnutls=true )
+		else
+			emesonargs+=( -Dopenssl=true)
+		fi
+	else
+		emesonargs+=( -Dgnutls=false -Dopenssl=false )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc/elinks
+	newins contrib/keybind-full.conf keybind-full.sample
+	newins contrib/keybind.conf keybind.conf.sample
+
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
+	docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
+	docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote}
+	docinto contrib/conv ; dodoc contrib/conv/*.*
+	docinto contrib/guile ; dodoc contrib/guile/*.scm
+
+	# elinks uses an internal copy of gettext which ships files that may
+	# collide with the system's gettext (https://bugs.gentoo.org/635090)
+	rm -f "${ED}"/usr/{share/locale/locale,lib/charset}.alias || die
+}
+
+pkg_postinst() {
+	elog "You may want to convert your html.cfg and links.cfg of"
+	elog "Links or older ELinks versions to the new ELinks elinks.conf"
+	elog "using ${EROOT}/usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
+	elog
+	elog "Please have a look at ${EROOT}/etc/elinks/keybind-full.sample and"
+	elog "${EROOT}/etc/elinks/keybind.conf.sample for some bindings examples."
+	elog
+	elog "You will have to set your TERM variable to 'xterm-256color'"
+	elog "to be able to use 256 colors in elinks."
+}
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild
index 7611b9f21af9..414f0f24a9ec 100644
--- a/www-client/elinks/elinks-9999.ebuild
+++ b/www-client/elinks/elinks-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{10..11} )
 LUA_COMPAT=( lua5-{1,2,3,4} luajit )
 
-inherit flag-o-matic meson lua-single python-any-r1
+inherit flag-o-matic meson lua-single python-single-r1
 
 DESCRIPTION="Advanced and well-established text-mode web browser"
 HOMEPAGE="http://elinks.or.cz/"
@@ -23,9 +23,12 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn"
-IUSE+=" javascript lua lzma +mouse nls nntp perl samba ssl test tre unicode X xml zlib zstd"
+IUSE+=" javascript lua lzma +mouse nls nntp perl python samba ssl test tre unicode X xml zlib zstd"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
 
 RDEPEND="
 	>=sys-libs/ncurses-5.2:=[unicode(+)]
@@ -43,6 +46,7 @@ RDEPEND="
 	lua? ( ${LUA_DEPS} )
 	lzma? ( app-arch/xz-utils )
 	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
 	samba? ( net-fs/samba )
 	ssl? (
 		!gnutls? ( dev-libs/openssl:= )
@@ -60,7 +64,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 BDEPEND="
-	${PYTHON_DEPS}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	test? (
@@ -71,7 +74,7 @@ BDEPEND="
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 
-	python-any-r1_pkg_setup
+	use python && python-single-r1_pkg_setup
 }
 
 src_configure() {
@@ -90,6 +93,7 @@ src_configure() {
 		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
 		-Dhtmldoc=false
 		-Dpdfdoc=false
+		-Dapidoc=false
 		-D88-colors=true
 		-D256-colors=true
 		$(meson_use bittorrent)
@@ -119,7 +123,7 @@ src_configure() {
 		$(meson_use nls)
 		$(meson_use nntp)
 		$(meson_use perl)
-		-Dpython=false
+		$(meson_use python)
 		-Dquickjs=false
 		-Druby=false
 		$(meson_use samba smb)
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 9a3aca5ed035..460de1d30f04 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,9 +1,9 @@
-DIST vivaldi-snapshot_6.7.3329.19-1_amd64.deb 108490132 BLAKE2B f28432dd33c73b9d0dce456bfeb73bf4fa4fff13fce2bb38b4ce08c9c4826b974618afef9469cb598680f3164051bc373b657f0570e6c55abb71bb64008f6af8 SHA512 14ac65dae0ab50b7ddfb473f8a6420ec6048d3dfb8a8a8ef73931976dd55e1312f0b148e1980e2a89fe40e1369731e4b7654a2eb5b7082b6e5bf26a513dbe164
-DIST vivaldi-snapshot_6.7.3329.19-1_arm64.deb 99180668 BLAKE2B 54d3d54f79abb2bae61cd772c401b9833cbb61c4c3a87199efcccee20242d9dd5e653e7e0d34a63938a51b0591169d615ca2a321f4de49dcbaffd729e8905254 SHA512 1d68d9fb003245e36ded8ac002fc91294a8e8ff6d9793a8424db074875b649ca3b2b0aad834e1a5bd37d5cfdd086040c8965f260153076e1c5930b800f67876e
-DIST vivaldi-snapshot_6.7.3329.19-1_armhf.deb 100322788 BLAKE2B ece4bde88de64dce84aeb1eef498372f5e143f620e8e8dad7a23ebab8c615d7c0f28805c8be2f2925067d8138564d2a8010a5ca5836e0708ca60ff8e5bb11f7a SHA512 4f564b913137399b016c1d70f223152669e85f80326d838089bfc77cafe80a790b91b73b5b64f53fd0dfe6177961315c34632883e690e39bd35acb93987e4f27
 DIST vivaldi-snapshot_6.8.3358.3-1_amd64.deb 108606616 BLAKE2B 03a9e54b3f77dfdddd4901cdf0f705d2db20c7b9b85ff0a660cef11cb1b304947f86ba1befed6901be23c55aac8d0380e293bf5c80692c1f99acee3c97592152 SHA512 bad714103d34b81eb1ad8315846216f281c5890d13b6b7d562f6a5f20d24d4c20370cb64b102eafd505d0fcda70840b43f0d0370ea3ebfa53078a0d9547eae2c
 DIST vivaldi-snapshot_6.8.3358.3-1_arm64.deb 99267888 BLAKE2B dfb6e4ddf32610717acf30c52ea3b58404cdbacaf18b8c86746a81b8de73fb58f64d98d37ee9f4dd5a96fe452790787098d35b1a76a25dd40bf3eb35481d8221 SHA512 b8dbc826b104fc946d69b125ba170920ecce71924e1f236f4e0db4299234c15c18f36b40c7526cb9c3eda757883070c2e95bde28f5dc1667061ea3fa2104385c
 DIST vivaldi-snapshot_6.8.3358.3-1_armhf.deb 100440164 BLAKE2B 005a08199d2f932f3be7523802975140695ae9a608a8397314eb0aaeec149676b42913443b56fc27bfcaabba4a1417874c0a4a88ff87f04c43c284e9bc3e585d SHA512 290b67e63557058151157c015de763298be21e7793b867854db76af8e280c2c6626673ca561e2e465c3c4c21abdd4eebd1d014d5ec976b03b005858dec1cba21
-EBUILD vivaldi-snapshot-6.7.3329.19.ebuild 4026 BLAKE2B 512cce4fea112c037908aaf48f30d09473b26d15074a2cc19b4c14894a329027669489fb3c4aab213eb54d408779fe4e5833cd952b0087c987e030aa06e6d1e0 SHA512 71067dc04500cb8b65e09bb79c872696b2e539c543e6078d8848b521d779088e3b4978568099fd17674c5cddde8ed291edf851b07c71f71037aa70f53161dc1a
+DIST vivaldi-snapshot_6.8.3371.4-1_amd64.deb 109917056 BLAKE2B feddbdd2d8781a168901d1484af3cbd73a5d7599a8ea42491b402f383ad2e1823da92a0a91573ba9ee3e6ee7e3533ac7ff0e48e3af6ed5dc1ae56942f97662ac SHA512 44d16aa9173be369248c0e87aa0e6531957ba2841199a6602fcefa4b92f8580934cf1c844b55fd30210dca5a8b72fdfc20166db878080e32b67205e12ede3f98
+DIST vivaldi-snapshot_6.8.3371.4-1_arm64.deb 100800948 BLAKE2B b2b30d470fbab7caf94ed5a6adcc285b4e555296974bf21b59e024a31096d8ed3e3366ab99039ce478e423c67e9c894bb409ead273d2a99ef9ecfda25a74ad03 SHA512 cd53275acade5364e4e1ff895ccb50cb9be741a19b02da6687b09f0b644fe8732589f2badb343b1b4093d5aa9db1cea92d16fc6f2c57d2eeafb8515811a9134a
+DIST vivaldi-snapshot_6.8.3371.4-1_armhf.deb 101975264 BLAKE2B 3979d3284353a321f8122bb7d897126b9edcf2c9263254ce126392a84d0fa7d0555d7bd4f656a1240f9eff3a81b5e5c770515430acaa0a130f7cc5213f16369a SHA512 9be04b55e7e30863aec40dc81e66035040598de5a5bc2d63567e106974560d4146f2e9fd25af662975f4cef7be6ea615aa73bdf30ec0c49433cafe43fb48953d
 EBUILD vivaldi-snapshot-6.8.3358.3.ebuild 4026 BLAKE2B 1c038ec9aa5020afa2de9c1bc09feedacd29f56de8cedd80d381deed644f5b5847f75efe979e378b32644a545bddcb2327e5d02a4e54f48bc291fc0c5e8971f3 SHA512 3771a449d516a2a9e3c4097f3d3adb7a7dbc4e70611bc441310dc59ffa4ef72ddd4acfef95c7db3e05666bb6b8c93fd693444e1988c4fcd72c96b163ca47fca5
+EBUILD vivaldi-snapshot-6.8.3371.4.ebuild 4027 BLAKE2B d35faa915e6f681d4428e08318da3a29cfce8e797d26fcda7e36534f9c2d764beee1430b65510002b8f07576268a7968b903a5911721549379a9a3c080051718 SHA512 a30062332c0470596bfb1c1943723ee365f609501e466bbc1e90fe10951bc0928c1e820ddef5a783958f9ab12020ab390c14300746639e2b8ac620a564b8e006
 MISC metadata.xml 634 BLAKE2B fa3f150ffb5f5da3780098747f71d304c9ceb9828cd4dc7c586ba7032a7ba0b3065c25e5dd84fdab7b4302db8b4c848f116eb5b329f440f8a38837dca005a570 SHA512 f226a355a39cec36b5d6f3f88e7f2132693b5dcf51bdec4676d17f608f16ced52d6b9c5dfac2d38f2245cdf6ff7279286034e77ea119cfb4b7240500f612968e
diff --git a/www-client/vivaldi/vivaldi-6.7.3329.27.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-6.8.3371.4.ebuild
index 7472bdfd5b50..ccc6676d81ad 100644
--- a/www-client/vivaldi/vivaldi-6.7.3329.27.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-6.8.3371.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-CHROMIUM_VERSION="124"
+CHROMIUM_VERSION="126"
 CHROMIUM_LANGS="
 	af
 	am
@@ -108,10 +108,10 @@ SRC_URI="
 S="${WORKDIR}"
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* amd64 ~arm ~arm64"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
 IUSE="ffmpeg-chromium gtk proprietary-codecs qt5 qt6 widevine"
 RESTRICT="bindist mirror"
-REQUIRED_USE="ffmpeg-chromium? ( proprietary-codecs )"
+#REQUIRED_USE="ffmpeg-chromium? ( proprietary-codecs )"
 
 RDEPEND="
 	>=app-accessibility/at-spi2-core-2.46.0:2
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 35920a8803fc..0af968f1869b 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,9 +1,9 @@
-DIST vivaldi-stable_6.7.3329.27-1_amd64.deb 108540168 BLAKE2B d483222f6df707e19b5ca24a004452cb3ddd54e45531d1d12e7360cb7ae990620bbd3c57d345f183827ea811215fb31ec74df8e48bc043675f08a9bef09f18bc SHA512 02bbd5c29da6817114d741f87102af4d9beeb7777e6bf9d8f141ac62ad3d5ea91818f3ff0965bc8697fba57f30eb6aa6c0d6e9f48624e7637cc7769937662670
-DIST vivaldi-stable_6.7.3329.27-1_arm64.deb 99168892 BLAKE2B 1ffccb26b7606e436855d86bbfb37d0c07efe4d06c47dbcf4fcc0ca16f72f42d5d5565ab28f31473b0a6886fe6fc11b47a0d65c2ecf66f73595705f9ba91d2ec SHA512 a40bd296328f389980e4fa1692f09585446ed83f90a9b3f05e39ecee7b2d4ffe10f66e6c2c50865f55987d9172ef60f08db021c934e9fa136a26172d3ffdf51a
-DIST vivaldi-stable_6.7.3329.27-1_armhf.deb 100344632 BLAKE2B 755d51a7084bfec4d7f919ced5a0b606e44833853cb5444dbd1dd27d7548db0866377119455ada505f27f9a3bb75178e41898391bf8074f1652ed5609cc11793 SHA512 e376e127e044790a6d4fc9d9f79c2b7632037b43bd431c6e5d016155cf74425073ade360faf8a58426e58b98bac4631015916499b565119d4058eed1e62a633c
 DIST vivaldi-stable_6.7.3329.31-1_amd64.deb 108478272 BLAKE2B 59bdc90e84fc1fd0ca514e6fd233a2d38c5681b2a21a479bab4ab7861bbbfca1374836550a6645102daf8bd5a6c72350fe42b35b285e7d37f4b66d809ee60abe SHA512 913f12db7f28c96f4e1f22234bfa4f3cd92c84f0863f1adac1d65993a45f509f4c20622ec207cb5d9a44dcb8a3e91fc8a215518fcf39441657adb302c2a9a9a9
 DIST vivaldi-stable_6.7.3329.31-1_arm64.deb 99174948 BLAKE2B dfd0dc4b612f2ee99f9e02b08fc2be5f4d2389a08ab8682d03378eb5445816468e56096d6aa0d56abc3909b4dd48987fb65bf6c572673b0d1ce5fa76b1e3923a SHA512 efda1337443d2120c37397e5eff1ba854c3ea20eb24240802b0b26fb925a7825fe7d6590050f1b7a2ddb667f208fbbafd37aa1df622d1574ac58edd3ddc38d46
 DIST vivaldi-stable_6.7.3329.31-1_armhf.deb 100346512 BLAKE2B 0bac5b640f845bdef43a05d77ea038a83b0190d975c5aacff67cabac8b7728cecee061802820952e63810b67537323ef98a84503628d6b99963de19f66bf967c SHA512 6f8f2c1ca12c9246b891816da27e571cb621d5f685bb0ecd5f7f60d857b5dcf55a71c98699b743a23bb3e75d97e3b589bb8dcb475e6c66cb441bfceb43f5c67e
-EBUILD vivaldi-6.7.3329.27.ebuild 4025 BLAKE2B 8546c9ae21968c413c6b833b03ae96c53c7d16b8b3527340407d2792811049439e9bcd6ab9c6c9ff9ee0e3afe672f075f6cb9810ffe83cb5a782876aaa31c672 SHA512 6a228e3234f16ab8b9c4c42c7a9441d907965e66ede11a1c9a87f1ba0cced51defcc12296310e9c2b9a6883169e71bc68fdc236c686cd2aa46861aff82190dcc
-EBUILD vivaldi-6.7.3329.31.ebuild 4026 BLAKE2B 1c038ec9aa5020afa2de9c1bc09feedacd29f56de8cedd80d381deed644f5b5847f75efe979e378b32644a545bddcb2327e5d02a4e54f48bc291fc0c5e8971f3 SHA512 3771a449d516a2a9e3c4097f3d3adb7a7dbc4e70611bc441310dc59ffa4ef72ddd4acfef95c7db3e05666bb6b8c93fd693444e1988c4fcd72c96b163ca47fca5
+DIST vivaldi-stable_6.7.3329.39-1_amd64.deb 108533120 BLAKE2B 500a9d25d4dab686f1bbe18c2fef5a72d0fc8212855f7f3ed6235ba60a795552c922a3be7f738fc3d96e9c3294f27262652b06c02998bf4b87885e8cd7400438 SHA512 51ba4d2086bc67f1c185e90866cd4b7dda2b10970a7d4d34466014fd01324f457ffe600e30b299e78321d671b2b9b14ce49bce0ebb16cd18411029274fff4389
+DIST vivaldi-stable_6.7.3329.39-1_arm64.deb 99223148 BLAKE2B 54b07e6bf728a6126dea6e1a2379b80fd494a826636b57c05733a5081fbead81fb6f1fe4c56aa0ec2e739bf17e777d859ecd6a392a6d60e09dd7ab9d00aeea6d SHA512 2855c729e6812984689208a3b7c1e1d1436b0384d098d1d39a34683430d131a68c314bd1f1a16f4c31d209d63a87bdcbcb55234f696fc8bea2775a4b1bb62ec6
+DIST vivaldi-stable_6.7.3329.39-1_armhf.deb 100353672 BLAKE2B bb4c8c17541aeed3a7ec2ae48df2096d004b1d348a8bbd7439cc44f9430a52e10755495b1a3a718de6de7b2d80f847995c817be06e57e08f90657683bb1841ee SHA512 077356d67a936c7ea2b143fceb0c8fc4ebc8006d575b45f0e98dccd033be81edf31a3e649bc9f5937aaf5471b8d1762fb9bfe78ec172384324cf2ddb5167ac83
+EBUILD vivaldi-6.7.3329.31.ebuild 4025 BLAKE2B 8546c9ae21968c413c6b833b03ae96c53c7d16b8b3527340407d2792811049439e9bcd6ab9c6c9ff9ee0e3afe672f075f6cb9810ffe83cb5a782876aaa31c672 SHA512 6a228e3234f16ab8b9c4c42c7a9441d907965e66ede11a1c9a87f1ba0cced51defcc12296310e9c2b9a6883169e71bc68fdc236c686cd2aa46861aff82190dcc
+EBUILD vivaldi-6.7.3329.39.ebuild 4026 BLAKE2B 1c038ec9aa5020afa2de9c1bc09feedacd29f56de8cedd80d381deed644f5b5847f75efe979e378b32644a545bddcb2327e5d02a4e54f48bc291fc0c5e8971f3 SHA512 3771a449d516a2a9e3c4097f3d3adb7a7dbc4e70611bc441310dc59ffa4ef72ddd4acfef95c7db3e05666bb6b8c93fd693444e1988c4fcd72c96b163ca47fca5
 MISC metadata.xml 634 BLAKE2B fa3f150ffb5f5da3780098747f71d304c9ceb9828cd4dc7c586ba7032a7ba0b3065c25e5dd84fdab7b4302db8b4c848f116eb5b329f440f8a38837dca005a570 SHA512 f226a355a39cec36b5d6f3f88e7f2132693b5dcf51bdec4676d17f608f16ced52d6b9c5dfac2d38f2245cdf6ff7279286034e77ea119cfb4b7240500f612968e
diff --git a/www-client/vivaldi/vivaldi-6.7.3329.31.ebuild b/www-client/vivaldi/vivaldi-6.7.3329.31.ebuild
index 8e5ee528e3af..7472bdfd5b50 100644
--- a/www-client/vivaldi/vivaldi-6.7.3329.31.ebuild
+++ b/www-client/vivaldi/vivaldi-6.7.3329.31.ebuild
@@ -108,7 +108,7 @@ SRC_URI="
 S="${WORKDIR}"
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
+KEYWORDS="-* amd64 ~arm ~arm64"
 IUSE="ffmpeg-chromium gtk proprietary-codecs qt5 qt6 widevine"
 RESTRICT="bindist mirror"
 REQUIRED_USE="ffmpeg-chromium? ( proprietary-codecs )"
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-6.7.3329.19.ebuild b/www-client/vivaldi/vivaldi-6.7.3329.39.ebuild
index 8739f8048d38..8e5ee528e3af 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-6.7.3329.19.ebuild
+++ b/www-client/vivaldi/vivaldi-6.7.3329.39.ebuild
@@ -97,7 +97,6 @@ else
 	DEB_REV=1
 fi
 
-KEYWORDS="-* ~amd64 ~arm ~arm64"
 VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
 
 SRC_URI="
@@ -106,8 +105,10 @@ SRC_URI="
 	arm64? ( ${VIVALDI_BASE_URI}arm64.deb )
 "
 
+S="${WORKDIR}"
 LICENSE="Vivaldi"
 SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
 IUSE="ffmpeg-chromium gtk proprietary-codecs qt5 qt6 widevine"
 RESTRICT="bindist mirror"
 REQUIRED_USE="ffmpeg-chromium? ( proprietary-codecs )"
@@ -149,7 +150,6 @@ RDEPEND="
 
 QA_PREBUILT="*"
 CONFIG_CHECK="~CPU_FREQ"
-S="${WORKDIR}"
 
 src_unpack() {
 	unpack_deb ${A}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 7d2fa18c03ed..5870520539ca 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/xcb-imdkit/Manifest b/x11-libs/xcb-imdkit/Manifest
index e762250e665d..f31c3ba453c1 100644
--- a/x11-libs/xcb-imdkit/Manifest
+++ b/x11-libs/xcb-imdkit/Manifest
@@ -1,5 +1,5 @@
-DIST xcb-imdkit-1.0.7.tar.xz 346244 BLAKE2B 32cfd7d278ce8d65c2b2dec033ae0b4bb3e18f7b91e620788c797192dcb94a1c578930ac816fc7298d01362fb7abb9b461e1aec918164433b01aea6c85c47ecd SHA512 222b6fa4e699832c9ff926ebed6ca6c959aa2a55a9aebe9c8824ca1d84dcd4d699bbe75e4ceb36453340be9dcd86e0dbad01553d01e89c3a4ba6d48ff1f100a4
 DIST xcb-imdkit-1.0.8.tar.zst 580618 BLAKE2B 760f9a65692986b2bbb359f919e209a5c0ef42b302b25dbb1892cf9bc986b3d9c05963ac454bc4b3ad42f7c2b3549cb5e1c3bbd29fcb39aa03490cb20c00c2d6 SHA512 318106904d1dca79d006e91f21dd965ff486be72edc790a79100908e588e8c26b9faa505daa45d59789feeac8f01a132f14c9509ac68c8ebc43af5719774443d
-EBUILD xcb-imdkit-1.0.7.ebuild 644 BLAKE2B e880e4c11377fba8287fc3bac02b01f95d8de4a2f9a8e4d0cc6422529fd66bc665420ed0f093e14523f20cf595fb650f7d154c575a4fbe60a80b55adbfb3286d SHA512 310c81aecbbc828f4b5d4dd8c27b2f21c942c63217d21cf1db1636ab60383627414ddd72fb63f1375491aaf184701f6f11fbc4d99f4bfd36f73bc329752fdbb6
+DIST xcb-imdkit-1.0.9.tar.zst 580633 BLAKE2B b153c10c87460da8e1e06133c9ce05302e8f4408551ce4b5a962a5b52b9256635c03b8d5224f826cdf229136f92865254716682dd5b2adcf44b3848086fb641e SHA512 b63e4698e4c6c918923e58f38aa096366025d960f362ef9c84d47cb3f4fc1e01f231342839552019ccf256b1de1e108bb395057ea2beb2d009c245954296b321
 EBUILD xcb-imdkit-1.0.8.ebuild 654 BLAKE2B d768b5e73abab2cc74ec0c0f4334dd91f44052fb5e936c3e5b63976a758408dcca877be77038e6657de8c8955c7b1f9bcd66d65192705a77b240f5bcca46c12e SHA512 b7c57676504aa05bb3922ba25acd48a5e58ad3f0e808b4c123239af444ae40102931c02a933bc012201d9aa4efa19a7190ca062d4972f2902f01167ac7c57cb3
+EBUILD xcb-imdkit-1.0.9.ebuild 654 BLAKE2B d768b5e73abab2cc74ec0c0f4334dd91f44052fb5e936c3e5b63976a758408dcca877be77038e6657de8c8955c7b1f9bcd66d65192705a77b240f5bcca46c12e SHA512 b7c57676504aa05bb3922ba25acd48a5e58ad3f0e808b4c123239af444ae40102931c02a933bc012201d9aa4efa19a7190ca062d4972f2902f01167ac7c57cb3
 MISC metadata.xml 620 BLAKE2B 53c4d07dd7404fc13572d6611654a66c5ec54b898175385075c6994e45de993022f2a1a42b4c42f901ab3c68b6a317d6c7e5492a9a9380da79cff426ad16f477 SHA512 491151816522ecd61808e8e7c64b05977ebc4f7ef19e9c2cdb74ccf003ced19217d283b23bf1fa1e049661b2606bbd459215bb503a9488c9c1c047facb193bcc
diff --git a/x11-libs/xcb-imdkit/xcb-imdkit-1.0.7.ebuild b/x11-libs/xcb-imdkit/xcb-imdkit-1.0.9.ebuild
index 77009381c920..fe5d788eb8b3 100644
--- a/x11-libs/xcb-imdkit/xcb-imdkit-1.0.7.ebuild
+++ b/x11-libs/xcb-imdkit/xcb-imdkit-1.0.9.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake unpacker
 
 DESCRIPTION="Input method development support for xcb"
 HOMEPAGE="https://github.com/fcitx/xcb-imdkit"
-SRC_URI="https://download.fcitx-im.org/fcitx5/${PN}/${P}.tar.xz"
+SRC_URI="https://download.fcitx-im.org/fcitx5/${PN}/${P}.tar.zst"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 3b3da948f10d..998321dfcff3 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/spacefm/Manifest b/x11-misc/spacefm/Manifest
index 3bd93f082205..bacb0ed5dc3f 100644
--- a/x11-misc/spacefm/Manifest
+++ b/x11-misc/spacefm/Manifest
@@ -1,7 +1,9 @@
 AUX spacefm-9999-include-sysmacros.patch 192 BLAKE2B 6d5d99c7a49310833ff07f1c0ea93b3399e67e791241a1f56d2a4e1d796b79c3fdb2b38a11f06b508512ed0e565c43d20f988e31e333291d8942bb1d698984cd SHA512 9bc689f5d9e97ef6515ba6d475571ede0d4acd85bbe9c000e393eaf2caffa99807bd6172bb1e085b761bddad17417cef1e0530f289fb05152a6790307f8e1428
 AUX spacefm-dash.patch 1737 BLAKE2B 8101c05d2c4f268433d92244f7a78bb7ebef17714ee29139adb6a02ba6c7a60cb8a14a8bc2e1ef8e43b374fdbc20216cad68e1fe36d8ac2671da595f34761587 SHA512 4e4c89c546e48a1972877c02a9b635bb56fe91a1a2f561cff85c836d7f8f4cb8638b5852c13a29c707061959d501a6033c93eff57ac488a833a82f55ef9746f4
 AUX spacefm-fno-common.patch 2316 BLAKE2B 3f91d4eb0039a3b0e4ba3fe13b9d6436bd91beca0e224af7722d3fa2002e413c6e78cdb7f2eb690e2d58dda90638d896c8f186de8de544829a5bd0ff078b7a60 SHA512 02cd669d89080b5644adfa3092c452ebd3e6a1c39610ba96f5e49e23f3b6697996aa7e35709e46e6b8eb3fc73ff026cc9cf2c7183d4d867ef52e880fc33d31c4
+AUX spacefm-gcc14-build-fix.patch 3586 BLAKE2B 3e2ff0a26fb927f2dbdd95cd25ba9f38478055f9e77552975fade7f53d359f9cc012c7f30bf38ac98255f2b077c9c4ff2eab38cc8d8082370522f33b18e0c4fe SHA512 042e9868ec850e4764cfdf0108f919b22406dd9bffbd0731dcb6a78759e1b56c0300079cd70e4491e5b1ccce1387bef407f997532c87c4f1dc6949f40db08061
 DIST spacefm-1.0.6.tar.gz 3498587 BLAKE2B fc4753ff370fa940ef5737bc7826558847dfbbbec43c1a150d887ed38655f9e45255a737f61a024318c9f37e86a15989da66c83d4dcf5a811603950009b20547 SHA512 37fc0dd31f02158502f592415b4c375ee49560af6f03d75b035d7c6c45bdc47064bba1ae8987b4cc8be2e02b3dfcdc17ec760411975e7b5f74343a2293fb2c8c
 EBUILD spacefm-1.0.6-r1.ebuild 1983 BLAKE2B d21ef66e6f1cb27179f2d783a4153c6b4fd65491f0fdc4379c0e99ab64d69b47264218779efad5fc25c37052d11a61d34643b71d7ad3a9eb3a1230d3ff61f816 SHA512 8eae7ba5c9665173c17529d9286cc5effa44294eec6622af51af7ce8421f36fe5cf0b997de57afd0e11a648d901309386cb92c29bbe8aa0ec01eb1bcdf2fdd6d
 EBUILD spacefm-1.0.6-r2.ebuild 2074 BLAKE2B ffd12edbf1484e5f9b0914ffe467366e928b15cb5261ad286fdcfb70280aa1409a9e37878826ea5f1a391cb4324eeb14a040d54543d7753e67375040cf3a4568 SHA512 2230c856408b00295e240d8aa546db3fd508cfef3abb461d99c1e0e086d78292583ffbd61c23987137d20db637cebb4553a30543299ef20f408b1f4df46e5817
+EBUILD spacefm-1.0.6-r3.ebuild 2148 BLAKE2B 3649fd95078a55f2765efdf3d8c8b424fed0f966789cfa274ad2e50a653ec3b83c72d20ae5ec21445cee19512d286a8fb0bd5b4201253a64c1d413343f0c3c78 SHA512 d792361ab3c90e40f9ecff67ab181605fa6a3ec77fac87ee6af2d3abda6bdce344585bb5c0dfb15e02989136197915e3340d1665c23679c0ff45e02dee1e6204
 MISC metadata.xml 1074 BLAKE2B bb1ae823905cb180e7a65c7c157b97fef75c6839f38f31451876e0697de50ba77a72aed90692fc6df87ede02cd0b2c5e9b7970c01bb2bcf2c598999ea49f2671 SHA512 486c0afcc309a15ed8dff31faa40f8b2f6bfc6d6a6a414661fba7acebbd5e58548e10e5e71185e9ed2ab34f151b7237685428f42b0a48ae8b103fab174b34e88
diff --git a/x11-misc/spacefm/files/spacefm-gcc14-build-fix.patch b/x11-misc/spacefm/files/spacefm-gcc14-build-fix.patch
new file mode 100644
index 000000000000..7212241c68e0
--- /dev/null
+++ b/x11-misc/spacefm/files/spacefm-gcc14-build-fix.patch
@@ -0,0 +1,76 @@
+https://github.com/IgnorantGuru/spacefm/pull/816
+From: Brahmajit Das <brahmajit.xyz@gmail.com>
+Date: Mon, 22 Apr 2024 02:09:09 +0530
+Subject: [PATCH 1/1] Fix build issues with GCC 14
+
+GCC 14 enables -Wincompatible-pointer-types by default thus resulting in
+build error such as:
+exo-icon-view.c:2686:27: error: assignment to GdkWindow {aka struct _GdkWindow } from incompatible pointer type GObject {aka struct _GObject } [-Wincompatible-pointer-types]
+
+Much of the code changes are borrowed from older code segments.
+
+First reported on Gentoo linux, for more reference please bug:
+https://bugs.gentoo.org/928492
+
+Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
+--- a/src/exo/exo-gdk-pixbuf-extensions.c
++++ b/src/exo/exo-gdk-pixbuf-extensions.c
+@@ -492,7 +492,10 @@ exo_gdk_pixbuf_scale_down (GdkPixbuf *source,
+ 
+     /* check if we need to scale */
+     if (G_UNLIKELY (source_width <= dest_width && source_height <= dest_height))
+-        return g_object_ref (G_OBJECT (source));
++    {
++        g_object_ref (G_OBJECT (source));
++        return source;
++    }
+ 
+     /* check if aspect ratio should be preserved */
+     if (G_LIKELY (preserve_aspect_ratio))
+--- a/src/exo/exo-icon-chooser-model.c
++++ b/src/exo/exo-icon-chooser-model.c
+@@ -671,7 +671,8 @@ _exo_icon_chooser_model_get_for_icon_theme (GtkIconTheme *icon_theme)
+         g_object_set_data (G_OBJECT (icon_theme), "exo-icon-chooser-default-model", model);
+ 
+         /* associated the model with the icon theme */
+-        model->icon_theme = g_object_ref (G_OBJECT (icon_theme));
++        model->icon_theme = icon_theme;
++        g_object_ref (G_OBJECT (icon_theme));
+         exo_icon_chooser_model_icon_theme_changed (icon_theme, model);
+         g_signal_connect (G_OBJECT (icon_theme), "changed", G_CALLBACK (exo_icon_chooser_model_icon_theme_changed), model);
+     }
+--- a/src/exo/exo-icon-view.c
++++ b/src/exo/exo-icon-view.c
+@@ -2683,7 +2683,8 @@ exo_icon_view_key_press_event (GtkWidget   *widget,
+     /* allocate a new event to forward */
+     new_event = gdk_event_copy ((GdkEvent *) event);
+     g_object_unref (G_OBJECT (new_event->key.window));
+-    new_event->key.window = g_object_ref (G_OBJECT (gtk_widget_get_window (GTK_WIDGET(icon_view->priv->search_entry))));
++    new_event->key.window = gtk_widget_get_window (GTK_WIDGET(icon_view->priv->search_entry));
++    g_object_ref (G_OBJECT (gtk_widget_get_window (GTK_WIDGET(new_event->key.window))));
+ 
+     /* send the event to the search entry. If the "preedit-changed" signal is
+    * emitted during this event, priv->search_imcontext_changed will be set.
+@@ -3082,7 +3083,8 @@ exo_icon_view_set_hadjustment (ExoIconView   *icon_view,
+     if (!hadj)
+         hadj = gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
+ 
+-    icon_view->priv->hadjustment = g_object_ref_sink (G_OBJECT (hadj));
++    icon_view->priv->hadjustment = hadj; 
++    g_object_ref_sink (G_OBJECT (icon_view->priv->hadjustment));
+ 
+     g_signal_connect (icon_view->priv->hadjustment, "value-changed",
+                       G_CALLBACK (exo_icon_view_adjustment_changed),
+@@ -3109,7 +3111,8 @@ exo_icon_view_set_vadjustment (ExoIconView   *icon_view,
+     if (!vadj)
+         vadj = gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
+ 
+-    icon_view->priv->vadjustment = g_object_ref_sink (G_OBJECT (vadj));
++    icon_view->priv->vadjustment = vadj;
++    g_object_ref_sink(G_OBJECT (icon_view->priv->vadjustment));
+ 
+     g_signal_connect (icon_view->priv->vadjustment, "value-changed",
+                       G_CALLBACK (exo_icon_view_adjustment_changed),
+-- 
+2.44.0
+
diff --git a/x11-misc/spacefm/spacefm-1.0.6-r3.ebuild b/x11-misc/spacefm/spacefm-1.0.6-r3.ebuild
new file mode 100644
index 000000000000..6b688c387c0a
--- /dev/null
+++ b/x11-misc/spacefm/spacefm-1.0.6-r3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info optfeature xdg
+
+DESCRIPTION="A multi-panel tabbed file manager"
+HOMEPAGE="https://ignorantguru.github.io/spacefm/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/IgnorantGuru/${PN}.git"
+	EGIT_BRANCH="next"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/IgnorantGuru/spacefm/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="+startup-notification +video-thumbnails"
+
+RDEPEND="dev-libs/glib:2
+	dev-util/desktop-file-utils
+	virtual/udev
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango
+	x11-libs/libX11
+	x11-misc/shared-mime-info
+	startup-notification? ( x11-libs/startup-notification )
+	video-thumbnails? ( media-video/ffmpegthumbnailer )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-include-sysmacros.patch
+	"${FILESDIR}"/${PN}-fno-common.patch
+	"${FILESDIR}"/${PN}-dash.patch #891181
+	"${FILESDIR}"/${PN}-gcc14-build-fix.patch #928492
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable startup-notification) \
+		$(use_enable video-thumbnails) \
+		--disable-hal \
+		--enable-inotify \
+		--disable-pixmaps \
+		--with-gtk3
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "mounting as non-root user" sys-apps/udevil sys-apps/pmount sys-fs/udisks
+	optfeature "supporting ftp/nfs/smb/ssh URLs in the path bar" sys-apps/udevil
+	optfeature "performing as root" x11-misc/ktsuss kde-plasma/kde-cli-tools[kdesu]
+	# sys-apps/util-linux is required for eject
+	optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof sys-apps/util-linux
+
+	if ! has_version 'sys-fs/udisks' ; then
+		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
+		elog "you may need to enable kernel polling for device media changes to be detected."
+		elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
+	fi
+}
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 7590f75a5060..f394bea7c35d 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/xfce4-power-manager/Manifest b/xfce-base/xfce4-power-manager/Manifest
index 909a3da9b404..c2de31ac18fd 100644
--- a/xfce-base/xfce4-power-manager/Manifest
+++ b/xfce-base/xfce4-power-manager/Manifest
@@ -1,5 +1,7 @@
 DIST xfce4-power-manager-4.18.3.tar.bz2 1244867 BLAKE2B a028f556f485f51668ab46ac246e07d9e94376aa1609d1c6a08e159df749bc8e37819ecdcfd09e6d2edbcb72441c06a310a4ce2f6ca1f109dd6e5b9da7d9072f SHA512 97f198ed78c3a13c5e64f0551d49533ac2efe0c719f4360eab94736790b225411b347a8524e8a2d7e28b14e546df6133df5273c80d8e0eb5766145782e1412fb
 DIST xfce4-power-manager-4.19.2.tar.bz2 1506787 BLAKE2B f9ceaabaaad09f236bf7f391f3f84fe614aa2e95468204a64a6d96da580d4c249565486ca4a89be09ee14f8dc849d6393ab731a6ac50d24c689e99e3da6a59ac SHA512 3a1f43df4a980d72022f61252e5c5a1d65a424ecbf7d588fe87d24f364d6a748f4d5f107e6af973654d9a70557d4ccd639d1365c0ae88a6327ac16351c66be50
+DIST xfce4-power-manager-4.19.3.tar.bz2 1513388 BLAKE2B dfdad39878e9ee1181053ebbd8248bc7eb9ddccb6bb156d8d6093bcaab657549fc182db5ec766c968dd7a1534c7e3131d468a8cba0876f34b6a61ff8012a6b3e SHA512 984dfc52f4863bf9c9e05e5ae021c4146e5a2f7edff39582d676717073123937980387c1712ce4657c8a4816caf59f73d9e1fd3fa4c54e37ad46c2233f528f23
 EBUILD xfce4-power-manager-4.18.3.ebuild 1616 BLAKE2B 0507a3684e7bc9907460dd6e932f148ec1a8f5956403404de7728e90283aa654e7ef486f56d5721ef287aa803b1228a2a524b9b20a195379a26dd04fb9ba1888 SHA512 a56394b73b0d05e58dce5087f92688a0f85bf282a247b87f64d4771bf0040068984b3f4950a13ac3f7cdd7f6b6593756182420efca0ade6857d20b9bc8af10bf
 EBUILD xfce4-power-manager-4.19.2.ebuild 1789 BLAKE2B 2da20ed10ded318a51290bc0eeef3881d2fa765c0ee3c5e034f9ad038c1fd1ebc5b9ce721fdda93d2d7a47c5bd4e03108271188a86dfb9077751ec851f6b46f1 SHA512 63ea903b32e6dec7c7e3184414cb96b4cd49017069495e51c8e24ee9d472cf022c979e1dbc181f8b80ed1f83d121f20561a289f9c78951137d7ea27ff5f55394
+EBUILD xfce4-power-manager-4.19.3.ebuild 1794 BLAKE2B fd943ed7c2e645784fe4905c382ca4e964b5575b812d3b618842648bd359274fe4c2c19dd42cb21b1796bea3a4043dc75d9ea710bb5f459c55ed6636bb13a9c6 SHA512 afb99d538ba257f0649f541922eacda69d93cac0142fb3106f3df2c372cd0d8d243a2433b4fa80aadbf2e6767e2b1a39f8182cd99e267c64946da99fcb8bb3bc
 MISC metadata.xml 361 BLAKE2B 0cd2ec9e6643d7379a8c37fc9ae3b3902396c94732182f4a3c7d50bef85e555c9d69b6c8ed13d127167c44e687d356b171f46d071acfa4c26b623835df9d94f6 SHA512 ca556c6a8e5df8b0e897fe64e04fdf23b23518b86db0e29568131d2d17329122f2aa012b2b2a7fb5811bd17a230c1d5a6065ce747532b4eb868cab4eb9d9dcd7
diff --git a/xfce-base/xfce4-power-manager/xfce4-power-manager-4.19.3.ebuild b/xfce-base/xfce4-power-manager/xfce4-power-manager-4.19.3.ebuild
new file mode 100644
index 000000000000..6e8bb995fadf
--- /dev/null
+++ b/xfce-base/xfce4-power-manager/xfce4-power-manager-4.19.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Power manager for the Xfce desktop environment"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/xfce4-power-manager/start
+	https://gitlab.xfce.org/xfce/xfce4-power-manager/
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+panel-plugin policykit wayland X"
+REQUIRED_USE="|| ( wayland X )"
+
+DEPEND="
+	>=dev-libs/glib-2.70.0
+	>=sys-power/upower-0.99.10
+	>=x11-libs/gtk+-3.24.0:3[wayland?,X?]
+	>=x11-libs/libnotify-0.7.0
+	>=xfce-base/xfconf-4.12:=
+	>=xfce-base/libxfce4ui-4.18.4:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.19.2:=
+	panel-plugin? ( >=xfce-base/xfce4-panel-4.14.0:= )
+	policykit? ( >=sys-auth/polkit-0.102 )
+	wayland? (
+		>=dev-libs/wayland-1.15
+	)
+	X? (
+		>=x11-libs/libX11-1.6.7
+		>=x11-libs/libXrandr-1.5.0
+		>=x11-libs/libXext-1.0.0
+		x11-libs/libXtst
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+DEPEND+="
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	wayland? (
+		>=dev-libs/wayland-protocols-1.20
+		>=dev-util/wayland-scanner-1.15
+	)
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable policykit polkit)
+		$(use_enable panel-plugin xfce4panel)
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	if ! has_version sys-apps/systemd && ! has_version sys-auth/elogind
+	then
+		elog "Suspend/hibernate support requires a logind provider installed"
+		elog "(sys-apps/systemd or sys-auth/elogind)"
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
author	V3n3RiX <venerix@koprulu.sector>	2024-06-03 00:07:26 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2024-06-03 00:07:26 +0100
commit	a3bb28551df94028000fb72308a9e9baa01458b0 (patch)
tree	33b14c7bf0dffbd5bb04dbd5b395514ebdda4896
parent	6657c680376cedf378fcf328e5fa03ed3b41d580 (diff)