439 files changed, 6050 insertions, 2620 deletions
diff --git a/Manifest b/Manifest
index 6f468d0d7bc6..c0afe2a882ef 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29760 BLAKE2B 7ac182a064fddd18eba324eb939c4a29c79c291968a628abdddafc5841b224f02d16a468953ccedc45e75c9477380f61b6f101987a1f106bfe4f74ad29061463 SHA512 bc1d6d510fbe1c48f3c41eb0436cf807d72bfe2c86966a26c6f3c8466ad86b440acc31f4b0414ab29a10f7c453111bddf46377d7a1c715c65b1db7ab8506575e
-TIMESTAMP 2024-07-17T10:40:46Z
+MANIFEST Manifest.files.gz 29794 BLAKE2B 55224b63cacb061f4add8174dc6a94b6fa12bf90e5695dedfd33973454da3f7fc2017177833ddd4e8a1fc05d3646afa6208eae83c358748bf11d5c3dacd53c5e SHA512 d59d58c95c9b799773ef05d3cf2453468661930a987e154af44d8b1b0ee461734b50ce7203d04a889104729236bf7f1348eb325bc401e13eceb70276585104ca
+TIMESTAMP 2024-07-18T10:10:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmaXn65fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmaY6ixfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCffA/+KZg+VlXeh2FgINdkX0hTx5tJOJ7p6zsuDMIzPU4nuALW8CkqasIFE8bs
-KIfz6jnvZW/cY3MG2L1tNzwLsxiOxpm/ReU4yrNkIwtbptb6Iv8vFJc9QISe2ljy
-kPggyyStT00NS2/K7DwPcGMRaqkQl1P9NDJ28B7PfDzWNU4MohWa9st8aZ6RO9tP
-r73h4HFJOTIm+2Sbn9+jh9sCi4b5Y5cmg2sG4WkVZvZVxtV2pUbIZ8qE3UznvfuS
-7UHe2iAT2sJyzikfc+lRLAN0pd2BurJBpwy3tk/ZNs4uGEjgYLeOGmaVTLVYl0oG
-Ew32wDuNSQ+d98FLUgWS5AUALuhExTf3pcXKcopCX37KwT3jhmS2Y85wOXQAnexj
-04w2XnfL6W9qAV7rWw6nn7sFiyHMoyaCe4HcliCMBstRx8z3bXhRoVDSZuYeFQwM
-/BgcRialR8lgGD1w4uYV729cX8lolbI7nZew1Ht2rJnwvulEeFHDhIFvqNAceIQ3
-/MPSfdCfBkvnuuf+tHUIR8CLmIRCyvDZRDkoQiURfAXmXDXZiMgeO6fLSLTa0g6B
-eYgS9CiZNAMdICkf3Nj/NRTYOuNaPpsr8zlnGETyRrtfme2jhOVtv+P+Z4c0jNC2
-l+gSqMyhcB1uYdE9nEYQvZ6UvMcNW3kvQ0wrCBrgFjyALxy9UsY=
-=9Mm8
+klDeog//XhIahB4TWWWlhmcxLwZf+g3X/3237E4ca8xT9Dv056JDOjsoTQvPuwhV
+q6VrLK/Z4n9QxzXFJACZBQUEQ17b6cXwOLfeMnkmVDwe4qgSp3QnQGitivKUbPiR
+ZZO1MgOUk6DMLf/rqBs0LNEmANmJGTZbIAcU2xmvukeYsQBG/UyP5XbXilvNEePE
+ZzHSlQAox9bA8WvVG+38SZh0ZfWtAMWr5KpAf3zEjtGo0NVB7AEyxOsbOcvswEEr
+123X9FxpWf6Viii9q+Pw+tNbkDdasg72uoGzlNT45fYWm7iZ3JQT5RPIRfc9zvWF
+dM8MabnIuNCoMdYfvgbtTrGTqkEvk1MQxLk9KCpv3WKkj43NW4Jb/SLT2vP8Xl8q
+5YMNenJ7DdPrA/fY4F6816HjOhQuHf+7y8cSQDfBgPttv4KaX17tcokQRmoI9nC6
+LrwhF5XSfpjW2Kq+JFtGPiqSxiuVVROgIt4soyppkV7cF18fF+ppdv8KkzQXyhK5
+zGJKDWIt+d0gkyjfvS0oxaShknmOYDHTAIMn4Zd4nHJDdV1fXQpNw9aJ/WIgkMR8
+aO5vwR/QZEvL8n/mSNgY5N9WPLQniRuz6enKw3DrDMfapU4bia6w61jQfl78aG5s
+qfcktESe/jL48JAG0I8FUkSW2kw2V0bZJ18xtCTfJfaRIEkzRWA=
+=OAuV
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 0f700abf30b1..c7d91f6a7729 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 81c7aa8e2c14..e00b4df7f424 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index 02d9fe521b84..0b06d1828d88 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -4,6 +4,8 @@ AUX swtpm-0.7.2-Conditionalize-test-dependencies.patch 1065 BLAKE2B 359cf6e69269
 AUX swtpm-0.8.2-slibtool.patch 779 BLAKE2B 4403ddecb4d1b2f0f40c3f4511ccc51eb0345d8570a5b36ef125c8c8781d8bceee6741b08f77057ca9eb222cfe31045748e722d837c011a393512cd539c1f7e7 SHA512 37bdaf16950b3b94af4ea8d8f042919a550fae1c9a8519eac36acc1fa289daa5677ba227b5e5a224a98b4f6859335a3f4e10de293c8283ac87474a84cef49f9a
 DIST swtpm-0.8.1.tar.gz 364169 BLAKE2B 4b364ed581ea97d78c5c6248870503b1612d7d164b05b76c1f02644aade6fd09f204396f0a2d0db4e0ecec2792dc512f7c4393c44bf7ce447a3a7fbb8754594f SHA512 07276519b0e20c9c4167ce78e789d2072eb90172ed9bcba2a11eef46ee03a77860f7a2218f4dc013a2ddb8471079e3cbe43f8ab02174bd704a78aea8eee3d2fc
 DIST swtpm-0.8.2.tar.gz 364432 BLAKE2B 1ffa6feed88a67a2eeea1fca1c034f6513347173d59ae0c0654696faa1e791529e7fa044c478e5fb7e016117ce5f3151b875014d85eac528e4b6d92d5cf9017b SHA512 3b63116b1ed56087e05b0b697462720a10fe384ea2b8ec7115b549df8f557f6a9cf4de8e7d65b8061a1c85e54e015e0249bfbb613d35c1b64453a98d23ce334f
+DIST swtpm-0.9.0.tar.gz 370942 BLAKE2B bed63851dfdb94f463bbac962044114f75abd36f6558f173fd67be608f50c8954c6038d33bb6e3d2e88427238c7c06048beae23b84b2a1e186c0de98a9bd5ad8 SHA512 4f1723679b85218e80ea6aacdffa687e541ee309ddab9bcb8d8e5aa0b461ee431c880f2e300f1dcae112646f3636593005a342ee0cb762ec115aa599369e111c
 EBUILD swtpm-0.8.1-r2.ebuild 1602 BLAKE2B b51ae100307f16be7042c8215121b12a2724c0d370b4261ca9cb2fa3ee1533901b40f7839916fca557f91c0c048154184b9012bd59b2d3997d1c288ce5b0986c SHA512 6c1ee351c2d46a7dcfc368efead75ead25471aa1fdd214827df0fa156259d1b12b348846aee6e87ec1f0c8015eb279967760eedb10f27b7ad1cf43c341043d64
 EBUILD swtpm-0.8.2.ebuild 1584 BLAKE2B 56ef23842f8f8db53af77801012e0774cdd9b491d5253c4c763247ea219bd2b9c3888be484b1d8d96b0e6b1f1a43c076e25da61721896be278f57f7433714089 SHA512 dd7e4b1940abe4eb2f0e327b92f9405be5bc38701e3fbb757dc535b12c537d7d6542d772a7b30c517ec3c212971501704d19a93f92f07d59ba94521f95f8bf27
+EBUILD swtpm-0.9.0.ebuild 1607 BLAKE2B f36e7e46d47a2bd3d761038c901ad4ac9c81775140bc19f90b0295430c7f5c6f44de0227ad901f41eafb759008fb33234d62bdc9fa8df2ad9f2896d5afff3803 SHA512 03a5afeeb92e08010634af1183adfdff229a677a9ed69e20e580ae0d66aadafd45da699ec0735240f3a3f6f7c8df26c7ec90858b66a7860b697b5a01e6de9925
 MISC metadata.xml 717 BLAKE2B 70de08f9ed69084e7ed07c72ae96ab76cdb8bf489c3d3664edab24d2a904f44a6483bb9685f0e97f4520420dab1b6796e58cff00ba82190459af12398aa4b6d1 SHA512 a4f2977c84e03e215f6455def44ead6f767d6a4803061942b799b38bedaada373b51bbd47bd87c4339df32138a339b5f595a5ea19c5706b5e424329cc8aec0a5
diff --git a/app-crypt/swtpm/swtpm-0.9.0.ebuild b/app-crypt/swtpm/swtpm-0.9.0.ebuild
new file mode 100644
index 000000000000..8b3578675498
--- /dev/null
+++ b/app-crypt/swtpm/swtpm-0.9.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit autotools python-any-r1
+
+DESCRIPTION="Libtpms-based TPM emulator"
+HOMEPAGE="https://github.com/stefanberger/swtpm"
+SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="fuse seccomp test"
+RESTRICT="!test? ( test )"
+
+# net-libs/gnutls[pkcs11,tools] is required otherwsie it not possible to
+# provision new vTPMs. swtpm_cert spawns certttool, and upstream expects
+# pkcs11 in gnutls: https://github.com/stefanberger/swtpm/issues/477.
+
+RDEPEND="fuse? (
+		dev-libs/glib:2
+		sys-fs/fuse:0
+	)
+	seccomp? ( sys-libs/libseccomp )
+	acct-group/tss
+	acct-user/tss
+	dev-libs/gmp:=
+	dev-libs/openssl:0=
+	dev-libs/json-glib
+	dev-libs/libtpms
+	dev-libs/libtasn1:=
+	net-libs/gnutls:=[pkcs11,tools]
+"
+
+DEPEND="${RDEPEND}
+	test?	(
+		net-misc/socat
+		dev-tcltk/expect
+		)"
+
+BDEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6.0-fix-localca-path.patch"
+	"${FILESDIR}/${PN}-0.5.0-build-sys-Remove-WError.patch"
+	"${FILESDIR}/${PN}-0.8.2-slibtool.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-openssl \
+		--with-gnutls \
+		--without-selinux \
+		$(use_with fuse cuse) \
+		$(use_with seccomp) \
+		$(use_enable test tests)
+}
+
+src_install() {
+	default
+	fowners -R tss:root /var/lib/swtpm-localca
+	fperms 750 /var/lib/swtpm-localca
+	keepdir /var/lib/swtpm-localca
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 6fe94d921ddf..b8562bffe484 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest
index 74663bd0762a..69d83a139f68 100644
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@@ -5,5 +5,5 @@ DIST bluefish-2.2.13.tar.bz2 4254294 BLAKE2B 7d830fa19cfeaac56c7823760e789b32306
 DIST bluefish-2.2.15.tar.bz2 4762151 BLAKE2B 18ea676f0853435203f119788082057dde499ce65a9ba3ac5e3a79c6cde26b6dd88694542d966f5c88d10b4aeaf8ae9ce016427491bed4a188037cf8685b59bf SHA512 86c31eba1bbc954d1dd39c5db8b9a276e6893e97130b259ee7eb3c32dd98510ce9d95b2d8f0922ac361fa7bc645e4e6251a97fc7da61cdcfaaf29f84b7ea38c7
 EBUILD bluefish-2.2.12-r2.ebuild 2516 BLAKE2B 49a76634c151afd3d0035e815ef017a8416267637a80950b6dc993a1e97a012cf5222f1bde18b55025c5e908b578538ee74403f8654c5e66ec4bf4c9a8534ae6 SHA512 6e205d636257682ccae100253e432b5840795eb1d563f4f89d4f41b75c71424621978da422b54be97ce9c54a39a695a38bb0800965211b588c82a7d50191461b
 EBUILD bluefish-2.2.13.ebuild 2465 BLAKE2B bdb29ca1df1e502a9a90a0b85b22728694d0d7436a3ed8878511d4fe99d6bfdab0088f560a1148bf700ff00baced95061971f4822fb62361cf0dd36a3d63101a SHA512 65ab05f0a80c621089f8a62996d7e76f07560d01faadc433c18cd2886b104b716e6768113ab4b0313e903a2c87340942c824213f4e07b66e510523ca38fa3edc
-EBUILD bluefish-2.2.15.ebuild 2467 BLAKE2B 37ad0c817ad9a3c716a8bae0d316e5b491f4db092e6db33dfdb39d44cc3cb87f78c7913edbecaaffb20a056659d45bf87fdbf48cc9a598becceb8bcb7116bb65 SHA512 1c45afe8974940c2e4addced649faf12a160acd5f6243125e39fd218fddbdfddcf609c0a051951687d2fe75d4aa08f21907cc961cb5ad6fb3c3093d825b1ba5c
+EBUILD bluefish-2.2.15.ebuild 2465 BLAKE2B 5dc823d965e1bcb10fb7c461d71ad9dfaf5cad388f1b105b0e8301b2eed1a07e5fecf424a09a94b24f1d9764e9e50d4c786b93bdf01ff79f6fd1d518a06d6c19 SHA512 58bae5cab41ab98214ecabf56bd5503ff448e55882cd9ac4fb80971dc2a2a975eaf18173ccdc4033c76927d0db64f87ae9e087f4d66100aa837be831dfb166a3
 MISC metadata.xml 333 BLAKE2B 5a5f339d26d78d99050d8324891a3d6ef97af31e3e6a397e763cc2e7561f892e43856e38fefe72be28db1962a4da153b0ebde42db6a53074bdf6b9c13eb74d87 SHA512 144b48f78b13ad3f07868b3171db5935431befd92821a6b70b6e626943996bcc4219ff27808b9062b2da4b5ff1c86dcb1c3778757b0b2a905c5bea3e90dcf152
diff --git a/app-editors/bluefish/bluefish-2.2.15.ebuild b/app-editors/bluefish/bluefish-2.2.15.ebuild
index d5021225b6ab..8c7d2cbbd7df 100644
--- a/app-editors/bluefish/bluefish-2.2.15.ebuild
+++ b/app-editors/bluefish/bluefish-2.2.15.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-3+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="gucharmap nls python spell"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index c76474f86ead..053bb2d9038f 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calcurse/Manifest b/app-office/calcurse/Manifest
index e2839f4af6e6..b80f5a5a9926 100644
--- a/app-office/calcurse/Manifest
+++ b/app-office/calcurse/Manifest
@@ -1,6 +1,6 @@
 DIST calcurse-4.8.0.tar.gz 716234 BLAKE2B 3fc703626d5e17b78ff42c0ef4f554585efd8223c2bd9d8c2f7add681602dc585cf066ed7c55a040b2585ad07513b26a5297b3b41f4c94a043f61ad2ad9094c2 SHA512 ea156c4320abf97fdb5abc29ff1f9bc659a3cab0e571295ed04b42dd742c4c45a7d5958dc2d386fc0ee7bd733969a6275405d5cf10cd645c75cb97b6b9e571d6
 DIST calcurse-4.8.1.tar.gz 730787 BLAKE2B 0c34b85313c3414dffc08635f6f37feb0a1e0f6c03bcf3b71a6cc95ed8fb4430ab1339abce72850364251884d707acb6cbbed0143d930f8bb76310ca5951b779 SHA512 a0a0bcfceb28a4e363168711a3c2de8f6e94d7f12aa78ff40f157c247ea6a41646bd218a1defba2d128b131ed0ab71c4d417820a0af0adbaa215011b11f0a040
 EBUILD calcurse-4.8.0-r1.ebuild 1061 BLAKE2B b004d683f1e131fc8dda1956bde6b6821dd1a0312476b7aa46bbd773797dc500f25e94a62ab120386d3536bf3b0d86e85728e8927d041700fd55c95b27d4acb9 SHA512 d3c088aa8ed0dc78ea08e24f307b8c744a72d8daf62b37493737865831668fb356b519d0175c3c84a6b00c27ee018b79d27946981c4c4ae8b7cc00bb7c3f11fb
-EBUILD calcurse-4.8.1-r1.ebuild 1052 BLAKE2B 3c6f4c28c36a0598482ed2fc025551240e663ba2e442bc3331ab13e531953c5dfcc0833d1e7759c30463ebb25a8685507708eedfdeb2ddf2171b79c593fc8348 SHA512 97e855dbabfa7199d38fd059315966b075368d48dc5486a42dd10eb637db46be3e40a1cfe07cd2876d063a2a3c2b99d8d67c86f2ecf390b2030aa310dfcf262f
+EBUILD calcurse-4.8.1-r1.ebuild 1051 BLAKE2B ae57091a09cc76069cca552fd8b7b1822c44bb1147ccf662ead23e01ec33437933a37c5a8a890464b5f40eb7df586a058fcb717f312a25c2eb598495524b2b9c SHA512 c97ee99d964255846173ecc4e042f7fb26d3b668a2f9b8efd1523b920e1a9866a1a75ad793ce9fcce54ac7cef77ab679fd5bf87555c4df885c668f22eebed625
 EBUILD calcurse-4.8.1.ebuild 1063 BLAKE2B feca2d1e872f50d0e042a51970bde37eab337a3de960a6c58331876fc47d34506b2dcc14be41ef0ad6c113dd729cc411de3473ae8e2f61eef204022ac88235aa SHA512 27718c221d554853ec5831967c030bfcb209f1e1fda419777987835a43561d9250baa0f21bd4273528040a17cc205e16457034c3d0e8c9d3d2bd5b0d1aa3ddb1
 MISC metadata.xml 876 BLAKE2B b99953f6a4226dddb885201957911e1df6105e5bcbb2f69bbf20d35ef275d4c2a59388534ff1fc960285b9df8e96a4c9ce49a1aba945eab275fb418ee764d98c SHA512 c02a99a6f9ceeb94eee3f58d285f97e3d31d1bfaab82c410b9b48d0c9462190e834df8e3a8d634f8474a3ff519f2189d01ab02d6c2383fad54a8f4e6bd19c229
diff --git a/app-office/calcurse/calcurse-4.8.1-r1.ebuild b/app-office/calcurse/calcurse-4.8.1-r1.ebuild
index 632595c7f0b2..220cae348ddd 100644
--- a/app-office/calcurse/calcurse-4.8.1-r1.ebuild
+++ b/app-office/calcurse/calcurse-4.8.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://calcurse.org/files/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 IUSE="caldav doc"
 
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 41965b9a139a..401265b1ef93 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,17 +1,11 @@
 AUX scribus-1.5.3-fpic.patch 376 BLAKE2B 102f6ca21c96d0b05354bf65c551efde01291c1b878db27e24ee8680eca6bebc9e402b19d62fe2001ed5dfc46ca11c3b3450816a017c942ba848bd43476628fc SHA512 531c3697983adbdeef4959c44a89ccf5e3802f2b1e64a65a63747a659cb808a08095d7592e6f8974e3e0e16ad913ba05bd3f3fe9c9fbd0a50463fd8df6f47d34
 AUX scribus-1.5.8-cmake.patch 951 BLAKE2B 7f64fbb7d92974b44946eeee359a87ea3c1564a804765169f0271d5cbdef488b142eec3d057d0367415b665c09ef82ef4da2934b3343e6bf0f0a91abe949bb23 SHA512 340185ac6ae1a0dbb6138ff2d714ba330ce4957864788a5f7786d7f5149abddcda222e5b902bc67c6ed61bf01dd4225eb66ce6abc5e3a672ef2c0586701384e7
-AUX scribus-1.6.1-boost-1.85-2.patch 942 BLAKE2B 127bcc04259e6d70697c3ee2cc6588e6ec34c80a69a0d8978cfd41605dd4532f85718202132edc391b6e372a2718c7f0e9f4168f7d25b03bdd360095af4eaf59 SHA512 460bd65f8584d94c43580d110544cfbb44c9858ef25bb19b86cd19cde9641e1e62e1acdcc360d241306e25e5c801a9ba40c77644a109f4e513169493097747f2
-AUX scribus-1.6.1-boost-1.85.patch 1458 BLAKE2B 34fc90aa2c4f3e0d95f3b1726a496c407dbbf1acd337c594afcfc30d7dec85fe290e7411667d238870179008aba193ccc88bcdeb4b7e66c8573d9c4be3bd4386 SHA512 4afae51c247df799cfd9d4f936d0af7dcfd09b9dd21d974d4f830840f3e8170466a7e56340251070936f2640aa092cf7ea44e484fa05391454314779b6324760
 AUX scribus-1.6.1-findhyphen.patch 1787 BLAKE2B 28faaa033a876516333ce10f89cc741c56090c53e98b0b9dee44cd05153533b0fd088e178f087f1125365b199385463ae1e07add1a92976e32a8b500d6e2979c SHA512 772ded373a356a679416dcd4f87abaf4b2a47bcf48738a8d40103cadff6eb332381e07bd277c5013c5e112f5b2997b2e9667052b83324960990ce96fa7ec4542
-AUX scribus-1.6.1-poppler-24.03.patch 2716 BLAKE2B b10db99ac5814fcfb30640c9de407d59ee7d0580b49975e261de6ca7f5fd04e71b7ecedba5e800ad91bc39d7c2e94ae718041bcf8e82703edaa5f1eaafd5565a SHA512 33d0951876a267c87b40beec435a0c4d1ab4ae646970131ccf2109f1b1385b8419e59a977b7c534cc207ef00d80e67de9c2c17f3dabcbc0f39f059f4c4b19e42
-AUX scribus-1.6.1-poppler-24.05.patch 1176 BLAKE2B 29974e0dc3f4363fe616e7a0f44dbeabe2893fa8c6a4c279607cc3d3669896a2eb3fa4a865d2468f691741993f0f27a7be22861d17193b479f259e529ee269e4 SHA512 1dca11c9d49055636b27cbcc5e2c9ea85605284dacf0583c778cb259d01d3b364dd8caca45b7052178c3c5548057238a1ab4b9f2ddf66ae9d42fe577f6426424
 AUX scribus-1.7.0-dont-install-thirdparty-license.patch 517 BLAKE2B cba2d9ad7e3b4a028f75dddb8296d8d5fd8f38c6eb91f673db4fda779375ed7f29e266874a66c9ea7d40c6e54908a2c98397072805cfb6c640c6a0a58b1cfd2a SHA512 8a38b5a1254f089f94f0fc8ca8f646e1c1d76a1193b232bb4420639a725f10cc2204d83c42a6a7535347dc7e2486048311e8221cfb445542b32511cedb07142e
 AUX scribus-1.7.0-findhyphen.patch 1900 BLAKE2B 6d5ef69a889afefa8449e35cdb4348d9cdf3ebe1b110b4de86a35e72e5faae97ae2fbadfe9ae2672a144d7ccea33ea95e0e25f2894f444c3a58a6e1b713aa357 SHA512 cde9231dd4783832340d9dd3df1522d3f5f7a3ab4f26d18ca5825d634d8102e3ca1bae483f0bd111e7e4fff31e5c9154923a9d79eae735a0445b6829e74b5c5f
 AUX scribus-1.7.0-fix-icon-version.patch 410 BLAKE2B 65d077457d8c85a8830345d7299b054806c16285e75ed4055f14ba4d844a9b0fd4972f0f1eba6ec889af4f460f50522d88722bfa34b123b80f280f2f0e029462 SHA512 230085c17081a33fb900e686e7469b878965c659e10845c39d2c7dc68a11e1f6a01bd614a21a555539c437a567ac8231490da739bfe5c17ef13fed9bd61352e2
-DIST scribus-1.6.1.tar.xz 73266900 BLAKE2B b8120823cf98201ed197748cffe3f12019acfbd4831b497585ad7d04fa6d6e470bf4bc85dac15700483dfc977c56136cb49bcee20106f482cd9b0022d75d28d5 SHA512 ffde5628ea314dab8f212f78e7dd96cd258ceaebccc5b8de2c21e338a433f82d7fbbb047d05882abb07b4dceac031141b77fef933c9a3ed0e26f29bb94377e7e
 DIST scribus-1.6.2.tar.xz 73129400 BLAKE2B 2da98dc322319db18a157f66aef024b7392dbbfaf22adba14f719b48c644d1cc1546cc4d0cccf6dfe479571cf84de6f5645e5d452154f96ddc886e390702d547 SHA512 2f691c1f6b7beada89be410a2936b23641913bf26bd2152974bbaa747aeafb05aa797356a85bd55c14f60f0031ce1addedc9a3ce3e92546ebbb45f96a5ff3e62
-EBUILD scribus-1.6.1-r1.ebuild 4135 BLAKE2B 024f5d049e6fc0ec798092fd1127b996d463ac4d17bfedc5b12cbf7ba967b9665d2ba3965aae529e7060ad51377f9b9b9f2335c65ccd4612654002f627d1109f SHA512 c51aa4048aed27376d48e682164bf62496e98d30af4e2c717f0d9dc3f65c03b2410b34e70c9356c09dc4701fc79d261130592973895a4b2e2bfb515e4ccec809
-EBUILD scribus-1.6.2.ebuild 4102 BLAKE2B 5e2a0cd07aae3d44d0439fc55343aede839ef7391e72c9e9dcfb92246f127f58faa1a597c2ff9a3564bc77522f709ceb9e424aa3a61540ce6e569f633104f028 SHA512 85b061e3e87e6d9dcf0c5e025ecc7e2acb533c2e7420bda14d3be53b91e5daa7b6b74f4d5061e74cf9fc22d89eeb7e03be956c2c3aaed5e997a7c6ad090b652f
+EBUILD scribus-1.6.2.ebuild 4098 BLAKE2B 00da5a091ba9a730846d9be6dbaa714992c453ac6fec9f50a2f98ae3d643db748e4c76a197dfa1ecfd52b75ba693cf30bdd25b35b57300268f907a6e1de0b76d SHA512 92172501c4807a70ac4d83792240f68fca088bd3f335c06fc2cceffbaa099aa40b2a1e10c72b2fc52ba9157c465ac51ccdc4f7f1eb38092bae3a13da46539cf1
 EBUILD scribus-1.6.9999.ebuild 4102 BLAKE2B 5e2a0cd07aae3d44d0439fc55343aede839ef7391e72c9e9dcfb92246f127f58faa1a597c2ff9a3564bc77522f709ceb9e424aa3a61540ce6e569f633104f028 SHA512 85b061e3e87e6d9dcf0c5e025ecc7e2acb533c2e7420bda14d3be53b91e5daa7b6b74f4d5061e74cf9fc22d89eeb7e03be956c2c3aaed5e997a7c6ad090b652f
 EBUILD scribus-9999.ebuild 3989 BLAKE2B 20bbc3996092f2e2afd085b749fb9d043ce01b4571447edca5498970f2879aa3a3284f282276fc60d0642ea55f0b8609445d8f6e387abe420ebabf768856ae40 SHA512 882a57ab93f56ee6afc81dda58d79b41e9d2035b4a24cc8c70edfc7aeed6b7beba6bb392cd0d751747d58cc66b5ce7dc625b627e172b6335ecbf060383d7b326
 MISC metadata.xml 883 BLAKE2B 7dc92ce97a3337f9397b52c647c00313790a8a674c88ba3491ef55b056941d6dcdfe1eac9009c4a5f2c4ebe70d81f9fa27439efad544bf8415ffb2235440402e SHA512 3348ea8be21835e88182c23e21dfaef4f52928aee1f4af1c88707cc3bd3f016d56986f197eec9b26279f4df72f20559fe7f4cad7439e67a66ab2c1b4f585ad91
diff --git a/app-office/scribus/files/scribus-1.6.1-boost-1.85-2.patch b/app-office/scribus/files/scribus-1.6.1-boost-1.85-2.patch
deleted file mode 100644
index 55bc9934964b..000000000000
--- a/app-office/scribus/files/scribus-1.6.1-boost-1.85-2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3116328e804c7366ec64c4224cbf20b0f14e52c8 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Sun, 31 Mar 2024 21:40:42 +0000
-Subject: [PATCH] Fix C++20 related warning "template-id is not allowed for
- constructor in C++20"
-
-git-svn-id: svn://scribus.net/trunk/Scribus@26079 11d20701-8431-0410-a711-e3c959e3b870
---- a/scribus/third_party/lib2geom/rect.h
-+++ b/scribus/third_party/lib2geom/rect.h
-@@ -56,14 +56,14 @@ class D2<Interval> {
-   private:
-     Interval f[2];
-   public:
--    D2<Interval>() { f[X] = f[Y] = Interval(0, 0); }
-+    D2() { f[X] = f[Y] = Interval(0, 0); }
-     
--    D2<Interval>(Interval const &a, Interval const &b) {
-+    D2(Interval const &a, Interval const &b) {
-         f[X] = a;
-         f[Y] = b;
-     }
- 
--    D2<Interval>(Point const & a, Point const & b) {
-+    D2(Point const & a, Point const & b) {
-         f[X] = Interval(a[X], b[X]);
-         f[Y] = Interval(a[Y], b[Y]);
-     }
diff --git a/app-office/scribus/files/scribus-1.6.1-boost-1.85.patch b/app-office/scribus/files/scribus-1.6.1-boost-1.85.patch
deleted file mode 100644
index 9d5dc0868843..000000000000
--- a/app-office/scribus/files/scribus-1.6.1-boost-1.85.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 3e80b387a226f1abac2bcce6e4300467c189d264 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Sat, 1 Jun 2024 22:04:13 +0000
-Subject: [PATCH] #17229: scribus fails to compile with boost 1.85.0
-
-git-svn-id: svn://scribus.net/branches/Version16x/Scribus@26170 11d20701-8431-0410-a711-e3c959e3b870
---- a/scribus/third_party/lib2geom/point.h
-+++ b/scribus/third_party/lib2geom/point.h
-@@ -121,10 +121,14 @@ class Point {
- 
-     Point &operator*=(Matrix const &m);
- 
--    inline int operator == (const Point &in_pnt) {
-+    inline bool operator==(const Point &in_pnt) const {
-         return ((_pt[X] == in_pnt[X]) && (_pt[Y] == in_pnt[Y]));
-     }
- 
-+    inline bool operator!=(const Point &in_pnt) const {
-+        return ((_pt[X] != in_pnt[X]) || (_pt[Y] != in_pnt[Y]));
-+    }
-+
-     friend inline std::ostream &operator<< (std::ostream &out_file, const Geom::Point &in_pnt);
- };
- 
-@@ -144,14 +148,6 @@ inline Point operator^(Point const &a, Point const &b) {
-     return ret;
- }
- 
--//IMPL: boost::EqualityComparableConcept
--inline bool operator==(Point const &a, Point const &b) {
--    return (a[X] == b[X]) && (a[Y] == b[Y]);
--}
--inline bool operator!=(Point const &a, Point const &b) {
--    return (a[X] != b[X]) || (a[Y] != b[Y]);
--}
--
- /** This is a lexicographical ordering for points.  It is remarkably useful for sweepline algorithms*/
- inline bool operator<=(Point const &a, Point const &b) {
-     return ( ( a[Y] < b[Y] ) ||
diff --git a/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch b/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch
deleted file mode 100644
index 0a8d317b6109..000000000000
--- a/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From dc2470990ab73c87fdd60068c99518ced01a3edd Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 4 Mar 2024 17:35:11 +0100
-Subject: [PATCH] Fix build with >=poppler-24.03.0
-
-Fixes build errors caused by:
-
-"Use an enum for Function getType"
-Upstream commit 6e3824d45d42cb806a28a2df84e4ab6bb3587083
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -1731,7 +1731,11 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do
- 	VGradient FillGradient = VGradient(VGradient::linear);
- 	FillGradient.clearStops();
- 	GfxColorSpace *color_space = shading->getColorSpace();
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)
-+	if (func->getType() == Function::Type::Stitching)
-+#else
- 	if (func->getType() == 3)
-+#endif
- 	{
- 		StitchingFunction *stitchingFunc = (StitchingFunction*)func;
- 		const double *bounds = stitchingFunc->getBounds();
-@@ -1753,7 +1757,11 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do
- 			FillGradient.addStop( ScColorEngine::getShadeColor(m_doc->PageColors[stopColor], m_doc, shade), stopPoint, 0.5, 1.0, stopColor, shade );
- 		}
- 	}
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)
-+	else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Sampled))
-+#else
- 	else if ((func->getType() == 2) || (func->getType() == 0))
-+#endif
- 	{
- 		GfxColor stop1;
- 		shading->getColor(0.0, &stop1);
-@@ -1865,7 +1873,11 @@ bool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading,
- 	VGradient FillGradient = VGradient(VGradient::linear);
- 	FillGradient.clearStops();
- 	GfxColorSpace *color_space = shading->getColorSpace();
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)
-+	if (func->getType() == Function::Type::Stitching)
-+#else
- 	if (func->getType() == 3)
-+#endif
- 	{
- 		StitchingFunction *stitchingFunc = (StitchingFunction*)func;
- 		const double *bounds = stitchingFunc->getBounds();
-@@ -1887,7 +1899,11 @@ bool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading,
- 			FillGradient.addStop( ScColorEngine::getShadeColor(m_doc->PageColors[stopColor], m_doc, shade), stopPoint, 0.5, 1.0, stopColor, shade );
- 		}
- 	}
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)
-+	else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Sampled))
-+#else
- 	else if ((func->getType() == 2) || (func->getType() == 0))
-+#endif
- 	{
- 		GfxColor stop1;
- 		shading->getColor(0.0, &stop1);
--- 
-2.44.0
-
diff --git a/app-office/scribus/files/scribus-1.6.1-poppler-24.05.patch b/app-office/scribus/files/scribus-1.6.1-poppler-24.05.patch
deleted file mode 100644
index 9d2ae918768c..000000000000
--- a/app-office/scribus/files/scribus-1.6.1-poppler-24.05.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 985b7944e50b23f4558ba4ca539659f37b4b7ba4 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Thu, 2 May 2024 22:26:03 +0000
-Subject: [PATCH] Enforce C++20 when building with poppler >= 24.05.0
-
-git-svn-id: svn://scribus.net/trunk/Scribus@26125 11d20701-8431-0410-a711-e3c959e3b870
---- a/CMakeLists_Dependencies.cmake
-+++ b/CMakeLists_Dependencies.cmake
-@@ -28,7 +28,14 @@ if (poppler_FOUND)
- 	message(STATUS "Found poppler")
- 	message(STATUS "Found poppler libs: ${poppler_LIBRARY}")
- 	message(STATUS "Found poppler includes: ${poppler_INCLUDE_DIR}")
--	if (poppler_VERSION VERSION_GREATER_EQUAL 22.01.0)
-+	if (poppler_VERSION VERSION_GREATER_EQUAL 24.05.0)
-+		message(STATUS "Poppler Version:" ${poppler_VERSION})
-+		if (CMAKE_CXX_STANDARD LESS 20)
-+			message(STATUS "C++20 is the minimum C++ standard since poppler 24.05.0")
-+			message(STATUS "Enabling C++20 compiler features")
-+			set(CMAKE_CXX_STANDARD 20)
-+		endif()
-+	elseif (poppler_VERSION VERSION_GREATER_EQUAL 22.01.0)
- 		message(STATUS "Poppler Version:" ${poppler_VERSION})
- 		if (CMAKE_CXX_STANDARD LESS 17)
- 			message(STATUS "C++17 is the minimum C++ standard since poppler 22.01.0")
diff --git a/app-office/scribus/scribus-1.6.1-r1.ebuild b/app-office/scribus/scribus-1.6.1-r1.ebuild
deleted file mode 100644
index 3b20f7808237..000000000000
--- a/app-office/scribus/scribus-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="tk?"
-inherit cmake desktop flag-o-matic optfeature python-single-r1 xdg
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="https://www.scribus.net/"
-SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz"
-S="${WORKDIR}/${P}"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-DEPEND="${PYTHON_DEPS}
-	app-text/libmspub
-	app-text/libqxp
-	app-text/poppler:=
-	dev-libs/hyphen
-	dev-libs/icu:0=
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2-only,X]
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/harfbuzz:0=[icu]
-	media-libs/lcms:2
-	media-libs/libcdr
-	media-libs/libfreehand
-	media-libs/libjpeg-turbo:=
-	media-libs/libpagemaker
-	media-libs/libpng:0=
-	media-libs/libvisio
-	media-libs/libzmf
-	media-libs/tiff:=
-	net-print/cups
-	sys-libs/zlib[minizip]
-	x11-libs/cairo[X,svg(+)]
-	boost? ( dev-libs/boost:= )
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-	hunspell? ( app-text/hunspell:= )
-	osg? ( dev-games/openscenegraph:= )
-	pdf? ( app-text/podofo:0= )
-	scripts? (
-		$(python_gen_cond_dep '
-			dev-python/pillow[tk?,${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	app-text/ghostscript-gpl
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251
-	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
-	"${FILESDIR}"/${PN}-1.6.1-findhyphen.patch
-	"${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch
-	"${FILESDIR}"/${PN}-1.6.1-poppler-24.03.patch
-	"${FILESDIR}"/${PN}-1.6.1-poppler-24.05.patch
-	"${FILESDIR}"/${PN}-1.6.1-boost-1.85.patch
-	"${FILESDIR}"/${PN}-1.6.1-boost-1.85-2.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-	cmake_run_in scribus cmake_comment_add_subdirectory ui/qml
-
-	# for safety remove files that we patched out
-	rm -r scribus/third_party/hyphen || die
-}
-
-src_configure() {
-	# bug #550818
-	append-cppflags -DHAVE_MEMRCHR
-
-	local mycmakeargs=(
-		-DTAG_VERSION="-${SLOT}"
-		-DHAVE_PYTHON=ON
-		-DWANT_DISTROBUILD=ON
-		-DWANT_CPP17=ON
-		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DWITH_BOOST=$(usex boost)
-		-DWANT_DEBUG=$(usex debug)
-		-DWANT_NOEXAMPLES=$(usex !examples)
-		-DWANT_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DWANT_HUNSPELL=$(usex hunspell)
-		-DWANT_HEADERINSTALL=$(usex !minimal)
-		-DWANT_NOOSG=$(usex !osg)
-		-DWITH_PODOFO=$(usex pdf)
-		-DWANT_NOTEMPLATES=$(usex !templates)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if ! use tk; then
-		rm "${ED}"/usr/share/scribus-${SLOT}/scripts/{FontSample,CalendarWizard}.py || die
-	fi
-	if use scripts; then
-		python_fix_shebang "${ED}"/usr/share/scribus-${SLOT}/scripts
-		python_optimize "${ED}"/usr/share/scribus-${SLOT}/scripts
-	else
-		rm "${ED}"/usr/share/scribus-${SLOT}/scripts/*.py || die
-	fi
-
-	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
-	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
-
-	# These files are parsed to populate the help/about window.
-	cat >> "${T}"/COPYING <<- EOF || die
-	${PN} is licensed under the "${LICENSE}".
-	Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
-	EOF
-	dodoc "${T}"/COPYING
-	docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
-
-	local size
-	for size in 16 32 128 256 512; do
-		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus-${SLOT}.png
-	done
-	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus-${SLOT}.png
-	newicon resources/iconsets/1_5_1/scribus.png scribus-${SLOT}.png
-	newmenu scribus.desktop scribus-${SLOT}.desktop
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "MS Word .doc file import filter support" app-text/antiword
-}
diff --git a/app-office/scribus/scribus-1.6.2.ebuild b/app-office/scribus/scribus-1.6.2.ebuild
index 13ccc1b48d25..764455f39f70 100644
--- a/app-office/scribus/scribus-1.6.2.ebuild
+++ b/app-office/scribus/scribus-1.6.2.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == *9999* ]] ; then
 else
 	SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz"
 	S="${WORKDIR}/${P}"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ppc ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 76200a3bad59..4142d252b3a0 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index 1e39e27eb9cd..09a599234416 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,7 +1,8 @@
 AUX zathura-pdf-mupdf-0.4.0-meson-mupdfthird.patch 1015 BLAKE2B b2ba561909eafed3f1aef2efdf5596a2d0f1a933c1e60106eef9ce52f86c9182492b4e4959f274312332089863e4209204c098d4baa1885de28eeaafd04d803d SHA512 264d6b4eb035424a54eccdc8b5103142f6c822de1e4831303413b778769b520268f02139213d391294d1c407289e075148c227e6a0d8fe02ba03d401f9c0f067
-DIST zathura-pdf-mupdf-0.4.0.tar.gz 9323 BLAKE2B e633e2d52080dc017cd59be184fc52f52b21f9bfa1cecb48c83b4383366226f8e65fcd92503493e8df568847f84a39f2f7d8e4a87df44c66ec121c246557e10a SHA512 44a8d72f54adf29cc853c636f2387edb52e253522c82175533a2f80a6afc45ca88a785785bb840bf81e368ef8f35e31f5e9bf7648ee6a13d394eb4133585c060
+AUX zathura-pdf-mupdf-0.4.3-meson-mupdfthird.patch 1329 BLAKE2B 4932a6c7385b6983d97fa5a175aab47e0d972404bd051c9162682f588f1c3263aacda97ecd0615b11e1882983fe99f9a38325d4dcb8bd91c61aff5bf68ed72fe SHA512 85beddc896b90d2d5bc716619588a558ce412a35ec0e76b64dde1fd4861f9307f07de082dc87c13a1e791b1277451ee9d2d515a1784f138cad87d2cfb6ac3fcb
 DIST zathura-pdf-mupdf-0.4.1.tar.gz 9346 BLAKE2B f1998acf00696fd40577f6e53b597258e519d3862c5b6b29bec292aaa732acf0b7a80ddf1b2f62d95d9462fe811a73cd912009106394bf1aadfa76be9c6d1adc SHA512 bf3360cdf6195af3cace4c769536a49f1cf2167c70a65b560410db1a0098119d726e73baeea98ca7100653c17248056c484fc436558e52a8dc12e7b83ce789b1
-EBUILD zathura-pdf-mupdf-0.4.0.ebuild 847 BLAKE2B e76b4863334eee0543e35938ca4d00eed77fcacfe0ba5a8e3e7167fa480530d6c8375b854557d6508f944f28be23193623a4672c79210c07c06bb93ff444e765 SHA512 c43ee375c0e9fefefd22b9676cec0b916b421c3d1762c4bc11ced376d7c261b270771367401d0e411a6df21e70a5091217d333f64792802c3b706ce0e3c012a4
+DIST zathura-pdf-mupdf-0.4.3.tar.gz 10146 BLAKE2B ca4edc56256d04e5ba42dd756976a3e444f37dfb5c1fff569329478c3053f7d48fa689d61b8769a73bac50e1244e74855705a9cd1cd25ed37a6927bd6c2ccf75 SHA512 ffab536d1cea26dd08fbb3808e0ff5d4b5b126bfdbd19a79101ac519ee9951d916b75c5b1b1e459f453087c936d84fa3839b4b84dd7f92398ba5cca87e186795
 EBUILD zathura-pdf-mupdf-0.4.1.ebuild 854 BLAKE2B 307d946230fec4726d71535c010e7f9a337903662fac5cb8c1479f43af0d37c77c422dc69cbe1403b2ae57d66e78d70b2ebe31ba7e4200dc2527370cffc6eca9 SHA512 ccdd7bc811922a3d3c2a0410a4ec5792b5522a8cca2a3762d6a76191295a0354653d41cce3ef9622cd86d5fe29ba8ed406ef69d2b7d7d9105d4e84ac22963c7b
-EBUILD zathura-pdf-mupdf-9999.ebuild 857 BLAKE2B fc48aa72ddb8caa36c3e32c51307d6779feb954e9607211dec5944c6c200c42fd180f0f5dc63c55eceb07401b3f08213fe24d1024f678bdf46b4491d2f6cfa12 SHA512 8867464a50199c1c523b587d2cec37d64ac17478a74002596a85bfa81bf66e9b83d09b95bf9802d29513001c07558f182bc5a7a63dac46daceb907bff113475d
-MISC metadata.xml 827 BLAKE2B 3260695042be5b2fa3df9337f1888467d43d79c210d466c9cad94c12f50400563e3c7a34aaa920d43160835fa90267c39a8266a927c184b60b86ab520a9deafc SHA512 1129c85640589275b1a973de6b5b61cfd1e54a294cb405e9e6b42e6b58bc92e3f82cfded1f6e7e8d49f2d81203f761a871085771c4eb0b2fe11cb1da190b3e5c
+EBUILD zathura-pdf-mupdf-0.4.3.ebuild 893 BLAKE2B f48b7ace321b69bebda6dafb90396cdd8d3a5ff2f898ba734fc46818f12daa1783ff7713394b7e5886f3354dfe06b0aa099012d097033b76e861b595382ff378 SHA512 598c364179cc735d25a002b3a629414e0e53143d42797fa2264f8479de6e820e1d71ccf195229d3f8debdf042e85989e4c8f6ab54f786791c78be101b040c413
+EBUILD zathura-pdf-mupdf-9999.ebuild 900 BLAKE2B 4448a6191e58ce573c005681719abbd9fd42db7d0d700ef13a21bd478f2b43410a618a4ad402d627691e7db2dce9ec178ca8afebed150617e0ca4fe84f4349fb SHA512 903cc40c480e1b8b42d1e8e9cfcf23e9a26b690546dffaf33a02a81e639e503aa411b69e5f29b7f3b85843e66638d499ec6dee3e158ac492765d35296d937e4a
+MISC metadata.xml 882 BLAKE2B 7942e40c627610201c9fac32b873a457af91e1643df2d77edb7b16e8d16b190b03232515268b5f00127a385ec0ae195993830dce2c128fc982f330663b44bf4a SHA512 9509293871df3131a4502669c6b1e5bf875a821f56d00d37a9d0fefb426e572be456908c9767884b625f5bac966ca4c83b433926d8b2118f28cffa06a6719788
diff --git a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.4.3-meson-mupdfthird.patch b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.4.3-meson-mupdfthird.patch
new file mode 100644
index 000000000000..707e7b89cdf6
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.4.3-meson-mupdfthird.patch
@@ -0,0 +1,42 @@
+# The dependencies mupdfthird, leptonica and tesseract seem to not be actually used
+# anymore, hence exclude them.
+# Upstream issue: https://github.com/pwmt/zathura-pdf-mupdf/issues/73
+--- a/meson.build
++++ b/meson.build
+@@ -23,7 +23,6 @@ girara = dependency('girara-gtk3')
+ glib = dependency('glib-2.0')
+ cairo = dependency('cairo')
+ mupdf = dependency('mupdf', required: false, version: '>=@0@.@1@'.format(mupdf_required_version_major, mupdf_required_version_minor))
+-mupdfthird = cc.find_library('mupdf-third')
+ 
+ build_dependencies = [
+   zathura,
+@@ -46,17 +45,15 @@ if not mupdf.found()
+     error('mupdf @0@.@1@ or newer is required'.format(mupdf_required_version_major, mupdf_required_version_minor))
+   endif
+ 
+-  build_dependencies += [mupdf, mupdfthird]
++  build_dependencies += [mupdf]
+ else
+   # build from Debian's libmupdf-dev
+-  build_dependencies += [mupdf, mupdfthird]
++  build_dependencies += [mupdf]
+ 
+   libjpeg = dependency('libjpeg')
+   libjbig2dec = cc.find_library('jbig2dec')
+   libopenjp2 = dependency('libopenjp2')
+   gumbo = dependency('gumbo')
+-  tesseract = dependency('tesseract')
+-  leptonica = dependency('lept')
+   mujs = dependency('mujs')
+ 
+   build_dependencies += [
+@@ -64,8 +61,6 @@ else
+     libjbig2dec,
+     libopenjp2,
+     gumbo,
+-    tesseract,
+-    leptonica,
+     mujs
+   ]
+ endif
diff --git a/app-text/zathura-pdf-mupdf/metadata.xml b/app-text/zathura-pdf-mupdf/metadata.xml
index 348798600314..c6a49fde50cb 100644
--- a/app-text/zathura-pdf-mupdf/metadata.xml
+++ b/app-text/zathura-pdf-mupdf/metadata.xml
@@ -18,7 +18,8 @@
 			<email>sebastian+dev@ramacher.at</email>
 		<name>Sebastian Ramacher</name>
 		</maintainer>
-		<doc lang="en">https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/blob/master/README.md</doc>
-		<bugs-to>https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/issues</bugs-to>
+		<doc lang="en">https://github.com/pwmt/zathura-pdf-mupdf/blob/develop/README.md</doc>
+		<bugs-to>https://github.com/pwmt/zathura-pdf-mupdf/issues</bugs-to>
+		<remote-id type="github">pwmt/zathura-pdf-mupdf</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.0.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.3.ebuild
index 80d004c0aeca..a939c6c183b8 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.0.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.3.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
@@ -7,23 +7,23 @@ inherit meson xdg
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
+	EGIT_REPO_URI="https://github.com/pwmt/zathura-pdf-mupdf.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="amd64 arm x86"
-	SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="https://github.com/pwmt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
-DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="https://git.pwmt.org/pwmt/zathura-pdf-mupdf"
+DESCRIPTION="PDF support for zathura using the mupdf PDF rendering library"
+HOMEPAGE="https://pwmt.org/projects/zathura-pdf-mupdf/"
 
 LICENSE="ZLIB"
 SLOT="0"
 IUSE="+javascript"
 
 DEPEND="
-	>=app-text/mupdf-1.20.0:=[javascript?]
-	>=app-text/zathura-0.5.2:=
+	>=app-text/mupdf-1.24.0:=[javascript?]
+	>=app-text/zathura-0.2.0:=
 	dev-libs/girara
 	dev-libs/glib:2
 	x11-libs/cairo
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
index 53bd172f9007..8942ebaca741 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-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
@@ -7,15 +7,15 @@ inherit meson xdg
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
+	EGIT_REPO_URI="https://github.com/pwmt/zathura-pdf-mupdf.git"
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz"
+	SRC_URI="https://github.com/pwmt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
-DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="https://git.pwmt.org/pwmt/zathura-pdf-mupdf"
+DESCRIPTION="PDF support for zathura using the mupdf PDF rendering library"
+HOMEPAGE="https://pwmt.org/projects/zathura-pdf-mupdf/"
 
 LICENSE="ZLIB"
 SLOT="0"
@@ -34,7 +34,7 @@ RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.4.0-meson-mupdfthird.patch"
+	"${FILESDIR}/${PN}-0.4.3-meson-mupdfthird.patch"
 )
 
 src_prepare() (
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index a1fc87d76338..6d3ab7ca2222 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 703b0ba15ecf..6bf0a23f109a 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -13,6 +13,7 @@ DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.11_9.tar.gz 191737628 BLAKE2B d78
 DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.11_9.tar.gz 191615499 BLAKE2B 4b342ebf3da0cf49d448b95dec6b04819d2ab2e31327b793b9d9aef86b4e78ce33a54995a5d0608d14214f3d0fde73d0ad334c9b0e3c5d2cbb6d40c4bb22637f SHA512 7773843e3b2a02ccb70c3ea49639c723f5da715dcb3e27ed85dbd2182648621a5822c49728436377c8e8af4d20231ba5b861e45be17efe44a5a81a92c225a851
 DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.11_9.tar.gz 192396023 BLAKE2B 1e5f12041d9c17195f242d7d36edf6995b1f71cb52ca211773faaa0cca6af983ec8c7885d58d4b87b38a0a26f71d088c104cdbcb84fdfffd97643f2a09a2a4ed SHA512 f11e61d91ad27ca31196ded87d06b5e379e4e652c09ffdd5c3d73cdc9fe6c46cd7785838c70514897645213ff6c6948227be27d7fd773949f1055338966ba275
 DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.11_9.tar.gz 180563846 BLAKE2B f9bf368e39d95cce40413caeb98192f88f90cad7dcb486ef5e1d7369cfc346603d37de88c049930b958043621e44c103e020354eb80faff0cf83fac8dc7497a7 SHA512 999ad1fb7c822e9000e734c86e70e73aa572ec1a75d14219b391e9d358d1dba1fd0d9d568df4c28d8ca88fd4341e24feee2f840b6c35c4c530d2cd174dd797b1
+DIST OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.3_9.tar.gz 205753676 BLAKE2B 80d419cb5b75b7117c534e09c174e5b281d6786445b3569a8e566416b22d3efbb15196fb4cc979b32c597663afcb8df3132a363e9fad22ecb053b98d3406c9df SHA512 0a87d9cf60a8843408e55cbdac66e44f988208c9b2117a8ac61d7bc5fc8df9fbdb1a5d75f7d5e100dcad5380f890a067f4ae198880938064534bed6b5a5b313d
 DIST OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.3_9.tar.gz 205794447 BLAKE2B 4d6ac1fa90b81be10cd32be76665dc26bae59a5c288d1b1f87e396ea356bf46f73b58db06b5b09417714f4638550d7ade55792f276f39dabc100345efd18c28f SHA512 b9cea7a7f4405c66722b3562e0ded7362475146753b1fcc4ad0d068264e9f228b8547dae704c6ce2be9c4a879902c2fbd93524176ffa02ddcb3edc4d4f6759cb
 DIST OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.3_9.tar.gz 207595331 BLAKE2B 7358f61aaee85fc5ac584307f1d5372de17aa06676aa823de157236e4332184b9212e74cc4214845a9e834ebac88d41ba185d1823257254174a960db88cb0574 SHA512 dafe0f31867f2ef817f188fe1222adefae72fe4443ec95eba8f18d60c141bdca0f63c2591c834c470c7b15d011618c97c45bbc65e746cdc47ba9be9a2f2ce523
 DIST OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.3_9.tar.gz 203760093 BLAKE2B 6be42a229745d9f8616b2738a3301642b8358b542625af01aa943779a029e4ef16f70eec437a22e2215a720d99420a01d498093c54387374ab8169a517eff9d9 SHA512 d10f6dea263dcf32e4e356f941fd275a64a4ad331db638332788623240f0f30869932542857653a65fca0e18a49d154fe2dce5bcf645c878ce86efa02fe05471
@@ -26,6 +27,6 @@ DIST OpenJDK8U-jdk_x64_linux_hotspot_8u412b08.tar.gz 103005511 BLAKE2B f3df80c16
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u412b08.tar.gz 109506799 BLAKE2B bdf043df0df0f0fe100e80a464a0fe8c60e7c80ab7ca5e7481c8f7458b793a24b0f2d93ec482b5f0de7a65b3d068322b7b3a9e9c9ec5c5b61342cb85232db847 SHA512 4d774c3f0794d7403dfbf953e7e9d635b71c463bb193ffb4cc98e98455ff7a448f0bbf290a28c9290e3d9affc7390eeb4be88ad48cbfb60d9f605e57158f5058
 EBUILD openjdk-bin-11.0.23_p9.ebuild 3174 BLAKE2B c20c05800f5be936ece355f8f4434e8ef6556f680cd7a784b8e40d601a883ae679e3439c33e8ef1db722db3153833ba0f38858483eb226c3236ea3d2c137e78f SHA512 f8a17638440efd97e0588cbd0079ff6b3cf2f9eac9be21f15c2fb17ff2ba84a74c9321b47c89d2a278aa26d23a7d2329d398ca639566edc36f0265fcc64835d8
 EBUILD openjdk-bin-17.0.11_p9.ebuild 3206 BLAKE2B 6d5f39a34005e0eb44836331c1b93a491ee1a6cb78e4a12494626316e1e6813182212c2eeeb480656adc276ff1b3e548ab4b9733f5826ea7b9e51ba469649c99 SHA512 7844a7f79c66356e6a7c5cd18a6793bb4a86a408de72d784c5b888d9facc2aa1706ead137f2a9c140ba00e566c14d0a06389fd9b664aab587307326b1a185311
-EBUILD openjdk-bin-21.0.3_p9.ebuild 3152 BLAKE2B 117b7bd7a864f55568bccf0ed036fa141349e4d6b7994610dcc87b0eb519ebd65142f8b1ef85efec9964cd1bd4a9e97c7942233268379c36f7d4db7376dd2e4e SHA512 9abc73193ed748ab2274e85473100d8859817563b67603921409ce160140e4062f7cff2b7211bd7bf196d0009e627c498ab88974c2bab1003e5730240db35b73
+EBUILD openjdk-bin-21.0.3_p9-r1.ebuild 3192 BLAKE2B 28c938f6b896d50cb78950a37c5c3c9d9aecbb251dbdc3831d76889f97157a910789eff9d1b932bfc4ca09bec2246c82f8a9dd4eb0bd294070f4613eaadce7df SHA512 23387d33c639d9a6f5d9f6c275a396683d85f28b938dcb016b54f8c0633a4d9efacfe015c3423261b948448ce85406463126b711c62c23d5340677e18210bd18
 EBUILD openjdk-bin-8.412_p08.ebuild 2927 BLAKE2B f62bab1ebf203a714edec548e16a08a96333012887a9a122d4f3d4801e50f3e9e5aceef1e40ab41f5fa312ef2884ae9547a96d2e8fa058bb1d69ad24abb74a97 SHA512 4712fb05b86e306c764af75252d4fb1201295bfa92817eb646bb793a56708c7655523b703428ca63e5e63d3a40bf77d4266dc8fa6244357702868787385bc0ef
 MISC metadata.xml 992 BLAKE2B faf08cbddeb47356eb249430ec21526fbadb95f666be9092a39d26f7167173cff526510c63f920b3891ee2738c915c0cb2319e4737f511f709b721555da2f061 SHA512 1f9fc80bc7bc07a1b6fc3d820368f05f46bcdd818fdba458729ac6c5ae9a55f43a435f9827f6d3986a17d2ef30929723b1f05acfa0017c855dbb3d9cbceda29c
diff --git a/dev-java/openjdk-bin/openjdk-bin-21.0.3_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-21.0.3_p9-r1.ebuild
index 664b82161cd3..3a398cc87007 100644
--- a/dev-java/openjdk-bin/openjdk-bin-21.0.3_p9.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-21.0.3_p9-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit java-vm-2 toolchain-funcs
 
 abi_uri() {
-	local baseuri="https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/"
+	local baseuri="https://github.com/adoptium/temurin$(ver_cut 1)-binaries/releases/download/jdk-${MY_PV}/"
 	local musl=
 	local os=linux
 
@@ -22,24 +22,26 @@ abi_uri() {
 
 	echo "${2-$1}? (
 		${musl:+ elibc_musl? ( }
-			${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
+			${baseuri}/OpenJDK$(ver_cut 1)U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
 		${musl:+ ) } )"
 }
 
 MY_PV=${PV/_p/+}
-SLOT=$(ver_cut 1)
 
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
 SRC_URI="
 	$(abi_uri aarch64 arm64)
+	$(abi_uri aarch64 arm64 musl)
 	$(abi_uri ppc64le ppc64)
 	$(abi_uri x64 amd64)
 	$(abi_uri x64 amd64 musl)
 	$(abi_uri riscv64 riscv)
 "
+S="${WORKDIR}/jdk-${MY_PV}"
 
-DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net"
 LICENSE="GPL-2-with-classpath-exception"
+SLOT=$(ver_cut 1)
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
 IUSE="alsa cups headless-awt selinux source"
 
@@ -67,8 +69,6 @@ RDEPEND="
 RESTRICT="preserve-libs splitdebug"
 QA_PREBUILT="*"
 
-S="${WORKDIR}/jdk-${MY_PV}"
-
 pkg_pretend() {
 	if [[ "$(tc-is-softfloat)" != "no" ]]; then
 		die "These binaries require a hardfloat system."
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 8131933af99a..541d5992c5ae 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/luau/Manifest b/dev-lang/luau/Manifest
index 549295a0a50a..cf9415f7ecc4 100644
--- a/dev-lang/luau/Manifest
+++ b/dev-lang/luau/Manifest
@@ -1,7 +1,9 @@
 DIST luau-0.618.tar.gz 1672989 BLAKE2B ecd166a9562aa103d27e29154687548bce04e45c9810b4aa264fe6eb38e3c2077a9cd4c61f138af62c605580c477b382fd2612616a3638a5a708c3d315011a12 SHA512 9fb6aa39ff2ad92a90afefb77ede472a2fb8a99417a669a1e19774a5550ca79709c034f353b459780f07f406dcac1b83639fb4fcd31215d811df491851fc1a6c
 DIST luau-0.630.tar.gz 1736333 BLAKE2B 205d5575b97007108ebf197ff1bfd9d94c3c3f116ba2c1f8068ef9762b30e211973d5da458f261223647fc725bad926fa9406070d95220d390b9e5ecaabf75af SHA512 9f8290a11abe5e9c91eaf5c9c71b940d4ca2bd6a730a2fc6e9cb830e9f7bf6d87a29cb8e71268ed1fe5af0e01738e7e15fbe2a14d81c32e7c76961d146c1128c
 DIST luau-0.632.tar.gz 1740751 BLAKE2B e6a6da0dd8b599d0c77d01976e58239234deb9ff577d20cc77017e90731b254d5b516032c7927d0dc6d52047259e0715fdbe2c4e888cca775aa0303da9d52e87 SHA512 1fa204965ceea94a96dd879431d10ab33de16ab2d8ebb2d73d866d213246acb2ae9aad0126511c7f4b3a965c115bf3e68d7069b021718d784170acadb20cf645
+DIST luau-0.634.tar.gz 1741026 BLAKE2B ec61c08b8165aca085f9743deee620c2dfb289e59a2c7aa9bb5dd441eaab8a6bfd38eb9295192ace96558e2f209e47752eb7405e9a5c7c645d21694569a0ce7c SHA512 a58e1c1a0eb56d0bd9d656e0420735fa30b58283c4c9f704404db5a51b66361a3ffa98600e6b6d68a6b9e30ccf0879ad43935f9d73295c06ab947dcd2c4d2ac5
 EBUILD luau-0.618.ebuild 776 BLAKE2B 6ddab7faf06aab3a3d4f04b8945074e342458df741b3e37e6555b9ebdc019db26541bb75080028292bc233520b58f23d50a872e31e0c7f5a3f3ed0ab092dab9b SHA512 147029f8a5c01e58b390efc9c961cb323ea089b39907f15b6830999b0fc1c90adaddf7a4da86aa6fc8caa51719fda2c034504485b50bd95bb793870c9694651c
 EBUILD luau-0.630.ebuild 777 BLAKE2B c5f16047056f2cfe0a8d1b4373f41b27a6929fe0a789cfee41cb9199921cc3eadf1c67296624bf9a831884f062e4acc6caa988c15fb45b3079b7736cf9a2dff4 SHA512 64d8b22353719b73411b324aac8d18beb584605c935fa6b4a3e01839d625c4f51265ed042489ca486bf8d07d54d3f41759128cb77e43fe6bcb601afef4ed3a99
 EBUILD luau-0.632.ebuild 777 BLAKE2B c5f16047056f2cfe0a8d1b4373f41b27a6929fe0a789cfee41cb9199921cc3eadf1c67296624bf9a831884f062e4acc6caa988c15fb45b3079b7736cf9a2dff4 SHA512 64d8b22353719b73411b324aac8d18beb584605c935fa6b4a3e01839d625c4f51265ed042489ca486bf8d07d54d3f41759128cb77e43fe6bcb601afef4ed3a99
+EBUILD luau-0.634.ebuild 777 BLAKE2B c5f16047056f2cfe0a8d1b4373f41b27a6929fe0a789cfee41cb9199921cc3eadf1c67296624bf9a831884f062e4acc6caa988c15fb45b3079b7736cf9a2dff4 SHA512 64d8b22353719b73411b324aac8d18beb584605c935fa6b4a3e01839d625c4f51265ed042489ca486bf8d07d54d3f41759128cb77e43fe6bcb601afef4ed3a99
 MISC metadata.xml 1077 BLAKE2B 922b79785db23ac7301e2e7a0c66834ae4ccb42466c87b92bd4d9db821830c307fac2192d0010ef224ef64fd83e80a62d47b29f9118432f70ed2340ec9bf49c5 SHA512 7d334c02c73ddc2628a5bebf598d79e9216eb5e4195905ba3a38453261cb25f240b41903042a0fdaad7453ed3cfd04ed2ba382746f38c25036095b019ea4b286
diff --git a/dev-lang/luau/luau-0.634.ebuild b/dev-lang/luau/luau-0.634.ebuild
new file mode 100644
index 000000000000..ff2804b115f7
--- /dev/null
+++ b/dev-lang/luau/luau-0.634.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Gradually typed embeddable scripting language derived from Lua"
+HOMEPAGE="https://luau-lang.org/
+	https://github.com/luau-lang/luau/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/luau-lang/${PN}.git"
+else
+	SRC_URI="https://github.com/luau-lang/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+DOCS=( CONTRIBUTING.md README.md SECURITY.md )
+
+src_test() {
+	"${BUILD_DIR}/Luau.UnitTest" || die
+	"${BUILD_DIR}/Luau.Conformance" || die
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe "${BUILD_DIR}"/luau{,-analyze,-ast,-compile,-reduce}
+
+	einstalldocs
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 621523d3cffc..601a6169acbe 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apache-arrow/Manifest b/dev-libs/apache-arrow/Manifest
index afb326ebe115..b1c3f06709bb 100644
--- a/dev-libs/apache-arrow/Manifest
+++ b/dev-libs/apache-arrow/Manifest
@@ -1,6 +1,9 @@
 AUX apache-arrow-11.0.0-shared-lz4.patch 456 BLAKE2B b6c8263ac0cf52e49004836ebd10095aa35e5261265f273d7c22dfc6b7a90ceae5882b9c4de51674f11e8b96e84f881141212e197a80dea9db567da7c033a3ea SHA512 11fab04e1c1da46b6407c52a3bfed12e7bffc36046dd8dc379d1a368010f01eaf7b5f791ecb9fb4d15dd778106b401663ea8c1aceb80e799201b71837c18203f
 DIST apache-arrow-16.1.0.tar.gz 21707079 BLAKE2B 5541c364351e59e8164f2461546bce3ddc834d70b3a03b815b681187674bdd89ccfb7eb113bf9010c821845b0c1fa51f5321bfea5b20927e6364f6452ec980d2 SHA512 28975f59e1fdde2dba4afaf4a5ba934b63db3a7f27656e2aa0af0f0d2a046c9dbfa9a6082de94629c36d03809b296566a37ea65ec5a2fc17fedac7d21e272d31
+DIST apache-arrow-17.0.0.tar.gz 21822331 BLAKE2B 64f9321cbf13fafae5938f26840d3ef642d6f5b40386315030bc70fe8703786ee394c8483d2bde7961cf2b5c15470ffebd7c66029e116b05cfbf5524e9fe51f1 SHA512 4e2a617b8deeb9f94ee085653a721904a75696f0827bcba82b535cc7f4f723066a09914c7fa83c593e51a8a4031e8bf99e563cac1ebb1d89604cb406975d4864
 DIST apache-arrow-arrow-data-25d16511e8d42c2744a1d94d90169e3a36e92631.tar.gz 3571960 BLAKE2B c1c076bb3ff6427a45d1a157c60fb13c37786f97d213768c0bbe1ae073b5fb8d23cd402bdcfee303061df56bf3421ea8376f7c4ba9fec04c5cb35a85a32280f2 SHA512 abbc18da8f03b123a2d97eee709e929bbb5d567bf23219bbc63508c0e82ef99d7c0d71ca2d952566b63e968cffd96c5e1c62be9cb658323c949f229ff03234a8
+DIST apache-arrow-arrow-data-735ae7128d571398dd798d7ff004adebeb342883.tar.gz 3572136 BLAKE2B 35fdc78211adbfd326004e264a6480e8ec3e1debde9f4ffefea63dfe450d8e6e2b30f8ea5574ab001bb2d658a12dae0176da4524ed139bf7575e3ec1648f6795 SHA512 e5bb17efcb0f80aa52e21722d663a3085df6bc8dedfe446efa942d6c479dd7eb486ab2899c02380467f1008b305ec7a831847b6d68e0be0107ebe498db1f4eb5
 DIST apache-arrow-parquet-data-74278bc4a1122d74945969e6dec405abd1533ec3.tar.gz 1037654 BLAKE2B c9bb725a16f6706a3859bb36a60b700af62cb5f96546483ef1de0b65900b02b4f9013841d7b3dc70fd0f2fd8969b4d5c72d0fb68972568f61b4a6863a0df6f60 SHA512 18f8e2480079a0fd29eec2b8e5f753af1ee80255f6fc80af4acbf5c56e6dec08e2f9f54d8c5734c929ef901c63e4009c5d830325333fa6cc947d40ff5dcddfa3
 EBUILD apache-arrow-16.1.0.ebuild 3049 BLAKE2B f438fd6983f16626a4f62132345bc4c768c1349f43cec81a7a501bdc6b20b905a1602b961ca9b3ef6c975608b7d0a9af512da2416867f227252017c27b083f17 SHA512 c6164b633e0ea7b2fcdd95cb69b0e09ae031d323bafda63d6f5d5238a4528d59b94aff70361a964ae92f7a1557a3ec948798d3afa26870b52d42f3ee9290038e
+EBUILD apache-arrow-17.0.0.ebuild 3051 BLAKE2B b108575bb87ea3f7345cda2ad8b5f810441aed6d4920802ed1ce08bffd1d6a9ff37cbb744a72d1bfa169aad6aa28541f9493b5209a3acc0e9298fd63dd6fe7d8 SHA512 70dab1c003490eab798a1685333a7fdcb7e03978bace218674e4648ed11083ba57f58432f08d3422c16816787686d367bb9bfb433023e5ea704ce0e2dc294f70
 MISC metadata.xml 912 BLAKE2B bffeb1e6d52455313e89396d9b1821fd7d5064e887213d13ae933ef8185318a40095c1623f3793f62d296ecb1afed591614fadc2ca3f75332df1e5a2f5a28d84 SHA512 11fb4dfe0e8c938e6bf3e7e53d1dccee08d80ba32396ac454226827e7c4ed2db70c53812060a9478e359fb2c48c221a05b3632409d73f2659b2117b7c56e8e51
diff --git a/dev-libs/apache-arrow/apache-arrow-17.0.0.ebuild b/dev-libs/apache-arrow/apache-arrow-17.0.0.ebuild
new file mode 100644
index 000000000000..978d272ce309
--- /dev/null
+++ b/dev-libs/apache-arrow/apache-arrow-17.0.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+# arrow.git: testing
+ARROW_DATA_GIT_HASH=735ae7128d571398dd798d7ff004adebeb342883
+# arrow.git: cpp/submodules/parquet-testing
+PARQUET_DATA_GIT_HASH=74278bc4a1122d74945969e6dec405abd1533ec3
+
+DESCRIPTION="A cross-language development platform for in-memory data."
+HOMEPAGE="
+	https://arrow.apache.org/
+	https://github.com/apache/arrow/
+"
+SRC_URI="
+	mirror://apache/arrow/arrow-${PV}/${P}.tar.gz
+	test? (
+		https://github.com/apache/parquet-testing/archive/${PARQUET_DATA_GIT_HASH}.tar.gz
+			-> ${PN}-parquet-data-${PARQUET_DATA_GIT_HASH}.tar.gz
+		https://github.com/apache/arrow-testing/archive/${ARROW_DATA_GIT_HASH}.tar.gz
+			-> ${PN}-arrow-data-${ARROW_DATA_GIT_HASH}.tar.gz
+	)
+"
+S="${WORKDIR}/${P}/cpp"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~riscv ~s390 ~x86"
+IUSE="
+	+brotli bzip2 compute dataset +json lz4 +parquet re2 +snappy ssl
+	test zlib zstd
+"
+REQUIRED_USE="
+	test? (
+		json
+		parquet? ( zstd )
+	)
+	ssl? ( json )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	brotli? ( app-arch/brotli:= )
+	bzip2? ( app-arch/bzip2:= )
+	compute? ( dev-libs/libutf8proc:= )
+	dataset? (
+		dev-libs/libutf8proc:=
+	)
+	lz4? ( app-arch/lz4:= )
+	parquet? (
+		dev-libs/libutf8proc:=
+		dev-libs/thrift:=
+		ssl? ( dev-libs/openssl:= )
+	)
+	re2? ( dev-libs/re2:= )
+	snappy? ( app-arch/snappy:= )
+	zlib? ( sys-libs/zlib:= )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/xsimd
+	>=dev-libs/boost-1.81.0
+	json? ( dev-libs/rapidjson )
+	test? (
+		dev-cpp/gflags
+		dev-cpp/gtest
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-11.0.0-shared-lz4.patch"
+)
+
+src_prepare() {
+	# use Gentoo CXXFLAGS, specify docdir at src_configure.
+	sed -i \
+		-e '/SetupCxxFlags/d' \
+		-e '/set(ARROW_DOC_DIR.*)/d' \
+		CMakeLists.txt \
+		|| die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DARROW_BUILD_STATIC=OFF
+		-DARROW_BUILD_TESTS=$(usex test)
+		-DARROW_COMPUTE=$(usex compute)
+		-DARROW_CSV=ON
+		-DARROW_DATASET=$(usex dataset)
+		-DARROW_DEPENDENCY_SOURCE=SYSTEM
+		-DARROW_DOC_DIR=share/doc/${PF}
+		-DARROW_FILESYSTEM=ON
+		-DARROW_HDFS=ON
+		-DARROW_JEMALLOC=OFF
+		-DARROW_JSON=$(usex json)
+		-DARROW_PARQUET=$(usex parquet)
+		-DPARQUET_REQUIRE_ENCRYPTION=$(usex ssl)
+		-DARROW_USE_CCACHE=OFF
+		-DARROW_USE_SCCACHE=OFF
+		-DARROW_WITH_BROTLI=$(usex brotli)
+		-DARROW_WITH_BZ2=$(usex bzip2)
+		-DARROW_WITH_LZ4=$(usex lz4)
+		-DARROW_WITH_RE2=$(usex re2)
+		-DARROW_WITH_SNAPPY=$(usex snappy)
+		-DARROW_WITH_ZLIB=$(usex zlib)
+		-DARROW_WITH_ZSTD=$(usex zstd)
+		-DCMAKE_CXX_STANDARD=17
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	export PARQUET_TEST_DATA="${WORKDIR}/parquet-testing-${PARQUET_DATA_GIT_HASH}/data"
+	export ARROW_TEST_DATA="${WORKDIR}/arrow-testing-${ARROW_DATA_GIT_HASH}/data"
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	if use test; then
+		cd "${D}"/usr/$(get_libdir) || die
+		rm -r cmake/ArrowTesting || die
+		rm libarrow_testing* || die
+		rm pkgconfig/arrow-testing.pc || die
+	fi
+}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 5b4715c1fa7d..423f8043d037 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index a337ba904963..97335c17fdd6 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1,6 +1,6 @@
 AUX 50merlin-gentoo.el 169 BLAKE2B 97dca8debe038783d44200315f883f4918cee1cca9f1d53df1c70b8fbd6e922b38c43b436ac73854970f1438eb837cbcbff4e07d12054fc0d0222b5222b95970 SHA512 00db283dffe923971fe451bcbea687bf35152e9c09783d307d9dec4ac0f273d27edfcc0e1ac74db3885bdeec98e7d60f1d46fa381d3b2c813e2f55fb5d4adbb5
 DIST merlin-4.12-414.tbz 1991877 BLAKE2B d68a45efb29d7ed2dd8d2e377a7778fad5500064206e5ae27914a0be9f208f919f44f73f14be283aca653adf56462a782c4f5f895282e078478e60f13e9c09f1 SHA512 3bf4f5e4754def9818ce0abbdf2253fe9d5e0abec7e8814012e2ff9de6a174f288c257780eb9f8aa4d794c0b62a524848d579d2a3495a5747a0970ee9fbfff29
 DIST merlin-4.13-414.tbz 1993752 BLAKE2B 8b5704252f771ddac843340bf2aa24f62a2b490f6bb03c46a1daa2560fae72226b92fb5a9720b18c82f476571e7e6ffc7c30e695c8a0e1a3de6bd65ee58461e1 SHA512 cf7e292a515122756bd614eedbf11cc09108e6afab77cd5805428207b3ca5a98494ee43ad59fcfb667b48fe0874f0a8359882b3c14ee270769f99c41e176d455
-EBUILD merlin-4.12.ebuild 2155 BLAKE2B 4bcfa73e369ba022deb9537855cf5f5834bc193d4c79518b138ea2edfa0212a5a0330fbee37c95e10f4ebb655730add170c9f9c22d911400fdee44b5f3cfe731 SHA512 95275341c9fba0ed8bfd944b58995e2026102bf8a26dfa291680e1c1bbaf521d60070e201741e1bc1ff630b17cdf3338111aa08aee3fe930c3d4a7f3fe007687
-EBUILD merlin-4.13-r2.ebuild 2288 BLAKE2B b4c9d4da9fd0aa280447ba6c7f92bae30999faa0bce6239cc5e6b8563bce42713e3bc26a98dd5b8223afcaa1fe2e7e9c41e582f1468fd24f80d93c16e82d5d74 SHA512 0647a136c4a980e309b391087138845e3d3745ad4a54f64501f5d9744e8b74e9fe9fa05bf2dafa67a33cfedad4f2c6392f0a6e092cbee3ffc2a94be6daa4aee9
+EBUILD merlin-4.12-r1.ebuild 2174 BLAKE2B ee448ce796df926d0c7098fe76c8a13cc03ad8787f01fac289d0754bd4bf7c8f70932a2001ef1930e1eaf8ce4fa27a9a57901609403487f3d99d916f87d21bd5 SHA512 2dfae34c5a8557c9dee9dea6f0ea62a471d3b883fb0fb6713f01a398abaa9dfcf23259a9949f7df53e1da38d3dd98999f1f4ec2c4ee6847923b2e4284c821ce4
+EBUILD merlin-4.13-r3.ebuild 2304 BLAKE2B 3b1e908f6c7fc2b84c086ac6ee7cef4e9aa64edc89be3ae3acb43d7cbebf690cc59d91a0726522da57c1bbfa5c848d5499b8aaccd2ba2f0b2729c564fdda0274 SHA512 9f7dd36ec5c2b71c7e43eeee54184b0720165070b11b475e312d536b2cc95f295b1944b13bc63b9f96bf0806ffe1caf8cf0096384944024c6973290d49ad647a
 MISC metadata.xml 310 BLAKE2B f1255dfdcb6984112e896735ea40f1171a8d52149fa7e8ed279efc1fe08de9b071554f5168bc3f8c0e432bd8344c69f5c5716c5c689ff4ff4edbc27569546246 SHA512 06710c33027574e4c13259e30ca5e862b7bbda0442013676020d00dd1114e92ebee92fa19d2993fc3881c10f9db7b51dd2710fcfbcf9ca7564f8f96e5065705e
diff --git a/dev-ml/merlin/merlin-4.12.ebuild b/dev-ml/merlin/merlin-4.12-r1.ebuild
index 3e4435149b42..fdaafaef2c57 100644
--- a/dev-ml/merlin/merlin-4.12.ebuild
+++ b/dev-ml/merlin/merlin-4.12-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
@@ -38,7 +38,10 @@ DEPEND="${RDEPEND}"
 # https://github.com/ocaml/merlin/issues/1500
 BDEPEND="
 	!!<dev-ml/seq-0.3
-	test? ( app-misc/jq )
+	dev-ml/findlib
+	test? (
+		app-misc/jq
+	)
 "
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/dev-ml/merlin/merlin-4.13-r2.ebuild b/dev-ml/merlin/merlin-4.13-r3.ebuild
index a46713572004..18c16155ded7 100644
--- a/dev-ml/merlin/merlin-4.13-r2.ebuild
+++ b/dev-ml/merlin/merlin-4.13-r3.ebuild
@@ -41,6 +41,7 @@ DEPEND="
 # https://github.com/ocaml/merlin/issues/1500
 BDEPEND="
 	!!<dev-ml/seq-0.3
+	dev-ml/findlib
 	test? (
 		app-misc/jq
 	)
diff --git a/dev-ml/opam-client/Manifest b/dev-ml/opam-client/Manifest
index 5342169dcc7c..71fbd9be2a7a 100644
--- a/dev-ml/opam-client/Manifest
+++ b/dev-ml/opam-client/Manifest
@@ -4,10 +4,8 @@ DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e5137
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
 DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
-DIST opam-2.1.5.tar.gz 837005 BLAKE2B f2e58784959f0e47fbe5ae65112a030d8350b061d7b0d2676f40e22ec5bf62c136bc37fd3078403dab807705ce8a1c8b6bb0ecf00b68fdfbb5f3d5a9acb88c77 SHA512 4395defe7df1d03ca889718b8eafd8161ff009710475f62673f19f012e0bde8ad2a919bd9d02d7f96b4c5a9bbf38e0ba9a256531c24de15cafabd4ef11f7c8e8
 EBUILD opam-client-2.0.10.ebuild 954 BLAKE2B f62db0baf48eec429f611d67064aecbadf22fa5cb359c3e53ec46dc43c07b2a91cc33115c063c6d5303ef203c9640e6dc757dd35515f336d06ff7ede0d218934 SHA512 091d8bc3488071479bb846adfd828778af68ca4a53e755380bab6e9a5160ae0f057171d0eff4b2ee7f19ded494d7038c88c64856b295f186f6ffe993e2e535ad
 EBUILD opam-client-2.0.9.ebuild 1026 BLAKE2B 0a42c8dc6f43666139de6c41f2e17d9ea60af9578d240af6eb5732a6cdf020a32231c10befb77ad86f9788afe798d534a8823789b22681bb71f4de547417b17e SHA512 d85a87f097ceaaad5254796d9547ee916faa277419504ff58d77076696588435cb0ac7610297d6dd76edf9c23fe3c6ec29bdb80cb83535051ed33cac273433d8
 EBUILD opam-client-2.1.2.ebuild 1019 BLAKE2B 12b0b6f8cdfd3a0d083c64e0d65212229e342305c4cf202c7c8117dc0106ec44d4c76b39a1672e7d7cfa66437689e96ece2b8aeabbb314b5336ac5ac7446ab16 SHA512 79292ade60ec2985ec1cbcc3e788b3018a280ff4a30da096816da5170d6b0909c09554a8ffe46d3a176f0d26129af3aaa7a5190f0270d55717ef1508e39bd0ec
 EBUILD opam-client-2.1.3.ebuild 1034 BLAKE2B fa8367adf57efa4bda6b1c3f114f1d2e2bf3556ccc393af8df86acf2edeaa1068b70db81872b35f183831d5486e3cfd146d2c93fc7073e6502f3dbf1b1c34060 SHA512 dba4b755f0c0ed80df5ac7174fc0b5ea4a269e8e724a1d5cfe4a0c17f8d47910d0072f328975c80260547142dae57c72556ab95d6cd4c4aeea3cf17303a16c3e
-EBUILD opam-client-2.1.5.ebuild 999 BLAKE2B 2d75f2a9eb07abf900b10e65a6b8f80242e921a30f07d259f9d11262db992f19eb8a85369589cb3d831073bb4e01d5a05fdd5bc141c7d5ae298cd82af3e6abc7 SHA512 faf1919d6b9354b2e08c1991785812b5e4c7a4629c7a23fed37e06efd1c5a77fe094ce3e6497a80d23a447a4e6bf13880eefd3f2f8a965eae16cb355c2758e79
 MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-client/opam-client-2.1.5.ebuild b/dev-ml/opam-client/opam-client-2.1.5.ebuild
deleted file mode 100644
index 19e091b78f8d..000000000000
--- a/dev-ml/opam-client/opam-client-2.1.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="opam client libraries"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="test" # sandbox not working
-
-RDEPEND="
-	dev-ml/cmdliner:=[ocamlopt?]
-	~dev-ml/opam-repository-${PV}:=[ocamlopt?]
-	~dev-ml/opam-state-${PV}:=[ocamlopt?]
-	~dev-ml/opam-solver-${PV}:=[ocamlopt?]
-	dev-ml/opam-file-format:=[ocamlopt?]
-	dev-ml/re:=[ocamlopt?]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( sys-apps/bubblewrap )"
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
-
-src_compile() {
-	dune-compile ${PN}
-}
diff --git a/dev-ml/opam-core/Manifest b/dev-ml/opam-core/Manifest
index f241250ece51..8e3a29bfec5b 100644
--- a/dev-ml/opam-core/Manifest
+++ b/dev-ml/opam-core/Manifest
@@ -3,10 +3,8 @@ DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e5137
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
 DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
-DIST opam-2.1.5.tar.gz 837005 BLAKE2B f2e58784959f0e47fbe5ae65112a030d8350b061d7b0d2676f40e22ec5bf62c136bc37fd3078403dab807705ce8a1c8b6bb0ecf00b68fdfbb5f3d5a9acb88c77 SHA512 4395defe7df1d03ca889718b8eafd8161ff009710475f62673f19f012e0bde8ad2a919bd9d02d7f96b4c5a9bbf38e0ba9a256531c24de15cafabd4ef11f7c8e8
 EBUILD opam-core-2.0.10.ebuild 862 BLAKE2B 4d866734fdc9884598ba98058d6ee117aa7b3c21a5ef73172f633e7270851ac8474cbf374d6d124b4fd73c8b79cc7e2dfa3573e055315a72f8ce69fffb466d1c SHA512 86266d41d881e6f7315477d12013dac00197586c6e9f10d7e575ea3bad319134baeeafe0beb03f226d06ba81bbf49942df85935e6aae9de78474174af54fb70e
 EBUILD opam-core-2.0.9.ebuild 881 BLAKE2B 705dbb83da94bb76fe650492dd25bf517cf2bee4d36f2d3efba22c4d51b10e88a615d2bee910f2912723bfaf47d656bf01843ecb9105fac3c7af236f0b6a45b0 SHA512 bcfff9888dc8b4ec8f5b241603f3ba9a453b0a1e4a13bc945f1a91620271cfa81eb562421a795a4001680ed2095ffd3785f49590dafecc18ab9972a58688ab4f
 EBUILD opam-core-2.1.2.ebuild 1010 BLAKE2B 4164aaeb2c582578120abab3a2e4891715403766932740b72a2aff08ef6627ec65a5357bf44f960e49efb6a9e8635bfa1de6aa514655d97a213b1c3efe9d65da SHA512 b87643fc55b9201c69b2d0f858aa7124ee314828b7e41a0da8970d8f7f131b084cc5ec05f231001297706d21dbdf7bf75b9a0e1d51fd469e646bb72ec72ad699
 EBUILD opam-core-2.1.3.ebuild 1130 BLAKE2B 4e438b3f72bddd0cf5a0f2ef9a1f53f641f7fd3dec64d66e48e03780c95372b8c4d913be2858a99e01bee43221720ab92d6797c45f8a55835a9ccef051a6c96b SHA512 483b43ee157d3ca74077fa0e5ebeb5f3613a14f027c025d7bf0d2045386c066d2049e19167c3165909fb05bc54741d453796afe378b074221c9bae31e8d768fe
-EBUILD opam-core-2.1.5.ebuild 990 BLAKE2B ec239ec9087ff35ee8077b6941387d5b912f584d1577f9c19fb0fee6a75e9ac37c59e0bd0569cb7d9a0fd3dc042d57b4efc85cb3012c0ae78a0addcf49b4d0c2 SHA512 2efeadb7e2d717a362f3fba0f9a5b4ffd263e96efff4881be5dce700d59106e475e428365143cec3c9638373de4c6de63a40678bd8e48d8174992b2f20e7fc1c
 MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-core/opam-core-2.1.5.ebuild b/dev-ml/opam-core/opam-core-2.1.5.ebuild
deleted file mode 100644
index 0d41c1a9eb72..000000000000
--- a/dev-ml/opam-core/opam-core-2.1.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# We are opam
-OPAM_INSTALLER_DEP=" "
-inherit opam
-
-DESCRIPTION="Core libraries for opam"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-S="${WORKDIR}/opam-${PV}"
-OPAM_INSTALLER="${S}/opam-installer"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	dev-ml/ocamlgraph:=
-	dev-ml/re:=
-	dev-ml/opam-file-format:=
-	dev-ml/cmdliner:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/cppo"
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9)))
-		 (release
-		  (flags (:standard -warn-error -3-9))))
-	EOF
-
-	# HACK: Probably bug in Makefile? Magic. See: https://bugs.gentoo.org/933845
-	touch opam-installer.install || die
-}
-
-src_compile() {
-	emake -j1 opam-installer
-	emake -j1 ${PN}.install
-}
diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest
index 830723964e97..b94e85d6e938 100644
--- a/dev-ml/opam-format/Manifest
+++ b/dev-ml/opam-format/Manifest
@@ -4,10 +4,8 @@ DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e5137
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
 DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
-DIST opam-2.1.5.tar.gz 837005 BLAKE2B f2e58784959f0e47fbe5ae65112a030d8350b061d7b0d2676f40e22ec5bf62c136bc37fd3078403dab807705ce8a1c8b6bb0ecf00b68fdfbb5f3d5a9acb88c77 SHA512 4395defe7df1d03ca889718b8eafd8161ff009710475f62673f19f012e0bde8ad2a919bd9d02d7f96b4c5a9bbf38e0ba9a256531c24de15cafabd4ef11f7c8e8
 EBUILD opam-format-2.0.10.ebuild 1065 BLAKE2B 23e1dafc040ea96781cb6d17e5f84f5ae7a31cb559f4bedd9dafd6672cdcf8cbb37df2af5a43111ac242c5632153794f683f7a07e8b38abf7c805ffe109e3822 SHA512 a24da24c30e80665cf7804fe04f78ee38f8683a96494c51090e2f85823941943ef8ce5c1075118390f6fd07827f582dfca8c7b3e9c95aa9194dc5dc3bc1dfc99
 EBUILD opam-format-2.0.9.ebuild 1065 BLAKE2B 55af5160782551247fb58afb43ef6408de421baa017e33fd4aec31a7bd959245c8b6da5d557901095d2a30acc92259de485c5d075c7be9252f3d2334e9c21296 SHA512 38c93e93fea82728fc34ddd3b4d38accc34630277ffdba99317c7a78d0df4d755b18fe9114dac161bcd384d59d9172113a48f99cadf3d779b98a60d129c47e11
 EBUILD opam-format-2.1.2-r1.ebuild 1220 BLAKE2B 69460ea9e2d477f0a45455c7a01ff6fcd89afc12ccbfe7d3bdaa6b6030e313d296dce01f20a0869d96ce46a4ece03af70abccca6fa7285f57f9d88cf1151cf1e SHA512 ac4d3e0030fa005cab8d5659ed3d605b516a97001ad8b4b5f742d85791cc1d676f3e153f91bbdb1f1bcbac0da8093048d1a48035ba8864f7e59b69f158999ca4
 EBUILD opam-format-2.1.3.ebuild 1234 BLAKE2B 8583ca15bdd549166bfd0fac5fa415e6c7220e9aea21f31e5bff36ff35fb7236d565c4fdde1825818d37e9b874349050283ebd1c9790ec58a2f050ede5032078 SHA512 486d0229d01bc1c6fe23986adf2852d4bc6b145543b4eac3201fe49fb3cb7dc8c80b31c61b059a92ae81f54beff658a9db4c498bbe84275bf30cf56d70ade3ce
-EBUILD opam-format-2.1.5.ebuild 1171 BLAKE2B 3fa8fe9aa1ca5876e444932bef8ecbe6261a5d1a41617eaa7b2f0a600c240e84ab6d6ef25c8dc5cd9a9eb38d289d4a44461ce4beddef9f4637ef913ba2734b7b SHA512 314c41f96c9f4f00e2823801232cde958860d54345ce74e17564bafb6291a558ab9991ed92b3d13520219ccbd61244fe1f4fd72026434f51f9a2189efe627918
 MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-format/opam-format-2.1.5.ebuild b/dev-ml/opam-format/opam-format-2.1.5.ebuild
deleted file mode 100644
index b64a2e35da75..000000000000
--- a/dev-ml/opam-format/opam-format-2.1.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# We are opam
-OPAM_INSTALLER_DEP=" "
-inherit dune
-
-DESCRIPTION="Core libraries for opam"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-S="${WORKDIR}/opam-${PV}"
-OPAM_INSTALLER="${S}/opam-installer"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="test" #sandbox not working
-
-RDEPEND="
-	~dev-ml/opam-core-${PV}:=
-	dev-ml/re:=[ocamlopt?]
-	dev-ml/opam-file-format:=[ocamlopt?]
-	dev-ml/dose3:=[ocamlopt?]
-	dev-ml/mccs:=[ocamlopt?]
-"
-DEPEND="${RDEPEND}
-	dev-ml/cppo"
-BDEPEND="test? (
-	sys-apps/bubblewrap
-)"
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-	sed -i \
-		-e '/wrap-build-commands/d' \
-		-e '/wrap-install-commands/d' \
-		-e '/wrap-remove-commands/d' \
-		tests/reftests/opamroot-versions.test \
-		|| die
-}
-
-src_compile() {
-	dune-compile ${PN}
-}
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index c22169087dcd..43c3a31efdf4 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -4,10 +4,10 @@ DIST opam-full-2.0.10.tar.gz 8173617 BLAKE2B 6bf7a52835512b3de5bcf0de24f5ba3a322
 DIST opam-full-2.0.9.tar.gz 8029605 BLAKE2B c2ae06bdbbdbe9db270ec0027ec8d13a228f0af2ae5089476fa3a698d27e1f47abf2e3a15ecc9ca610717ba6b979b4ca76cce56c52f6592ae789b88fb5e5b68d SHA512 9f44d878a2599a876f5e5b9b7457b6f446a5e59156ed3d449dcc29e40c44df8b69da619eabdf030e45526fba4bd9a00c65dec2c36552d2e03788596b0aceee85
 DIST opam-full-2.1.2.tar.gz 9442446 BLAKE2B fe5447fe8f9bcedb30bf455e93b54a37e950e2944f6f501545bdccf6d989de2da90106938efb6a12c1b9454ecefed5be9906d65a15a4d0244302ad7ccff170db SHA512 fe12aaa27168435a978c472926d40697af0a7619a529c4bfacd0b71469dfcd534f43164bc74f60f740a735d38a869ae5e87e2414119f4f3fc1826315e8a075cd
 DIST opam-full-2.1.3.tar.gz 9618995 BLAKE2B 6f33e70c2e59be87b643840128b46441828d3d83888f5d321ac23d33b2fbc4d3163cb4303ac82a7f863abcc9300227bbc48bca3b8db5d6fbcebf0e6cf8869a5d SHA512 fe3a3c86335830944683a39a34a9eb385037476853ab3e2a82b8571a9e2021830cccf25cbd5bb891d239f6a47584c1b1d91aa445e6e2a814847346c5cc526ff1
-DIST opam-full-2.1.5.tar.gz 10801367 BLAKE2B 5e6b1140e279931dfb61f68d0c4888cb14d05ff610e2b151115efe6b6420d74e7079894b6f4360f377b155008530ba4ace9708bc9d1e1d8c13950c0a5be4de11 SHA512 e4e33fcee0a9f922f8b43c6b095554a946559a2c50341326d21cca0f24fc7105c0de01db204b408240b12b267c9929435e2c511adf140618c91873f10444ae90
+DIST opam-full-2.1.6.tar.gz 11704198 BLAKE2B 20e74551760cadf1d911e72c34502e1e7e62003f8ebc83f3b9cb46c712e13fb5f85f41421cc74b051c2e348e0c0a17f4ea34bf655f7ec48cfcdab1e0d8a57a11 SHA512 2bb24db05dc39d6e8294c10b5a6bb2dd8f675a4d56e1dc9a2e9bc576f54d14a1709005219c25586df9382897ab7ba5ea0636765410f01c06958ec59be9f14b4c
 EBUILD opam-installer-2.0.10-r1.ebuild 1194 BLAKE2B 8067ca76998c8e4b38f065139096cc92dca4bb71ea31df5e5b1b79268f45865ecb172cf7c30ce762867ff3b831b8c206f5bb4cbef507d09ee09447aabc968093 SHA512 4ba15ce0bb8ded4783b536c8c0578562f21b2790172800a4d83ccbdc192051e8cc59c1f263f61ee382cc2adf8d7502161934dc1a4d63804b44a5ccea1b345c06
 EBUILD opam-installer-2.0.9-r1.ebuild 1194 BLAKE2B 7fd57adbf8d1f8d9d9b5bef83fe48a1fe40a844a3cd7f54027dd5d7e70e03ff109120a294b3e1f8c0430bbb9f6ca643be864b4aa2664baee5a4ade261b6333dc SHA512 76fc6ce77d0da8ba6773ad5f4dc21b11c7e655a8dae1c56feb630559a29043ecdca9293da3fdad6dd686675196c2293f94b49ed753a8f5b070036d99a88e88d1
 EBUILD opam-installer-2.1.2-r1.ebuild 1033 BLAKE2B c368b2cae6a3b3ae2b4f19ecd498243066b019752b6c8ed812fde3deb8d6de30328c46c0aa839434a56330fc10b08feb4e22d163fbb40b23876a37091098dfe2 SHA512 ade9467d022b3650745efffa22fd6c4eca879878c951f89d1e7fd2e8ed4a237402535e1b7e8382dfeacbffa7bb75c8c0e63f95eb24de90bb7d082ff87a21fc7b
 EBUILD opam-installer-2.1.3.ebuild 1075 BLAKE2B 8c6eebaf2033a0418bde752c99ba35276d7a089b2773c8eba45c99ed78ca15b635029711bd44d5325fe5b2392563a91acd0ce5d038f287624e35c47599aaea46 SHA512 26a298278a703cfbe8e9267c6bcba2a17a22333aff459bd9abfbeddb1a929d571dbc7d6487d58c8d11ac92cb2b58448a694170001abd8134d7830d371f4a2224
-EBUILD opam-installer-2.1.5.ebuild 974 BLAKE2B 157482c1caee0b9124fc9a382bab732307944140be6f458eeb9a6dcf6730787a7fa98a2e4600662afdd3b981e2911268d3b3c2d54de78aaa2ddcc8f736ae5603 SHA512 cdfedb9021e90542b19eb42bd19450e505d2474a8cae9e14c3050259c53b7af6995b50617cc5298d4d987a4b817be1d6eed4f376bafa49c5becbf6c2ba5c6dcb
+EBUILD opam-installer-2.1.6.ebuild 969 BLAKE2B 13ea9467b2781130c1cfbde139df1da64351893fd6feae1a58b92229e6fa16130bbedacbc0e6d47d36c110b4d3ee692ff261764cfbd5ca09b06c4b6ab0b000b0 SHA512 12c385e3b8f8b1a179a5e41e1f551bef9fc4140f37a4794c45e16bde1feb3adc5d5bf260c85cb57262457a5174f9884916e9a4218eb04f9a0dd4bb736b3e9921
 MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-installer/opam-installer-2.1.5.ebuild b/dev-ml/opam-installer/opam-installer-2.1.6.ebuild
index 58de5666dc7c..c8d56c6f4111 100644
--- a/dev-ml/opam-installer/opam-installer-2.1.5.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.1.6.ebuild
@@ -21,10 +21,9 @@ IUSE="+ocamlopt"
 RESTRICT="test" # sandbox not working
 
 RDEPEND="
-	>=dev-lang/ocaml-4.02.3:=
-	dev-ml/cmdliner:=
-	~dev-ml/opam-format-${PV}:=
-	>=dev-ml/dose3-6:=
+	dev-ml/cmdliner:=[ocamlopt?]
+	~dev-ml/opam-${PV}:=[ocamlopt?]
+	dev-ml/dose3:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	dev-ml/findlib"
diff --git a/dev-ml/opam-repository/Manifest b/dev-ml/opam-repository/Manifest
index 2efcbdb1e442..9b05d2b17d3e 100644
--- a/dev-ml/opam-repository/Manifest
+++ b/dev-ml/opam-repository/Manifest
@@ -4,10 +4,8 @@ DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e5137
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
 DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
-DIST opam-2.1.5.tar.gz 837005 BLAKE2B f2e58784959f0e47fbe5ae65112a030d8350b061d7b0d2676f40e22ec5bf62c136bc37fd3078403dab807705ce8a1c8b6bb0ecf00b68fdfbb5f3d5a9acb88c77 SHA512 4395defe7df1d03ca889718b8eafd8161ff009710475f62673f19f012e0bde8ad2a919bd9d02d7f96b4c5a9bbf38e0ba9a256531c24de15cafabd4ef11f7c8e8
 EBUILD opam-repository-2.0.10.ebuild 916 BLAKE2B 8f79e20d1df6a48e64aa701bb7d4bcfd2e73bdfe79dab65473c51aa869427423b561d27b01917e05c049f2b52ab217b573c413d2c13b09dd9174a98773d2a3a5 SHA512 ddadb0fb7a7e9ea1bb197906d10592b5dbf711e12c8cb3fd3dce0dbd3014c204f31cb98f93f401632112b93066428a39b876b4c622377cde3f38158fe6cdf543
 EBUILD opam-repository-2.0.9.ebuild 916 BLAKE2B 17608649a756ac8f0bb0503eab8f612e4465f4cee3d2b26a4edf65d7e5d521931bbc43970944e4ee00c98d526fea360bc35438bc317924fff4cdd66b82cb7e3c SHA512 a4f78eacafa63f350a16b00bd4fcf5b4ba5318541e01f75400c10c262bc6fcd1e4df3156ed2da602142a5230799f8f852b7710f5fd25f734f89e158f6157d163
 EBUILD opam-repository-2.1.2.ebuild 909 BLAKE2B a168662ad969499964910f0b94f2fd98e6db767c27217a8ccf32470e756d285d52136cdc816c053597dfdd3a46f861e036dcce3356b780438c825a309be67cb3 SHA512 9842b22570bec6cc8da2cdaa3c9f9ea92eb169c13d941aa529e97620bc31440ed87578984c831c80d88e004d93ad17357218681cedba9f95a51ddfa9aa200aff
 EBUILD opam-repository-2.1.3.ebuild 913 BLAKE2B 07a3984a18f159b3f3987425140b80f62d14b93785092e74fb7c12da27a28d21155469fc919756c2e8aa9bee49df0ffb8b0ca6635caf1733ac0b6c5b038abf7f SHA512 6e4196d69f7a4df5c7e5cbf4b81b2e0b38723ea6ef16850d804e188df1d34c60b6ca40d367cd6c4fe7aa939c9d4cec2fc90cf4d9b2dc5e7faf2651aa244f3569
-EBUILD opam-repository-2.1.5.ebuild 850 BLAKE2B e71e40991096e78ef064d4bc3f35eeeeb6b8eb6a79b4259f713cea45043b914f55bd372112715f9827681373769048e5fb5b095678368bb6336ed9b415f792cf SHA512 5b9fdd2dcd528e195fc6dc7f7a9db6e18cac6897a4bbf870626ea2ad856a92dc2e5a74eebaf9faf3f47d3f813b86a7ee006c4771fcba93a70caec13044400c2d
 MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-repository/opam-repository-2.1.5.ebuild b/dev-ml/opam-repository/opam-repository-2.1.5.ebuild
deleted file mode 100644
index ac92c2b7ab83..000000000000
--- a/dev-ml/opam-repository/opam-repository-2.1.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="opam repository libraries"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-RDEPEND="
-	~dev-ml/opam-format-${PV}:=[ocamlopt?]
-	dev-ml/re:=[ocamlopt?]
-	dev-ml/dose3:=[ocamlopt?]
-	dev-ml/opam-file-format:=[ocamlopt?]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
-
-src_compile() {
-	dune-compile ${PN}
-}
diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
index 4993dd290ecb..b8c72b0403e9 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -4,10 +4,8 @@ DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e5137
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
 DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
-DIST opam-2.1.5.tar.gz 837005 BLAKE2B f2e58784959f0e47fbe5ae65112a030d8350b061d7b0d2676f40e22ec5bf62c136bc37fd3078403dab807705ce8a1c8b6bb0ecf00b68fdfbb5f3d5a9acb88c77 SHA512 4395defe7df1d03ca889718b8eafd8161ff009710475f62673f19f012e0bde8ad2a919bd9d02d7f96b4c5a9bbf38e0ba9a256531c24de15cafabd4ef11f7c8e8
 EBUILD opam-solver-2.0.10.ebuild 986 BLAKE2B 5501cb38e2ac9d0c78ed4e4adf85be8ddfb959af9a75d54ce0b9932234aab907e833860e9cc37806687b2c204f226f99b23a6002a3bd1aa9209b59da0f6b04f1 SHA512 229a098cdcffbbdc50e1d9754749669dcd7874c35b0761eb741cf952bc7d379a2b776148574ff8319e9a8c8ee369c1e722e0f25bb492aef7096317cb5262ba56
 EBUILD opam-solver-2.0.9.ebuild 986 BLAKE2B 57c598370564e05ec39ba314a2f8254e7d884fde07460c9e00053424ae8e20096e1c802757463b0c9453945fc26fa783647ad2f67d5b68a48a1c83912f382a33 SHA512 da509b77f479f4eb06364e0408595eb4555f1aaa5519ef72d0fcf656493a725cbb683a4eb4e8777ccd88cc138521e2b03e87b17aca678a8746ce6dbcfd5ffff6
 EBUILD opam-solver-2.1.2.ebuild 979 BLAKE2B 14be2073691add350e7d4e9a2c2d00ccf4d533efeeb55bc5d98cf3f1f634efd450db9971a2ee26db2d50262d217a89f4def4162538b5367335ab17c5ee2ab102 SHA512 0b8ff4b9a509c8d6f7d7be1bcaceed8d7490b8437b9b082c59dc4e4165bbbaa5baeed86b2ab72f87bfa126e833d044a0607401b6e2080e7395e80836957dcf49
 EBUILD opam-solver-2.1.3.ebuild 994 BLAKE2B 3be7fcec3cd09b1be4e66df093a855ea0debd0e1a83fa6088c4d89ea29df6a539945f4e52cdf72b3b0901613a90525a756688114dcd7b32bfa97b86207de3531 SHA512 74b8307c1922e45876d260ecb2e408a145d384c1ed62f24dcc7aa4278d67463d90877b81caedb61b905ced5857b5870906727d56dd34bb18cacf209b3b2d9a0e
-EBUILD opam-solver-2.1.5.ebuild 945 BLAKE2B 9f20191a428155971eaecf97939463184b429849aeb7ac806962fab474651237bfddb75b395ca358a4f635a18480f01a90e86684499ca36477ff39a4c2bfbcb7 SHA512 752b9109ed9b7f083e1535c6ff9a401c27e16a3046f78f3eedb9dbcd27df3eb5019a4c608c08ded646dd93878921728431f0e13d671850af9bba3a6eb415a5d9
 MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-solver/opam-solver-2.1.5.ebuild b/dev-ml/opam-solver/opam-solver-2.1.5.ebuild
deleted file mode 100644
index f1356ca7d7cf..000000000000
--- a/dev-ml/opam-solver/opam-solver-2.1.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="opam solver"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="test" # sandbox not working
-
-RDEPEND="
-	~dev-ml/opam-format-${PV}:=[ocamlopt?]
-	dev-ml/opam-file-format:=[ocamlopt?]
-	dev-ml/re:=[ocamlopt?]
-	dev-ml/mccs:=[ocamlopt?]
-	dev-ml/dose3:=[ocamlopt?]
-	dev-ml/cudf:=[ocamlopt?]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ml/opam-client )"
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
-
-src_compile() {
-	dune-compile ${PN}
-}
diff --git a/dev-ml/opam-state/Manifest b/dev-ml/opam-state/Manifest
index db8ffd336a5f..007ec086299c 100644
--- a/dev-ml/opam-state/Manifest
+++ b/dev-ml/opam-state/Manifest
@@ -4,10 +4,8 @@ DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e5137
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
 DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
-DIST opam-2.1.5.tar.gz 837005 BLAKE2B f2e58784959f0e47fbe5ae65112a030d8350b061d7b0d2676f40e22ec5bf62c136bc37fd3078403dab807705ce8a1c8b6bb0ecf00b68fdfbb5f3d5a9acb88c77 SHA512 4395defe7df1d03ca889718b8eafd8161ff009710475f62673f19f012e0bde8ad2a919bd9d02d7f96b4c5a9bbf38e0ba9a256531c24de15cafabd4ef11f7c8e8
 EBUILD opam-state-2.0.10.ebuild 893 BLAKE2B a8c3a159b441a579c2f69eec37b00c280495c28763f435540b75bf99dda3084adbb2ca6f519f721aa459ad8353d99143c2599609337298b004b10622ea778c8a SHA512 c6182c6546dd1ab5361a75ec6cedaff9c8d6c743c5c2d120755840097f4742c58e7c5ed230976700f64f2ade80c080a031fe3bad541c32f75836649b869b68f7
 EBUILD opam-state-2.0.9.ebuild 893 BLAKE2B 8e1760f7eea15b611247e19cb438fbc411333402ffb6c28d2be301b7e5aa2befb3b45853ea556c30554fa1da8f6657c489ed0d818abb03dd8d8715f637599090 SHA512 717ec35c51b7298f8a6520a68cd46e4c74da1d5a2743a904fba5778fa4e8e77f38aae86424a84bb9b5cd5e5d6f72c44430c561557829bcf4972179b486989363
 EBUILD opam-state-2.1.2.ebuild 886 BLAKE2B edc9fdb776256415d9735e06296bf57bdebd3217ddfd8d229fbb9905dc4714371ecd220c879558e34ca73b6d20f78265d071f461825a0567e7a8e6ddd4b67a9e SHA512 795325ec954ec0e7227923e6839a7bc156a3b6380bb5e39d84956ddaa16e63952b025726e99e55bfe1d03166ef841b11e7fc135c92e2f11bdeb769549618f591
 EBUILD opam-state-2.1.3.ebuild 890 BLAKE2B fb0ccf6c0e5d7917ec77ee0bbe4e7141e91efdec53fc02df0702c511d2a818ab2114499ab76736d8e17289fc2342ef1be5b96b059200d47932a91fba98e9c1e1 SHA512 0d8d1e923ca1bfc81e41f2c3b500ded46a5069474f2af25f5603404cf86a2c3ad33bb47677167d55c06df78988391e7394be272888f9d934a1a81cfd4193cbb5
-EBUILD opam-state-2.1.5.ebuild 822 BLAKE2B 86fc52848171269e6a9d8db298789d8fe176c537e83011f8a1e67e72c1c8f38884facb22569d03e912b7f926baad66550f593d54dbd83b8bdfa2a5451fddf6b9 SHA512 0f6e445bd3d0c02eb355cf97df02c64c60aa8aee358619fd674c2642c43162c7f60e875bf0a9083d2385cf594fcc0ab6fb8fe0704845c7728af0f7db692e4709
 MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-state/opam-state-2.1.5.ebuild b/dev-ml/opam-state/opam-state-2.1.5.ebuild
deleted file mode 100644
index 044d439cdd5d..000000000000
--- a/dev-ml/opam-state/opam-state-2.1.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="opam state libraries"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-RDEPEND="
-	dev-ml/re:=[ocamlopt?]
-	dev-ml/opam-file-format:=[ocamlopt?]
-	~dev-ml/opam-repository-${PV}:=[ocamlopt?]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
-
-src_compile() {
-	dune-compile ${PN}
-}
diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest
index 16bc4da96391..fab72c3ec7d6 100644
--- a/dev-ml/opam/Manifest
+++ b/dev-ml/opam/Manifest
@@ -4,10 +4,10 @@ DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e5137
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
 DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
-DIST opam-2.1.5.tar.gz 837005 BLAKE2B f2e58784959f0e47fbe5ae65112a030d8350b061d7b0d2676f40e22ec5bf62c136bc37fd3078403dab807705ce8a1c8b6bb0ecf00b68fdfbb5f3d5a9acb88c77 SHA512 4395defe7df1d03ca889718b8eafd8161ff009710475f62673f19f012e0bde8ad2a919bd9d02d7f96b4c5a9bbf38e0ba9a256531c24de15cafabd4ef11f7c8e8
+DIST opam-2.1.6.tar.gz 837526 BLAKE2B 1ee60691f4fcc1011f461505942f00ff5f5cc0f0bbfc97edb8e4c676d1e4cd28fed8b49ef341af51a750848be3110713cc97e93a9e63999e4b92e7c7f68d743e SHA512 f75d81b4eb19ef6603e7a2a18e1a281ea6f5eea47b820ae888593102db5b98ded5b593b176e70235611b63a07f4a406a57fe016386f4e921f51b55eb62b9864d
 EBUILD opam-2.0.10-r1.ebuild 979 BLAKE2B c7928c781293cfd1c051ca66f654d205dbc0090f38a5bd63fff9f02938c4834f63be604b39bca312cd6d5ba74b6eb682e055602e353670ad04cfd5a780175d30 SHA512 dde36aa23121633c80f85de0628168a2e30dc461a03b526bfa86aa7d586582a565fa4dc244d39ee313b8514ce504f5ca8460e6a3280f988bc4ffb6f8637bb598
 EBUILD opam-2.0.9.ebuild 979 BLAKE2B 2b1958809b66044de2df0ab0756e6ef99894a41a6f5228a7a176b38668b4fe0a039b25b3de9ddc9c9cce60b6f152cb5c90f340f2437d1a01b8e668a8c61fdbbf SHA512 77e418c673875c912f4551bf510f538079100f6840332e675847ec7cec2bac28667e1366ab3ac0a46a314376072fd3cec74e218ef2d626e0d2623acabd2c5026
 EBUILD opam-2.1.2-r1.ebuild 1005 BLAKE2B a38a88b5c6d78f214e0abc150da2e7d8f122860cef46355c38379ce2a286cef44eae88b4f33beee0c4ff07e58f123b25c5031d27af0e05054c08087c0ed01bea SHA512 8e3dfc0c0869528d82e5477ce8b9af33c06c63266f96306fc4c04d6ca5e19e30fa19456e015e8c7cd926eb7baf314c6bf61596f0b850172191424f90cc71eb54
 EBUILD opam-2.1.3.ebuild 1009 BLAKE2B 3228f8c555da2b103f18589d6491ae4e7eb50eccbb88b0bd4e2dad919132745a9fd0b018acc58db704b058e8cd6f63dc47f363ad1fcc7d0ef116cbfc10febf3f SHA512 0285c6dd9f256fe8f3b357f2ccefa62c93cdee91f2ace76a7ef6967399597383529c772cb76c5758ce1602176a2a386fa4c7726bf6aa55a37470771f89f5cc0e
-EBUILD opam-2.1.5.ebuild 979 BLAKE2B 59fb705757fdec8c1a1f9b2f830458fa65455442a513b332368a0bbd59c2702f1836d3d1049f49ee08d2440073410804ae1916cac6cf232b5ac5a397dfa5ccc2 SHA512 60bf0753e9f95f2fa756607b9047706dad0cc789438f19cd7cced2ed462252e42f7ed12aa5d9186e2275fce9a8d0ecd60b33d77c428fd547c1dcce44cd5a5506
+EBUILD opam-2.1.6.ebuild 1252 BLAKE2B 7918075f9f0467622ac18ba617ac46a8c2c5701dec8f0bae0ee4059ef6b1ec39e7ad26e76c9bbd6b16672f9a9c96e8330243f1ef4e8aa5fc01b96d0c8e1d1d42 SHA512 5ebaa75cc26904c83e07d8d1ead4a72310bc45ea8dc95f6777e68b2c68183d37e8b1e182251e7b6be1de819d40655e4610aa5184bad4b3b315c4e660b0b26884
 MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam/opam-2.1.5.ebuild b/dev-ml/opam/opam-2.1.6.ebuild
index 58c912386ed2..fa7540b2dd30 100644
--- a/dev-ml/opam/opam-2.1.5.ebuild
+++ b/dev-ml/opam/opam-2.1.6.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DUNE_PKG_NAME="opam opam-core opam-format"
 inherit dune
 
 DESCRIPTION="A source-based package manager for OCaml"
@@ -21,11 +22,20 @@ RDEPEND="
 	dev-ml/cudf:=[ocamlopt?]
 	dev-ml/dose3:=[ocamlopt?]
 	dev-ml/extlib:=[ocamlopt?]
-	~dev-ml/opam-client-${PV}:=[ocamlopt?]
+	>=dev-ml/mccs-1.1.17:=[ocamlopt?]
+	dev-ml/ocamlgraph:=[ocamlopt?]
+	!dev-ml/opam-client
+	!dev-ml/opam-core
 	dev-ml/opam-file-format:=[ocamlopt?]
+	!dev-ml/opam-format
+	!dev-ml/opam-state
+	!dev-ml/opam-solver
+	!dev-ml/opam-repository
 	dev-ml/re:=[ocamlopt?]
-	sys-apps/bubblewrap"
-DEPEND="${RDEPEND}"
+	sys-apps/bubblewrap
+"
+DEPEND="${RDEPEND}
+	dev-ml/cppo"
 
 src_prepare() {
 	default
@@ -40,5 +50,5 @@ src_prepare() {
 }
 
 src_compile() {
-	dune-compile ${PN}
+	dune-compile opam-solver opam-repository opam-state opam-client ${DUNE_PKG_NAME}
 }
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 3d36c8884682..865e561149e9 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/backports-strenum/Manifest b/dev-python/backports-strenum/Manifest
index 9fa498fa0f86..83ab9057ba69 100644
--- a/dev-python/backports-strenum/Manifest
+++ b/dev-python/backports-strenum/Manifest
@@ -1,3 +1,3 @@
 DIST backports.strenum-1.3.1.gh.tar.gz 15064 BLAKE2B 749e319c9bdbec9eb1f3beab32355f015469336d688a3672380238f44694ce82747d7515330587821a60c92e1be0c7d8afc24ed70e3fa6ece368f6e74956958a SHA512 6a285bc63e6e3cb93e67da09eac9a1546af663d80e26448eed502494910db7850437bc13b6bee8f50e5debdea3335950c2f7c612238ecfbbfb454d5216c9513e
-EBUILD backports-strenum-1.3.1.ebuild 608 BLAKE2B 4feda0bd77a9ead10cf465ae985e09003f307f8f40e6c21ee867153a9d2e254fca4832d0a841c1229a9d49ebd2954b2ddfbad87f0b1cd3de1acfbb3f237972dd SHA512 a0ecd604ff84d68f12ea5519f13de86b0dd96e95d11282dcf499fe69e820e830bfb74ebaa94cd0b6e071000ac96081cb2cda8e61422fefc207ee5c3b7aa0a380
+EBUILD backports-strenum-1.3.1.ebuild 615 BLAKE2B 32df88b7f49d0c92ba423a55b9a2356e9688390b7a6058f0a43fc4c209d85a11fdd7a886e18014ed3e8e2dc96d81e117b5caad7439d264196271db9cb2935d25 SHA512 08e1cc2c3fae4f75e8458e59d4f4061011bd7ad8e5defc76d89549b017072c6a340495f9156f1967bd56edcb5b3477d9c8db1857db27da827eb262d4ed7426a2
 MISC metadata.xml 389 BLAKE2B bae738e0aa6ad4d3228376132556dbb0785a16b811f3ee30fcff101cf4ced629217ccd88d6bdcd713b83693b9a22a1f2188c43beb72c870da0e61bbc880211ae SHA512 1f54af1c691ea52e5ab18b48800ea24e885c8404ca6a3147295ec0f711c9303afc6b4839afb5546de199902cf5797c5985a6f81e1455b2798c25ac8ea85725bb
diff --git a/dev-python/backports-strenum/backports-strenum-1.3.1.ebuild b/dev-python/backports-strenum/backports-strenum-1.3.1.ebuild
index caa2ac65dff3..e01a89c0a899 100644
--- a/dev-python/backports-strenum/backports-strenum-1.3.1.ebuild
+++ b/dev-python/backports-strenum/backports-strenum-1.3.1.ebuild
@@ -23,6 +23,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 distutils_enable_tests pytest
diff --git a/dev-python/blurb/Manifest b/dev-python/blurb/Manifest
index 970a12603484..6e0063798f5d 100644
--- a/dev-python/blurb/Manifest
+++ b/dev-python/blurb/Manifest
@@ -1,5 +1,7 @@
 DIST blurb-1.1.0.tar.gz 25064 BLAKE2B 4fbdd0d068cc7abb1ffa78dff70bd83feccc1bcfbf8ebb085c9f7e77e0f330d3759f10a94a5ca024b465c01f9d659496ae55162a52b7158a06caf2d114d36806 SHA512 9397173e7bf5babf02c96df27983462e7dd2a729e9eb0cacdf23ca3778336902d5c611ab5e2432bbc877344426d7c62ea8ae77719aa08da98f9b44365583b7ee
 DIST blurb-1.2.0.tar.gz 23573 BLAKE2B a7a15fed82fca3f13eb840379b186210d6b8a039f61d48c65dce33ab80e970791add63efe9986adb54e7bedd452a3a867791237e250c1949b5b90f06bfac28ae SHA512 ebfe4c84d1f813822d7a583b337460a840235b61257428a47b7b61eb43b4b38fffc84f0fe758c6f61e9ae4b8c9c1affd9038077ddf846f17032e4497f87b78ad
+DIST blurb-1.2.1.tar.gz 23333 BLAKE2B 57374a3c787845a867c77480f1826cc82eae8cbdb659eeff9871cb3cf69f8e040d616cf40f051b63160b209b443dc26113b0d319f810cfe78842a759a139881b SHA512 f2bec26dacaa5f3c2016a4712a693ff483c0765b93f61900e7fa69765908b1c16318791e51778b71ffc222d339b5454603e7baec4a1bdfdd4c0e7b41a095f49c
 EBUILD blurb-1.1.0.ebuild 643 BLAKE2B 7933fe8028c99614fb98c75ad18876aad23428d69c45ab653d068c29c10e97aa2f8a254d36cb270a8daf6e35d4a177ac0dc3f36134ea3d2b54f1092f17f97c03 SHA512 6c8a29408116e72ab975bdde211517e1f0c14980fec9ec5b5b9e0b6197ece5f6c98f3abd6a436cde7bbc660097ba72e41eadb1d829df85b814ae0c27fa255dab
 EBUILD blurb-1.2.0.ebuild 526 BLAKE2B e52a48b2265e435d058ca21437b000c4bb305c3e2ed4df95a5121459c6859c7a338234481372148982e32a9348bc336d596cbe71ab9924a9cf68d034c14ed227 SHA512 95d0c07226b9a35118c05e270d7bb8de6662de3216b87d6e4c7170b6d68da00a4df568f61707749b09c2b4f5997499c74a950c76219b9c5d4979612df2be331a
+EBUILD blurb-1.2.1.ebuild 526 BLAKE2B e52a48b2265e435d058ca21437b000c4bb305c3e2ed4df95a5121459c6859c7a338234481372148982e32a9348bc336d596cbe71ab9924a9cf68d034c14ed227 SHA512 95d0c07226b9a35118c05e270d7bb8de6662de3216b87d6e4c7170b6d68da00a4df568f61707749b09c2b4f5997499c74a950c76219b9c5d4979612df2be331a
 MISC metadata.xml 1099 BLAKE2B 6c28398a79e4badbe4e2625c07e2a0741b5b78063505201be4be56a29d1e5251d2a3f0c43644d29dfa14fd170b2b5992c4f0bb719fe5719dcd13e3688774bb80 SHA512 b463282283cbca3d728ec3a6eabb6d25c84d4db7cc3dd6a3f462e82f1335ee9c089c60af8e3cf55d6e9fc0eba21ca724a5b36b34b200b38d73b98bf8b375ffd1
diff --git a/dev-python/blurb/blurb-1.2.1.ebuild b/dev-python/blurb/blurb-1.2.1.ebuild
new file mode 100644
index 000000000000..ed8b87d5b515
--- /dev/null
+++ b/dev-python/blurb/blurb-1.2.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2018-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Tool to create and manage NEWS blurbs for CPython"
+HOMEPAGE="
+	https://github.com/python/core-workflow/tree/master/blurb
+	https://pypi.org/project/blurb/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index a45de67ef362..412cf64b18e5 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,7 +1,13 @@
 DIST cfn_lint-1.4.2.tar.gz 2485843 BLAKE2B c2e64721b537ab38cad3c3f6d40c509741fb03f61202d7dace4023f4b5b3a7840b7deb88892d9d282d223756a1e3908680ed166cdf216b0c76abdc29d0749967 SHA512 c9761e253ba77198264eabdd9c4e6a290bb9010533628958853c8d5a0f5f7317338f271588b5cef2ac1667f6ed5e1a6e43a3192aa9ff7202b0ca6db061284818
 DIST cfn_lint-1.5.3.tar.gz 2354279 BLAKE2B b8c836db35453efbb27fd050a4cb3090ca99fb050256c4e0b8cd5b634320d677f2ed325894a700127891b614ab70cd436e7af06759f9dbcf58ad45f4b50ee779 SHA512 38ce749f21e6118f129d98d21ecc01bc4f828efce8af9f597f624eff9a062dbceb8c670cfbaa0cf581c14d187094ffe90ada4293679c1e0f77cb3baff3308b26
 DIST cfn_lint-1.6.1.tar.gz 2366313 BLAKE2B af7b3e8d5145f3368d4c7b2e86b0ffe441c1f6633de34024e8c10d8cd04625673a25e847c15f30a6778bee8196096ffca58241e3a6f21a750094a3b2845f5493 SHA512 f354fa40677f8b601dabfb12b8715f4eb49f8e8aec72d3b9eeb4a63fabe278c36629f404b193f557b193280d6ecd224f0f0a494f9dfc61a04ebb24d0fe953d67
+DIST cfn_lint-1.7.1.tar.gz 2412588 BLAKE2B 259b548e7fc7704c12ca0191d27dd82ce2a75e33c7462520becf218261ac693308f600719850a357d9948f5d2700846b6bc35781491cc4c0598cc494d1090e3f SHA512 ce4933a1c3cdf25b3911b0e057d60a6ff0753937dbb6a5cdf6a1e0afae3fc1532302ac2572191781337cb6a5f0ae1743409714317f79fb9da55295875bd56b27
+DIST cfn_lint-1.7.2.tar.gz 2412586 BLAKE2B 5ec2034dce3c347411408723ebd1e00143c8b2428364cd33591c260fddb1911d595398121dba356d5179737400ac56fa4077ce8458d0b061c886284e152052b8 SHA512 7c9f785ecb08e937f21be47dea736719b1c7afac2b2989e65f84745e220657a0e3ac3427fa53ece4c5fe51b7880fb9da04c9eac7bd509f43978255ec5706f434
+DIST cfn_lint-1.8.0.tar.gz 2376789 BLAKE2B 927a7e789167d5adf04f6a76b309b62b4a2b128db6b1db6a46a771289bc8e6826d021c44209b7dcd711feded2836d10db7727c61daa9f8ef2254a7080c3f30d7 SHA512 e55b24a6e60b4d96317f541787f7828205d04c51816dc5684c37a129b6ff0240e8a0616f15d7fd6917ea18f90d5892c0221fad53fa916cea7a3cd689c1a3c7c2
 EBUILD cfn-lint-1.4.2.ebuild 2173 BLAKE2B ba593561e9e98b1bcb348db13747619379e3d79d80231c43d62b71216b6a5ada6cae1f83a080f2bd503c845bd8b3d04f2398dcdf6a34f3fe798187939929a8e1 SHA512 53e045faf285b309669a61c5d5654ae7a7e229588f5ef9ed2bb1d0afccfbb4005ab0464e8950b55009108fb7a56c5e1dfc5dfd74b7072f223221769bd913b60c
 EBUILD cfn-lint-1.5.3.ebuild 2176 BLAKE2B 07cacdbe24678c647596829bbfba09e70569c2b1f575c318581364c7e6cfe505cc12c0e4fe4174073e51aa123d2d5066189ff5058a008591b68b707cf36ca841 SHA512 97011ea77add065c2ff78d5cc6ced93c9e1251ee5da063afb7c957e2dde3639421e331ab31ef20571409f7f167bb4102bdbda8a4d463363c7ea34b1130ebfca6
 EBUILD cfn-lint-1.6.1.ebuild 2176 BLAKE2B 07cacdbe24678c647596829bbfba09e70569c2b1f575c318581364c7e6cfe505cc12c0e4fe4174073e51aa123d2d5066189ff5058a008591b68b707cf36ca841 SHA512 97011ea77add065c2ff78d5cc6ced93c9e1251ee5da063afb7c957e2dde3639421e331ab31ef20571409f7f167bb4102bdbda8a4d463363c7ea34b1130ebfca6
+EBUILD cfn-lint-1.7.1.ebuild 2176 BLAKE2B 07cacdbe24678c647596829bbfba09e70569c2b1f575c318581364c7e6cfe505cc12c0e4fe4174073e51aa123d2d5066189ff5058a008591b68b707cf36ca841 SHA512 97011ea77add065c2ff78d5cc6ced93c9e1251ee5da063afb7c957e2dde3639421e331ab31ef20571409f7f167bb4102bdbda8a4d463363c7ea34b1130ebfca6
+EBUILD cfn-lint-1.7.2.ebuild 2176 BLAKE2B 07cacdbe24678c647596829bbfba09e70569c2b1f575c318581364c7e6cfe505cc12c0e4fe4174073e51aa123d2d5066189ff5058a008591b68b707cf36ca841 SHA512 97011ea77add065c2ff78d5cc6ced93c9e1251ee5da063afb7c957e2dde3639421e331ab31ef20571409f7f167bb4102bdbda8a4d463363c7ea34b1130ebfca6
+EBUILD cfn-lint-1.8.0.ebuild 2176 BLAKE2B 07cacdbe24678c647596829bbfba09e70569c2b1f575c318581364c7e6cfe505cc12c0e4fe4174073e51aa123d2d5066189ff5058a008591b68b707cf36ca841 SHA512 97011ea77add065c2ff78d5cc6ced93c9e1251ee5da063afb7c957e2dde3639421e331ab31ef20571409f7f167bb4102bdbda8a4d463363c7ea34b1130ebfca6
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-1.7.1.ebuild b/dev-python/cfn-lint/cfn-lint-1.7.1.ebuild
new file mode 100644
index 000000000000..4ec420c8b216
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-1.7.1.ebuild
@@ -0,0 +1,70 @@
+# 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="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.89.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	<dev-python/networkx-4[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
+	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/defusedxml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/unit/module/test_template.py::TestTemplate::test_build_graph
+		# requires git repo
+		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+		# Internet
+		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
+		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
+		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
+		# different graphviz version?
+		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
+	)
+
+	# from tox.ini
+	local -x AWS_DEFAULT_REGION=us-east-1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/cfn-lint/cfn-lint-1.7.2.ebuild b/dev-python/cfn-lint/cfn-lint-1.7.2.ebuild
new file mode 100644
index 000000000000..4ec420c8b216
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-1.7.2.ebuild
@@ -0,0 +1,70 @@
+# 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="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.89.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	<dev-python/networkx-4[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
+	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/defusedxml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/unit/module/test_template.py::TestTemplate::test_build_graph
+		# requires git repo
+		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+		# Internet
+		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
+		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
+		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
+		# different graphviz version?
+		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
+	)
+
+	# from tox.ini
+	local -x AWS_DEFAULT_REGION=us-east-1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/cfn-lint/cfn-lint-1.8.0.ebuild b/dev-python/cfn-lint/cfn-lint-1.8.0.ebuild
new file mode 100644
index 000000000000..4ec420c8b216
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-1.8.0.ebuild
@@ -0,0 +1,70 @@
+# 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="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.89.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	<dev-python/networkx-4[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
+	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/defusedxml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/unit/module/test_template.py::TestTemplate::test_build_graph
+		# requires git repo
+		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+		# Internet
+		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
+		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
+		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
+		# different graphviz version?
+		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
+	)
+
+	# from tox.ini
+	local -x AWS_DEFAULT_REGION=us-east-1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/griffe/Manifest b/dev-python/griffe/Manifest
index d7e15062d40c..714ffd583f9d 100644
--- a/dev-python/griffe/Manifest
+++ b/dev-python/griffe/Manifest
@@ -1,5 +1,5 @@
 DIST griffe-0.47.0.gh.tar.gz 233418 BLAKE2B cb31882f9ddd7210ac36eb400d182395b0da3cd37e38458f23582117aae4c83e9cd62a3dfb16067ec518a42ed6b4f6d9d77d6927be2ca462297c6420bcd25cd8 SHA512 d1d0603a81a8c859c67791ceeaf3c03a134ae221d7554b2a1133ed60a3ca85d157980b26c6930c282c50d9d46a02f26a44dffcfe0c1bd844a3f0ba58f2a1c52c
 DIST griffe-0.48.0.gh.tar.gz 370711 BLAKE2B 197da160c0e20d9669a5347fbf256db58c5a3e5e33094ddd104ae02ac9112d2daa17778ba64bc6611117a7d20af42b1b3e4101b3ec56ef8cc0dc2297d6d38a3a SHA512 3b999fbd05b206c973fe5dc7c89500f2fbfe9376529d0b5cc1714dee30f2a17985e4ed6903e638e0b96600e546747f105cab11620190185c133c53dd1df9a364
 EBUILD griffe-0.47.0.ebuild 963 BLAKE2B 403cbc3eb4d110952b7ca2e2790bec315e4aa6d8e0e619f5b8d97726493f884b8cef8d10dcba6ca2935b898e445c9901f6b2dac69624e030cab5d11e78356b88 SHA512 ba07e97607261ca1a9258d85871b279157a74bc508cc425368261b475adc60ef6e6b3c2ba69fa6b01cddbd5beee404dc4015036c570b1713b8167b43ddf5154b
-EBUILD griffe-0.48.0.ebuild 1082 BLAKE2B 44994f1d0f25a287de36fe290c82cbab8e99a2ca86c5317063563cc74c97571059cc1f71f176a7a82164f5709c2571c471ff344fd0c981374ebeaf8cb79663c2 SHA512 2a924a40345c080bb8faf4f6d247df9d02395372e6671b55a852730f37acd1f12f1236398786a6cac9444a368fdc0d095fe6fc1d13802dd9083979d1c7673afc
+EBUILD griffe-0.48.0.ebuild 1089 BLAKE2B 7f937d0297d15780359b71a3a417739657ad148ab94c1e6c9e42c479be3e08d31f86db9bfbffa071d86edb9a16f645a43e71b448ccf5ebbd8bd54ca8f4ef8055 SHA512 2f28eaccd2f51da4889f255bfba1ccdb90b898a2fc0960d3f12f85341fd9280af21da2b5b3d8a6ef471700be467bd679c21a9782948392beb2a185022111180b
 MISC metadata.xml 393 BLAKE2B f207ed2887879f849db9133aac5b82d507a5c6fc3fed0b931dd0aec5ec8d48991731a15825c7b51d82f1f148c2f6818e3102e963d3342aa248bd475d4b29a692 SHA512 b541674c9f9bf9e356d46de91673e384f50ade9b6f19b0218f03b6e307dde88df2d0078f202bc0a77e18b0d91e89cb6d36ffdac23689ef35306167619404dc01
diff --git a/dev-python/griffe/griffe-0.48.0.ebuild b/dev-python/griffe/griffe-0.48.0.ebuild
index b1bdc003e9cd..97705a5b02ee 100644
--- a/dev-python/griffe/griffe-0.48.0.ebuild
+++ b/dev-python/griffe/griffe-0.48.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab-server/Manifest b/dev-python/jupyterlab-server/Manifest
index edc40920dbff..d9c440f0e7cc 100644
--- a/dev-python/jupyterlab-server/Manifest
+++ b/dev-python/jupyterlab-server/Manifest
@@ -1,3 +1,5 @@
 DIST jupyterlab_server-2.27.2.tar.gz 75817 BLAKE2B fff1e7e274d500c8a0dc9c7c7edd6630c9587b758ad40184917e9bf3d32ba95d0e4b3b8ea5b47a359100e09779f846f97bf197d0094d148c8431c9fc8c839329 SHA512 621e1d4816301fc7c9276b5c2a2448803f79c43775cd9559399a38c9c24020ccaa2adf680cf769f769f87dbcc185bc28753c9f5130e08429b9866f32ce32dc8c
+DIST jupyterlab_server-2.27.3.tar.gz 76173 BLAKE2B 628947c066f432148e52726439743379f36c78da29d0b7596402f3ea619bc8c03a36017c130cf4700c1659a6e2ba25c28b02aaf529fc071291252dbbee3615fc SHA512 b4d2e91da8c92896958bb2adcb844d8a48f1b8df1ab8c3ff81511d0f3488c27f70f67c9f8731181fbc27836652e805efa869123ccb4d59d1098cd283a4fbcd10
 EBUILD jupyterlab-server-2.27.2.ebuild 1805 BLAKE2B 44d9ed6f1906a953234dfab6e5dde0d16be25a79170dd076e1b10d6acbadd45ed64287113c5ee71d7c2ae9a5c21f0d02657f203cde6fca5f6b550a30aab4ce5e SHA512 6a3021e4ff07cbd29205ff63a3088f19cbaa4de0363d88d5877e2020bc1cadb9846bd6694ef369024af60fc395f8595e5b78aef79be5ee4f233a390eeec8c93a
+EBUILD jupyterlab-server-2.27.3.ebuild 1810 BLAKE2B dd8176f23cf858461253a648b561447cd3da13c35c0d64c1df3728ea62ac8b30bc7c47567f2ea77dc84a3642c67a5260955c530ed5cca899ba6bfaaa8edae765 SHA512 b04c62b0d4bfbd1f5209b45d1ba408ee969cd0c930dcbdae51757c58e906104e2fb3d136fc6dc58cfdb431b83f56c1995cd003ff3d8519ec937074cc1b37b520
 MISC metadata.xml 426 BLAKE2B 98083ff6255b6c5b4ebe7eb67f4e9716f52397646df275cce4cae2f78b0fbb5dda8d6240e1546b4bac6f13ef3f3f1e6f176b2062e066070d595e5cd93c02708e SHA512 9755e74547fb74a4720c9b755449d913dbfd949bad920ecd3903df91182236ad46712c358b3db8180ddf478a6cc6c2a57c6d1a939a9911ffc7ccb39672f5868e
diff --git a/dev-python/jupyterlab-server/jupyterlab-server-2.27.3.ebuild b/dev-python/jupyterlab-server/jupyterlab-server-2.27.3.ebuild
new file mode 100644
index 000000000000..0b24f00e45da
--- /dev/null
+++ b/dev-python/jupyterlab-server/jupyterlab-server-2.27.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Server components for JupyterLab and JupyterLab like applications"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyterlab/jupyterlab_server/
+	https://pypi.org/project/jupyterlab-server/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/Babel-2.10[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+	>=dev-python/json5-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.18.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.31[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-1.21[${PYTHON_USEDEP}]
+	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/jupyter-server[${PYTHON_USEDEP}]
+		>=dev-python/openapi-core-0.18[${PYTHON_USEDEP}]
+		>=dev-python/openapi-spec-validator-0.6[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+# TODO: package autodoc_traits
+#distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme dev-python/myst-parser
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		tests/test_translation_api.py
+	)
+
+	EPYTEST_DESELECT=(
+		# Fails if terminal not available
+		tests/test_labapp.py::test_page_config
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_tornasync.plugin -p timeout
+}
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 94f877de3cc6..db85f7909c59 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,5 +1,7 @@
 DIST openstacksdk-3.1.0.tar.gz 1215965 BLAKE2B 6bf5c3f85dcc2a027af10b675f7a3c7f7cf82bccc20558c0e094def02ff07fca4952ed71240bdf29600c3ef077575c49dce0dccb1683539bef756897813f4d1a SHA512 97ef0610115e1f1534900a6003d699028c6b331af0ef95fadb27babf0bf1467a304a3cc935f07270bf597053e2536e74de79333f67d116cf0b18583a3c8db878
 DIST openstacksdk-3.2.0.tar.gz 1228138 BLAKE2B f03f90898beb4650f1ba3b13192f4d85dd630ad680c0a5988e9d284e0c5574e6a66085c93b291338df810bc2e31dbddd972557e159ac293be77298ffcac9ab1c SHA512 8cfc9054fe2749024d33556111c60af6b0225abce800fdb7fe1fbf81b0b7e9e183a191dd62eb12ba768b5815d76c1e0b335c0b5a3eac63efe005330794988537
+DIST openstacksdk-3.3.0.tar.gz 1229640 BLAKE2B f807493c8db39121599124389f330316edb0d183a7bbf9219b6e75eb6c871d3bf55207a7de7270635e4a154b9e30e2365122eab2ea28634c8f003371dccaed03 SHA512 cccfd6f28de9c617ccf9e8d0476a884a63ac0e15707ac446f0aa56f22eaefabcff07ab7aa3d46484fe0c7c5a565d000f72407250e1365202af4bbc8787fbad18
 EBUILD openstacksdk-3.1.0.ebuild 2901 BLAKE2B bfc47df29ed31496779cc5034196b25c93938fe1f0432e86b27f957c650c9d172b688ecc3edd7ca986b55a5fea222d9269619c64e0a4b8eea82832d6ce456bb5 SHA512 e47d8b36d9bf43b76fbd5a2d9ad973118e9bdff20f3d8c9ac4b1d69bcd77ff06e91169a9c6d25d8fcbb1f337325cc21b07947254d3a604adb940c79006591687
 EBUILD openstacksdk-3.2.0.ebuild 2904 BLAKE2B bf92c2e29b99334ec0c36651fffacfb62c7ffc15e5ddf6fd34bea514a48680dc5958727136d3e79b63b4e48cb3995d91279f21b7353bb956acd1a006e113b2f4 SHA512 ce1f74e8b13cffbc36fa1945569d53fef9664669eb123e0ad52bffdc082555b1daac40862419f0a462290b3a3c0c9e542adf319cf454c399351193aed01736b8
+EBUILD openstacksdk-3.3.0.ebuild 2904 BLAKE2B bf92c2e29b99334ec0c36651fffacfb62c7ffc15e5ddf6fd34bea514a48680dc5958727136d3e79b63b4e48cb3995d91279f21b7353bb956acd1a006e113b2f4 SHA512 ce1f74e8b13cffbc36fa1945569d53fef9664669eb123e0ad52bffdc082555b1daac40862419f0a462290b3a3c0c9e542adf319cf454c399351193aed01736b8
 MISC metadata.xml 517 BLAKE2B 661ad1e9eae06e7b36a5ff753e73bd4434042966cff3fd6fbc11bf70a1acc3eb8de29ad2a033d6d715e1152a5454d84077e99db3b588199b317f925864dc1403 SHA512 e6dbfbb3546c2a62b204b33ebb3bb33611079698212f098bd4da072200fe43e3bb350cc998b255ec4a15aa2ff3a04c89a9553dd7930db48e658dbcaff78526d6
diff --git a/dev-python/openstacksdk/openstacksdk-3.3.0.ebuild b/dev-python/openstacksdk/openstacksdk-3.3.0.ebuild
new file mode 100644
index 000000000000..39d1d164ab65
--- /dev/null
+++ b/dev-python/openstacksdk/openstacksdk-3.3.0.ebuild
@@ -0,0 +1,91 @@
+# 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="A collection of libraries for building applications to work with OpenStack"
+HOMEPAGE="
+	https://opendev.org/openstack/openstacksdk/
+	https://github.com/openstack/openstacksdk/
+	https://pypi.org/project/openstacksdk/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
+	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonpatch-1.21[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth1-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-3[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/prometheus-client-0.4.2[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Internet?
+	sed -e 's:test_create_dynamic_large_object:_&:' \
+		-i openstack/tests/unit/cloud/test_object.py || die
+
+	# TODO
+	sed -e 's:test_generate_form:_&:' \
+		-e 's:test_create_static_large_object:_&:' \
+		-e 's:test_object_segment_retries:_&:' \
+		-e 's:test_object_segment_retry_failure:_&:' \
+		-e 's:test_slo_manifest_retry:_&:' \
+		-i openstack/tests/unit/cloud/test_object.py || die
+	sed -e 's:test_servers:_&:' \
+		-i openstack/tests/unit/test_stats.py || die
+
+	# unhappy about paths due to test runner
+	sed -e 's:test_method_not_supported:_&:' \
+		-i openstack/tests/unit/test_exceptions.py || die
+	sed -e 's:test_repr:_&:' \
+		-i openstack/tests/unit/test_resource.py || die
+
+	# requires hacking
+	rm openstack/tests/unit/test_hacking.py || die
+
+	# fragile warning-based tests
+	sed -e 's:test_unsupported_version_override:_&:' \
+		-i openstack/tests/unit/test_missing_version.py || die
+	sed -e 's:test_create_unknown_proxy:_&:' \
+		-i openstack/tests/unit/test_connection.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest -b openstack/tests/unit
+}
diff --git a/dev-python/pyarrow/Manifest b/dev-python/pyarrow/Manifest
index fe04aabbbce5..27892eeb3af3 100644
--- a/dev-python/pyarrow/Manifest
+++ b/dev-python/pyarrow/Manifest
@@ -1,5 +1,7 @@
 AUX pyarrow-16.1.0-numpy-2.patch 2950 BLAKE2B 89457b0b8c990b0fdc0409d72ef7326432a327dcd435277131e3bd2dd3506e3f3c8877edad37f318bac5627ff6c53c045115b5cfd91f887e21524b525aca4535 SHA512 5bd77755392f1cbfdc765a3bc713040cf75a9a4e824536a400f8c163633c41b1ebc38f4ba74be83e37c346789b34eb0a421bf549b4449ce31b613706effec859
 AUX pyarrow-16.1.0-py313.patch 1860 BLAKE2B c7cf4cd0357280a51bbaf87ba5405699ebe0ab3433b5b0b7c4d917eb0103231887a33d4286e9c13e4159c90560e4d7112ccd071fce69b79441fe974f46c488f8 SHA512 c519ceafa47879fc49eef33457a3aa87e7274002ac23d01dbaeb4d0ad9a29a241c7bc3739f555c9df20f8489c377c6730fe9686983dd0ac3a2fe847fad16701f
 DIST apache-arrow-16.1.0.tar.gz 21707079 BLAKE2B 5541c364351e59e8164f2461546bce3ddc834d70b3a03b815b681187674bdd89ccfb7eb113bf9010c821845b0c1fa51f5321bfea5b20927e6364f6452ec980d2 SHA512 28975f59e1fdde2dba4afaf4a5ba934b63db3a7f27656e2aa0af0f0d2a046c9dbfa9a6082de94629c36d03809b296566a37ea65ec5a2fc17fedac7d21e272d31
+DIST apache-arrow-17.0.0.tar.gz 21822331 BLAKE2B 64f9321cbf13fafae5938f26840d3ef642d6f5b40386315030bc70fe8703786ee394c8483d2bde7961cf2b5c15470ffebd7c66029e116b05cfbf5524e9fe51f1 SHA512 4e2a617b8deeb9f94ee085653a721904a75696f0827bcba82b535cc7f4f723066a09914c7fa83c593e51a8a4031e8bf99e563cac1ebb1d89604cb406975d4864
 EBUILD pyarrow-16.1.0.ebuild 2629 BLAKE2B 7f6daf44bc3d5aa3257559ee56367a91d9437f78314febfc4bd5b00bd61f5d6255f1ff46efb15a56df4a945f6e56b79e512ed090afec5187a3d31db9faf55aed SHA512 14946af7cb7e1b39ac6be8dc4ea5fc70abe3f8e5f86a294567204928b0f81b0e352dcc288ca251ee70a79340370e2bb5bbc2f7dde41b041c4937885ddca04392
+EBUILD pyarrow-17.0.0.ebuild 2845 BLAKE2B e81c7c0b4a8140d6a0e6d6e50e06a87bcccd787961a75c4b6eb12a08119c5de9880773ca559cf32786813b9f4a80e7cbedf78aa4ceb77281e7b36c36a371a22f SHA512 00c1eeac708cac7681e577c0f4bc97d2f870e93060732d1601d2c3fe467a14f9d9b227f54f45e0f09abd4b6b39146fd9a07113282f3375421ece4c921f45fdc3
 MISC metadata.xml 555 BLAKE2B 5683205ece2b0266e5792f42ebd515c1822563d2705f046ebcabd1de71efc67800616303b2fc83ea8cac3395303178f13e859b7390adfcef23da8d687fc8d6a3 SHA512 61d8f5bcbdbe92b858d0aab3040cd3e8dcb33ba0c45808649e032a165d6826c1a489ae2cfbf8dca52eda82d5b24b4c3f74a9abd6f87d5ff72f6578cf7535c797
diff --git a/dev-python/pyarrow/pyarrow-17.0.0.ebuild b/dev-python/pyarrow/pyarrow-17.0.0.ebuild
new file mode 100644
index 000000000000..1c2d5fde59a7
--- /dev/null
+++ b/dev-python/pyarrow/pyarrow-17.0.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2023-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..13} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Python library for Apache Arrow"
+HOMEPAGE="
+	https://arrow.apache.org/
+	https://github.com/apache/arrow/
+	https://pypi.org/project/pyarrow/
+"
+SRC_URI="mirror://apache/arrow/arrow-${PV}/apache-arrow-${PV}.tar.gz"
+S="${WORKDIR}/apache-arrow-${PV}/python"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE="+parquet +snappy ssl"
+
+RDEPEND="
+	~dev-libs/apache-arrow-${PV}[compute,dataset,json,parquet?,re2,snappy?,ssl?]
+	>=dev-python/numpy-1.16.6:=[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/cffi[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-libs/apache-arrow[lz4,zlib]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# cython's -Werror
+	sed -i -e '/--warning-errors/d' CMakeLists.txt || die
+}
+
+src_compile() {
+	export PYARROW_PARALLEL="$(makeopts_jobs)"
+	export PYARROW_BUILD_VERBOSE=1
+	export PYARROW_CXXFLAGS="${CXXFLAGS}"
+	export PYARROW_BUNDLE_ARROW_CPP_HEADERS=0
+	export PYARROW_CMAKE_GENERATOR=Ninja
+	export PYARROW_WITH_HDFS=1
+	if use parquet; then
+		export PYARROW_WITH_DATASET=1
+		export PYARROW_WITH_PARQUET=1
+		use ssl && export PYARROW_WITH_PARQUET_ENCRYPTION=1
+	fi
+	if use snappy; then
+		export PYARROW_WITH_SNAPPY=1
+	fi
+
+	distutils-r1_src_compile
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# wtf?
+		tests/test_fs.py::test_localfs_errors
+		# these require apache-arrow with jemalloc that doesn't seem
+		# to be supported by the Gentoo package
+		tests/test_memory.py::test_env_var
+		tests/test_memory.py::test_specific_memory_pools
+		tests/test_memory.py::test_supported_memory_backends
+		# hypothesis health check failures
+		# https://github.com/apache/arrow/issues/41318
+		tests/interchange/test_interchange_spec.py::test_dtypes
+		tests/test_convert_builtin.py::test_array_to_pylist_roundtrip
+		tests/test_feather.py::test_roundtrip
+		tests/test_pandas.py::test_array_to_pandas_roundtrip
+		tests/test_strategies.py::test_types
+		tests/test_types.py::test_hashing
+		# fragile memory tests
+		tests/test_csv.py::TestSerialStreamingCSVRead::test_batch_lifetime
+		tests/test_csv.py::TestThreadedStreamingCSVRead::test_batch_lifetime
+		# takes forever, and manages to generate timedeltas over 64 bits
+		tests/test_strategies.py
+	)
+
+	cd "${T}" || die
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest --pyargs pyarrow
+}
+
+python_install() {
+	distutils-r1_python_install
+	# https://github.com/apache/arrow/issues/43299
+	rm -r "${D}$(python_get_sitedir)"/{benchmarks,cmake_modules,examples,scripts} || die
+}
diff --git a/dev-python/pydot/Manifest b/dev-python/pydot/Manifest
index 4200973202ec..235b9e5fbb10 100644
--- a/dev-python/pydot/Manifest
+++ b/dev-python/pydot/Manifest
@@ -1,5 +1,7 @@
 DIST pydot-2.0.0.gh.tar.gz 275188 BLAKE2B 58f1598196861795bd44c6b97683e0c37b3c05e848a69d42a3fc898849f272466c989e7ff72e0be22a322a1e92c31c6b76a9317e56f3ec26743c20801daf8bfd SHA512 09102930a59ac4339e1d1e4f7a9d075f99eda6cb060885631a72f1fded90d001bd02940b55addc0c92856e95321cb3b344a1797b4809ac7c9048ac57c81d4707
 DIST pydot-3.0.0.gh.tar.gz 280655 BLAKE2B 0c58f5a03cdb2eb325aec96e532bbe4808170a3828377ba3a278c8c5631de9c74716a19426ebb0834ecba063b92c31ef41965edb1ee22018ed658e0e4e17bc7a SHA512 493601a54e9727d727b1ff3fa9133da400dd02ca147f04b5c446a2baeda3b5ae60d0edccaf122e946abe984f7d9e375cda553a22608b070e06e8f59eda82d565
+DIST pydot-3.0.1.gh.tar.gz 280784 BLAKE2B d87d06bf5f62ae783ecb4ff6a16b0986969de49cbf45e120df5e722620fe614181700f8117b0a6ce24fd4aac4f618d4dc16c631f581ebb19bea73a5a92437585 SHA512 6aca6e91134e481334c12a7669d3f5df1181f9a4e2ab914a6c8ab87f28d0afa9d97cfc0d9b665d9fdedb3c335624d68967d491f79fc669573aa81cf1401316cd
 EBUILD pydot-2.0.0.ebuild 970 BLAKE2B 05495c7bc98615ddaad934411c481474469ba23cc174b880490e60e7dfded9b92a2d360f7355f27b286d52b55de6d44336df9388e1050d0bf97d8b103c0a649c SHA512 4652347414632080f30f05ae3dbf5a272ab9286c76610a63c94b2d364f11c5edf142038f9af6442156c7ba18856b47950e835c371b53e03ba3812cddb1408fa5
 EBUILD pydot-3.0.0.ebuild 872 BLAKE2B 6368693e19685b3ccda009f3fedbb0590e5507051ac82d2b8982062c82dabeff05b3ef652fff7c743430a1d6c93998916c791306498acb8dc4b3dcc5c69dc4f0 SHA512 3483b54673ba51064c4d0b8a4de645376e1c90102cfdd46953d8ac371fd1bda86112b111d432d9e64cc5403409ff0cf4bc4d276f865f97c16278a588e560e32f
+EBUILD pydot-3.0.1.ebuild 872 BLAKE2B 6368693e19685b3ccda009f3fedbb0590e5507051ac82d2b8982062c82dabeff05b3ef652fff7c743430a1d6c93998916c791306498acb8dc4b3dcc5c69dc4f0 SHA512 3483b54673ba51064c4d0b8a4de645376e1c90102cfdd46953d8ac371fd1bda86112b111d432d9e64cc5403409ff0cf4bc4d276f865f97c16278a588e560e32f
 MISC metadata.xml 372 BLAKE2B faad24394ef27dedc8b563e505444b414fe95cb6097bd2bebe01232e68c975b77d415c2a05ec1ad19f0ce1218d1c3f057beea6deecef01b940962a287ad8ce46 SHA512 281a6e2097fcf978f7e691640e257a5f60b242570f8a5715e078363c5658b96b50d3c29ccaad448c0b2ac3dd7b898dcae457bafdb08952163de8d1af81954d75
diff --git a/dev-python/pydot/pydot-3.0.1.ebuild b/dev-python/pydot/pydot-3.0.1.ebuild
new file mode 100644
index 000000000000..ee9b63f3aaa8
--- /dev/null
+++ b/dev-python/pydot/pydot-3.0.1.ebuild
@@ -0,0 +1,38 @@
+# 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
+
+DESCRIPTION="Python interface to Graphviz's Dot language"
+HOMEPAGE="
+	https://github.com/pydot/pydot/
+	https://pypi.org/project/pydot/
+"
+# pypi releases don't include tests
+SRC_URI="
+	https://github.com/pydot/pydot/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/pyparsing-3.0.9[${PYTHON_USEDEP}]
+	media-gfx/graphviz
+"
+BDEPEND="
+	test? (
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 1952d886f14d..e6222a5f64af 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,7 +1,8 @@
-AUX pygobject-3.44.1-py312.patch 1941 BLAKE2B 93af1e4f307e003b7e9cd62b787efa9690724d2cc293ddc571563e7e0324771537d2dd92e6998d30066bb6707b73937cc8cbbca7926666e70f939d0f6cc86435 SHA512 98d470a39d5e3b3f25e41a516d62d364daf2eec92480b31ef80ad79bc3921f53a7fa05bab23be721889ccf8fcd939e5c0bf7d04efd935f7bf9f56bc2e596cc6b
-DIST pygobject-3.44.1.tar.xz 559432 BLAKE2B 7edfe91ac1b7301befaf8ef17078b517666467f446bfbe25850336cd365d314153d444d29ecf028ce44a12cef1c94f139d110ac6784c8a2c6077730d4836f6cc SHA512 5f2ff4a068e7e24dcc32f8c43ba58660c85a0fabdd9ff0bac4ddf1ca82bd0fc962ce5cb3ab25b991c212d45e5e89dac67c3259c5423a7d7fd70b2ac1f56e5327
+AUX pygobject-3.48.2-egg-info.patch 1298 BLAKE2B e392d0c782a0e837034649177e87ac922eb5848da44b9cafdd2378a171b4018b0a1746cafd0595bd26b206c1121549683bdaff22850590067c7ee21fff46efa9 SHA512 58d708d4495434c61df1bd4cdeb3492e1791e4e81861e3b8899e4acf608e3a0bd72b6aeb6d613cd98604e8ac5dcc75d3a12765d33ad2fc8b036867c6dd724b32
 DIST pygobject-3.46.0.tar.xz 561552 BLAKE2B 6b8c9b4bf6df819c09b7bd2ea6dcb0e7c24ed7f171487b774469bd2c4694df9d4473dbde05273afc7a370f2b1f352d60347aa221bdd674a4aa8a54123d5e54cd SHA512 48293c193ba5aece38d99f45d325d0329ac33e88442bf00848fe818a7c838977b8d2cf50a404c30e8852ccc0b4a44dfda07751d51acc21f740aa2ab6aa3ce661
-EBUILD pygobject-3.44.1.ebuild 1992 BLAKE2B 0dd334932fbfe25a72f394ff496b6c9bd291f0e3b62520bc5aeeda57324b783116ff7352e495cf37d7fe9d902ad49dc7f0e751aa5923a627fbf0bf4f5aae19c5 SHA512 145a1544194f896ccdd8c26fd5136970b90e660171ade50a1bbd2cbc8e4812bff86677829a6a5f7f6fb7cdc3b9baa4d54786c2bb00a1cc9736cff18a98b44520
+DIST pygobject-3.48.2.tar.xz 556244 BLAKE2B 6ac7a42752d65668f228aa9823a4e256b030bc84683857e5470bc373eaaf383904d18399379b4a7d0989644e2b0825d63cc8b3f927b97608a209f888bf8cb276 SHA512 11619f73be5894fae82b261779f33390d1aec51b02bcf285c58f3c76ee46dfc1b3f435e4662176fde5ca899aee5afc453f8f0ba28e15e15330a52354cf737d45
 EBUILD pygobject-3.46.0-r1.ebuild 1826 BLAKE2B 72f0cd263cb0476fe73c6826b2736a74f430b842e718371752cfc1082331949ba3ed5b4d564226872b11145e821975d91f947e86c674bd679603f78ab10e2fb1 SHA512 871ee43b34f6616299a34f977511c7ed4ff77ff1faca952e4244e37bfb53da4db83e279e8fef17b1cda55b475cdae788fe4f9a8bae04974f6ffd61fdb51f1e1d
 EBUILD pygobject-3.46.0.ebuild 1823 BLAKE2B 330f531b67a6321bb6a7d7e075f5100b308209a7af9f60f77f11664148c9495ccb9d446de8d42a0b485de7cee7d115a61565cdc2fadf5f810b5deb08df2a1968 SHA512 8b98d9403ddeff8d3b46b129e2e0731178ef3488f8389468d079eca84b27b8a992eaa1aacaa27e73aa39e899e129a4ea617a284aee9916f360fb18da06a62635
+EBUILD pygobject-3.48.2-r1.ebuild 1873 BLAKE2B f5e722ed9e02bbb929be362491a1087a13f7ffda3a279446dc9c45eb77059f61b99b57360b61f06a7b07c93de6c39dc58fc6efd3d655704fc97ee9e370e943d2 SHA512 dd1f453fcdb881363a362c34e27a635d57534006349fd27b0617ee132929b671459fa02caed498187bd56b0e4be4c29dff7a0cf482aab99a3a69eb480c7a29d3
+EBUILD pygobject-3.48.2.ebuild 1826 BLAKE2B f73be1334e854e3664461245c7d6bba4a3130cf1f60c5063fff5cb08e9b5ddd8d8ea339e5f4fb5407b216b9f2c7d3d7bf94ce03c2eedd1be18c0ebb6b3939eed SHA512 468965d95cd6d2934c493baf6a0fab28ad6d0898325621f5fb2c2cdc1fb0707710f446c7c75d19041b2c3d64639414ec23adfa2e4746fb4fbc9ad5ac6b6e1ba8
 MISC metadata.xml 1398 BLAKE2B 0f89629267eea1f03252ac53ebf6478977301f5edf58024152b7e25cac1bb238241d419241dac72181bc82d0bda4dc281fe490a72967b730df7087300562127c SHA512 49ec255944b9530fe59ba325925713512ca84d71149b988c034d092d4a433c6f7a23822d685180c343a40055bb5c879980996d34a30cae8fddc617707bc1a417
diff --git a/dev-python/pygobject/files/pygobject-3.44.1-py312.patch b/dev-python/pygobject/files/pygobject-3.44.1-py312.patch
deleted file mode 100644
index 331e3bc0a3f8..000000000000
--- a/dev-python/pygobject/files/pygobject-3.44.1-py312.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From fe6aedd8eebd92844b873f72e99dc4023316c6f3 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Wed, 7 Jun 2023 22:27:55 +0200
-Subject: [PATCH] tests: fix test_gvalue_flat_array_in_item_marshal_failure for
- Python 3.12
-
-See https://gitlab.gnome.org/GNOME/pygobject/-/issues/582
-
-_PyGI_ERROR_PREFIX() no longer works with 3.12 since we only get normalized
-exceptions in there and can't add a prefix like "Item X: " to the message.
-
-Until we figure out how to add this back for 3.12, align the tests with the
-new behaviour (the new exception notes API would be an option, see the
-linked issue)
----
- tests/test_gi.py | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_gi.py b/tests/test_gi.py
-index 25a3b659..261d8b2b 100644
---- a/tests/test_gi.py
-+++ b/tests/test_gi.py
-@@ -1573,9 +1573,12 @@ class TestGValue(unittest.TestCase):
-         self.assertRaises(OverflowError, GIMarshallingTests.gvalue_flat_array,
-                           [GLib.MININT - 1, "42", True])
- 
-+        # FIXME: https://gitlab.gnome.org/GNOME/pygobject/-/issues/582#note_1764164
-+        exc_prefix = "Item 0: " if sys.version_info[:2] < (3, 12) else ""
-+
-         with pytest.raises(
-                 OverflowError,
--                match='Item 0: %d not in range %d to %d' % (
-+                match=exc_prefix + '%d not in range %d to %d' % (
-                     GLib.MAXINT + 1, GLib.MININT, GLib.MAXINT)):
-             GIMarshallingTests.gvalue_flat_array([GLib.MAXINT + 1, "42", True])
- 
-@@ -1583,7 +1586,7 @@ class TestGValue(unittest.TestCase):
- 
-         with pytest.raises(
-                 OverflowError,
--                match='Item 0: %d not in range %d to %d' % (
-+                match=exc_prefix + '%d not in range %d to %d' % (
-                     GLib.MAXUINT64 * 2, min_, max_)):
-             GIMarshallingTests.gvalue_flat_array([GLib.MAXUINT64 * 2, "42", True])
- 
--- 
-GitLab
-
diff --git a/dev-python/pygobject/files/pygobject-3.48.2-egg-info.patch b/dev-python/pygobject/files/pygobject-3.48.2-egg-info.patch
new file mode 100644
index 000000000000..0da834216f34
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-3.48.2-egg-info.patch
@@ -0,0 +1,39 @@
+From 2aa50b8841c26eb892f4666508ba72ebb8179f26 Mon Sep 17 00:00:00 2001
+From: Chris Mayo <aklhfex@gmail.com>
+Date: Mon, 25 Mar 2024 19:21:21 +0000
+Subject: [PATCH] Replace non-standard .egg-info file
+
+Installing a .dist-info directory containing just METADATA is compliant:
+
+https://packaging.python.org/en/latest/specifications/recording-installed-packages/#the-dist-info-directory
+---
+ PKG-INFO.in => METADATA.in | 0
+ meson.build                | 6 +++---
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+ rename PKG-INFO.in => METADATA.in (100%)
+
+diff --git a/PKG-INFO.in b/METADATA.in
+similarity index 100%
+rename from PKG-INFO.in
+rename to METADATA.in
+diff --git a/meson.build b/meson.build
+index b8d69c3a..32204ad5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -194,10 +194,10 @@ if not for_wheel
+ 
+   pkginfo_conf = configuration_data()
+   pkginfo_conf.set('VERSION', py_version)
+-  configure_file(input : 'PKG-INFO.in',
+-  output : 'PyGObject-@0@.egg-info'.format(py_version),
++  configure_file(input : 'METADATA.in',
++  output : 'METADATA',
+   configuration : pkginfo_conf,
+-  install_dir : python.get_install_dir(pure : false))
++  install_dir : python.get_install_dir(pure : false) / 'PyGObject-@0@.dist-info'.format(py_version))
+ endif
+ 
+ pygobject_dep = declare_dependency(
+-- 
+GitLab
+
diff --git a/dev-python/pygobject/pygobject-3.44.1.ebuild b/dev-python/pygobject/pygobject-3.48.2-r1.ebuild
index 713c63dc4584..08a08ac159f8 100644
--- a/dev-python/pygobject/pygobject-3.44.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.48.2-r1.ebuild
@@ -1,29 +1,29 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=no
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
+PYTHON_COMPAT=( python3_{11..13} pypy3 )
 
 inherit gnome.org meson virtualx xdg distutils-r1
 
 DESCRIPTION="Python bindings for GObject Introspection"
 HOMEPAGE="
-	https://pygobject.readthedocs.io/
+	https://pygobject.gnome.org/
 	https://gitlab.gnome.org/GNOME/pygobject/
 "
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-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"
+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"
 IUSE="+cairo examples test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/gobject-introspection-1.56:=
+	>=dev-libs/glib-2.64:2
+	>=dev-libs/gobject-introspection-1.64:=
 	dev-libs/libffi:=
 	cairo? (
 		>=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}]
@@ -44,11 +44,7 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	# fix test failure on py3.12
-	# https://gitlab.gnome.org/GNOME/pygobject/-/commit/fe6aedd8eebd92844b873f72e99dc4023316c6f3
-	"${FILESDIR}/${P}-py312.patch"
-)
+PATCHES=( "${FILESDIR}/${P}-egg-info.patch" )
 
 python_configure() {
 	local emesonargs=(
diff --git a/dev-python/pygobject/pygobject-3.48.2.ebuild b/dev-python/pygobject/pygobject-3.48.2.ebuild
new file mode 100644
index 000000000000..8427e19554a5
--- /dev/null
+++ b/dev-python/pygobject/pygobject-3.48.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=no
+PYTHON_COMPAT=( python3_{11..13} pypy3 )
+
+inherit gnome.org meson virtualx xdg distutils-r1
+
+DESCRIPTION="Python bindings for GObject Introspection"
+HOMEPAGE="
+	https://pygobject.gnome.org/
+	https://gitlab.gnome.org/GNOME/pygobject/
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+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"
+IUSE="+cairo examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.64:2
+	>=dev-libs/gobject-introspection-1.64:=
+	dev-libs/libffi:=
+	cairo? (
+		>=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}]
+		x11-libs/cairo[glib]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=app-accessibility/at-spi2-core-2.46.0[introspection]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		x11-libs/gdk-pixbuf:2[introspection,jpeg]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+python_configure() {
+	local emesonargs=(
+		$(meson_feature cairo pycairo)
+		$(meson_use test tests)
+		-Dpython="${EPYTHON}"
+	)
+	meson_src_configure
+}
+
+python_compile() {
+	meson_src_compile
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
+	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
+	meson_src_test --timeout-multiplier 3 || die "test failed for ${EPYTHON}"
+}
+
+python_install() {
+	meson_src_install
+	python_optimize
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index 2fe51114198f..b83215c52870 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1,3 +1,5 @@
 DIST mongo-python-driver-4.7.2.gh.tar.gz 1548375 BLAKE2B a40dbe153f36cdf2836583aa0116f447d08376ce7980a09d0f21cea37a34ab318e5ff0b34b7fe1721cf7fc5d5443a1dbe0982d59cb941b0da8a4a99abdc7b19d SHA512 1de8bd14301e365eb53252dedaaaf8c9056dd534662543e2a500511e5f5f67a69e1f11a8a8575efdbd8852bb47b632d59762f66024d32973d20dc17c4448b9be
+DIST mongo-python-driver-4.8.0.gh.tar.gz 1550149 BLAKE2B 9462480b17f3da54918883fbcb28a4324e6a00a9c2c34b16267ebcd378170f7fd34ec7290f7a0e3c4c38a5f1f803428cb6a0c64a562d956b3a19c37130697012 SHA512 17513a278187424fea1876d288651e385be759f23eebceca8d04a15182b15ffd64956193bb53e4a90e8b2197c2ebbade274737091f5d2e5fb4398539674c41df
 EBUILD pymongo-4.7.2.ebuild 5273 BLAKE2B 744a546bd65aeade14cb29ed09c7819eb626fd9a951f6f7436ae71a51542d0485915e68d42d561937e4214a7395a40fd367fe938a1f2d04b32cfd5acdcf94357 SHA512 446fea553ce9072735563be260aa2288567853442a8bec4439c11fb3d4a093de3e751b67ff82154a1e01d4ead1ba46af76392ec28004b07c49d61fe357c003a6
+EBUILD pymongo-4.8.0.ebuild 5851 BLAKE2B 7cb50ac6e97a9bf7ab94be642ec18461f084b49876618927583c017f5b1922e52be92b7201c566af730186d139187dd118dab52f54d97f5020544a5884ff2e15 SHA512 b30250bdeb5cec166ede7f9eb729d2a53245e2ba977c980216e9c6e025f517e166bbc720d46f2188c9a124b9d388ad49708c88fd2ac8caa9b60cbc7990d9515f
 MISC metadata.xml 880 BLAKE2B 024d83cdf3d8cf94cdc98153a6b429550579d494b053becfe5cda0a7a7f3852632d7155e71116a9ab751e6542fe63985755f4eeb147914bc8dbb1e9fac560434 SHA512 c6110fd18fa7f7819299b5de919bfc0ce407d653115d34d297513ce3a4acd2e16399d6f327c61bc5d4ef8aa6776f84750cff37798415ca4bd59c6fd19961d891
diff --git a/dev-python/pymongo/pymongo-4.8.0.ebuild b/dev-python/pymongo/pymongo-4.8.0.ebuild
new file mode 100644
index 000000000000..fed0a4c95185
--- /dev/null
+++ b/dev-python/pymongo/pymongo-4.8.0.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit check-reqs distutils-r1
+
+MY_P=mongo-python-driver-${PV}
+DESCRIPTION="Python driver for MongoDB"
+HOMEPAGE="
+	https://github.com/mongodb/mongo-python-driver/
+	https://pypi.org/project/pymongo/
+"
+SRC_URI="
+	https://github.com/mongodb/mongo-python-driver/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc kerberos +native-extensions +test-full"
+
+RDEPEND="
+	<dev-python/dnspython-3.0.0[${PYTHON_USEDEP}]
+	kerberos? ( dev-python/kerberos[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		test-full? (
+			>=dev-db/mongodb-2.6.0
+		)
+	)
+"
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
+
+reqcheck() {
+	if use test && use test-full; then
+		# During the tests, database size reaches 1.5G.
+		local CHECKREQS_DISK_BUILD=1536M
+
+		check-reqs_${1}
+	fi
+}
+
+pkg_pretend() {
+	reqcheck pkg_pretend
+}
+
+pkg_setup() {
+	reqcheck pkg_setup
+}
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# we do not want hatch-requirements-txt and its ton of NIH deps
+	sed -i -e '/requirements/d' pyproject.toml || die
+}
+
+python_compile() {
+	# causes build errors to be fatal
+	local -x TOX_ENV_NAME=whatever
+	local DISTUTILS_ARGS=()
+	# unconditionally implicitly disabled on pypy3
+	if ! use native-extensions; then
+		export NO_EXT=1
+	else
+		export PYMONGO_C_EXT_MUST_BUILD=1
+		unset NO_EXT
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	rm -rf bson pymongo || die
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local EPYTEST_DESELECT=(
+		# network-sandbox
+		test/test_client.py::ClientUnitTest::test_connection_timeout_ms_propagates_to_DNS_resolver
+		test/test_client.py::ClientUnitTest::test_detected_environment_logging
+		test/test_client.py::ClientUnitTest::test_detected_environment_warning
+		test/test_client.py::TestClient::test_service_name_from_kwargs
+		test/test_client.py::TestClient::test_srv_max_hosts_kwarg
+		test/test_dns.py::TestCaseInsensitive::test_connect_case_insensitive
+		test/test_srv_polling.py
+		test/test_uri_spec.py::TestAllScenarios::test_test_uri_options_srv-options_SRV_URI_with_custom_srvServiceName
+		test/test_uri_spec.py::TestAllScenarios::test_test_uri_options_srv-options_SRV_URI_with_invalid_type_for_srvMaxHosts
+		test/test_uri_spec.py::TestAllScenarios::test_test_uri_options_srv-options_SRV_URI_with_negative_integer_for_srvMaxHosts
+		test/test_uri_spec.py::TestAllScenarios::test_test_uri_options_srv-options_SRV_URI_with_positive_srvMaxHosts_and_loadBalanced=fa
+		test/test_uri_spec.py::TestAllScenarios::test_test_uri_options_srv-options_SRV_URI_with_srvMaxHosts
+		test/test_uri_spec.py::TestAllScenarios::test_test_uri_options_srv-options_SRV_URI_with_srvMaxHosts=0_and_loadBalanced=true
+		test/test_uri_spec.py::TestAllScenarios::test_test_uri_options_srv-options_SRV_URI_with_srvMaxHosts=0_and_replicaSet
+
+		# broken regularly by changes in mypy
+		test/test_typing.py::TestMypyFails::test_mypy_failures
+
+		# fragile to timing? fails because we're getting too many logs
+		test/test_connection_logging.py::TestConnectionLoggingConnectionPoolOptions::test_maxConnecting_should_be_included_in_connection_pool_created_message_when_specified
+	)
+	local run_separately=(
+		# need to run some tests separately and then restart mongodb
+		# to prevent it from crashing
+		# https://bugs.gentoo.org/934389
+		# note that this list must not overlap with EPYTEST_DESELECT
+		test/test_bulk.py
+		test/test_change_stream.py
+		test/test_collection.py
+		test/test_crud_unified.py
+		test/test_gridfs.py
+		test/test_gridfs_bucket.py
+		test/test_gridfs_spec.py
+	)
+	local run_separately2=(
+		# sigh
+		test/test_command_monitoring.py
+		test/test_connection_monitoring.py
+		test/test_cursor.py
+		test/test_database.py
+		test/test_grid_file.py
+		test/test_monitoring.py
+	)
+
+	if ! use test-full; then
+		# .invalid is guaranteed to return NXDOMAIN per RFC 6761
+		local -x DB_IP=mongodb.invalid
+		epytest
+		return
+	fi
+
+	# Yes, we need TCP/IP for that...
+	local -x DB_IP=127.0.0.1
+	local -x DB_PORT=27000
+
+	local dbpath=${TMPDIR}/mongo.db
+	local logpath=${TMPDIR}/mongod.log
+
+	local stage failed=
+	for stage in 1 2 3; do
+		# Now, the hard part: we need to find a free port for mongod.
+		# We're just trying to run it random port numbers and check the log
+		# for bind errors. It shall be noted that 'mongod --fork' does not
+		# return failure when it fails to bind.
+
+		mkdir -p "${dbpath}" || die
+		while true; do
+			ebegin "Trying to start mongod on port ${DB_PORT}"
+
+			LC_ALL=C \
+			mongod --dbpath "${dbpath}" --nojournal \
+				--bind_ip ${DB_IP} --port ${DB_PORT} \
+				--unixSocketPrefix "${TMPDIR}" \
+				--logpath "${logpath}" --fork \
+			&& sleep 2
+
+			# Now we need to check if the server actually started...
+			if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
+				# yay!
+				eend 0
+				break
+			elif grep -q 'Address already in use' "${logpath}"; then
+				# ay, someone took our port!
+				eend 1
+				: $(( DB_PORT += 1 ))
+				continue
+			else
+				eend 1
+				eerror "Unable to start mongod for tests. See the server log:"
+				eerror "	${logpath}"
+				die "Unable to start mongod for tests."
+			fi
+		done
+
+		case ${stage} in
+			1)
+				nonfatal epytest "${run_separately[@]}" || failed=1
+				;;
+			2)
+				nonfatal epytest "${run_separately2[@]}" || failed=1
+				;;
+			3)
+				EPYTEST_DESELECT+=(
+					"${run_separately[@]}"
+					"${run_separately2[@]}"
+				)
+				nonfatal epytest || failed=1
+				;;
+		esac
+
+		mongod --dbpath "${dbpath}" --shutdown || die
+	done
+
+	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
+
+	rm -rf "${dbpath}" || die
+}
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index fbae3dd0e9e5..3caf04452691 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,3 +1,5 @@
 DIST pytest_asyncio-0.23.7.tar.gz 46296 BLAKE2B afcdba0928f07e91ed68f54de2c1241fec784f164e3d5edb09908b913536edadbba7c90a73a8c843715da4567b18cc27929f31c6d0c2be3940e6ecc23abcc43c SHA512 d7164b060c1d0aa7999537e5681d2153662d49ec94e056da93b4cb2ba3dd0e3e5e4a68691c15b920c8e0ced03a4256620da600a33bcfa76b1adfa7ee66cd8de0
+DIST pytest_asyncio-0.23.8.tar.gz 46920 BLAKE2B 6b7a66e6ef28f2c7a874a115e0346b3803051df5d57e5b8ba35480982231a804adfbe8a4a2c605847730ea940fafe9df2aa94f5081b43aa753b64c3e2ea027a5 SHA512 68f23458c5f22bdb75a6a0a12f185b1f22c5231c0cdcd84806781419f5c866844e851398d771c5932af4a42b5dfdcce6624181f2c0d2f70187bb5feed0ba7c97
 EBUILD pytest-asyncio-0.23.7.ebuild 1585 BLAKE2B 1e2e0920696b7c6f42b5512c066c031c9b414b07d38f8f3f8cc8ae968c1fb6c6b75a55a985397e76c0562bbc2d8e7f13fb7d3777d48f19851731d618a5c0c26c SHA512 d2ef6709cf1d74350e0368ff320b1c6a31e7815b08c81cb2b8239d67115c70c9bea6c1082ec6c20107909cfdab0874a125d9add94e08f23079af2f669c9ea55e
+EBUILD pytest-asyncio-0.23.8.ebuild 1593 BLAKE2B d6f54d0b041123f4f5f2b52e92bbeaa2f21ddb28955fc748cfe8fcb6d2be0c796b0e08ee4c4089ba81f0fae1a1635c8987b27980095786ead69728f955246cc7 SHA512 b3379d24765c15f24796056c7a8d121fcca3012356472a8ffb878dd42f9f79f339599b4f9e2264ee3614693e079b82b2ecab5e48078948de633e37beb18cea80
 MISC metadata.xml 385 BLAKE2B 3d8faba48e1b3e531ea338f08f2de4b7bf637190e65fc61df2bd4d994cc97707016f83927f4a5181ac27d412a8c91255e90caba15f2d687f2339bc8ea61b18f2 SHA512 71178d3fba362e7532c87cb519f3661b25018771b86c302660de11f1bc7817b8352a2c8fcf60084a5e62b15148307a360267381ac38e8c856784034d80327d4d
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.23.8.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.23.8.ebuild
new file mode 100644
index 000000000000..ccbee1a2f1c6
--- /dev/null
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.23.8.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2019-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} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Library for testing asyncio code with pytest"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-asyncio/
+	https://pypi.org/project/pytest-asyncio/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on precise warning counts
+		tests/hypothesis/test_base.py::test_can_use_explicit_event_loop_fixture
+		tests/modes/test_legacy_mode.py
+		tests/modes/test_strict_mode.py::test_strict_mode_ignores_unmarked_fixture
+		tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_fixture_leaves_loop_unclosed
+		tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_test_leaves_loop_unclosed
+		tests/test_pytest_min_version_warning.py
+		tests/trio/test_fixtures.py::test_strict_mode_ignores_trio_fixtures
+
+		# TODO
+		tests/test_is_async_test.py::test_returns_false_for_unmarked_coroutine_item_in_strict_mode
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_asyncio.plugin,_hypothesis_pytestplugin
+	epytest
+}
diff --git a/dev-python/pytest-import-check/Manifest b/dev-python/pytest-import-check/Manifest
index d7fff905f6eb..cfb384e85902 100644
--- a/dev-python/pytest-import-check/Manifest
+++ b/dev-python/pytest-import-check/Manifest
@@ -1,5 +1,7 @@
 DIST pytest_import_check-0.0.1.tar.gz 3019 BLAKE2B 7e34c3aa7b59b1c3af2eccd336cfa6e6b33ac596648c36c1fef647eb9d4f24e560b865fd8b58191f5ae94463f199f855c701f00d48912c73ee8474dfbc32d0b5 SHA512 e582af2017531318bd95acea7c96050a3f5f6373a4c1deeb7aa290e67a068bc46c398279a72dee5ef34c2585ccad75a7d9e74011335b845e86bcb1e9a1adaa2b
 DIST pytest_import_check-0.0.2.tar.gz 16309 BLAKE2B 94e6f9d316194f6765a38ddc97ecb4a9df7d4413077e0f9a1d638b0535920e4d379f2cc538f102176e10cdd54b4b535531e0e9bf02c42c7c085b02a82c3f1a56 SHA512 fd2a5e0bb55d2cb0a3e8d0c6281f05996a4213ffa554636e02660882281af5aa43d759b801853b272b9b572b4c7de6c3c659861f4c4b780907eb8b0e6ec802e1
+DIST pytest_import_check-0.0.3.tar.gz 16993 BLAKE2B c0d9ccff18f46b4331ba455fec3e4353084769be631f81e56bf8f0fce374cbc3b9e5ef16e3527f7d39e2b6f46ea7e26b88ffd4197487575b14ee607f94389045 SHA512 4618bc4f5988480f712d0a5dcf7dc2743520a454e5b32beb225f04afeb70235a65bfc27c5a30dbdf248429b844a64edd4a0af805eaa720ba5658aa7dccf8fbb4
 EBUILD pytest-import-check-0.0.1.ebuild 629 BLAKE2B 1a86980b48577d1d8127bfd07db4bacbf0693a90e73d572429ca5cd97c77b9a849e42646d3377afc4149016529d356c3ee5dc33d9cd15dab28e275ee08ba6e41 SHA512 c349fb15969204ea245b12128b08f486a48093696fdb32e512baa8a720ed9d55af559b0fbe2eddb24510b35c96c1eff13b200178be2870fff410eb91d4bf7d28
 EBUILD pytest-import-check-0.0.2.ebuild 738 BLAKE2B 67061ae1b6d86db857064d68f04baab278f27d8c51b353183e66525e152a0346853777017f3c00c96356d31a441272f3303de3bb7dc248c88d104b6f92f04ef8 SHA512 46094a1cf2f54cbac771f342feeb732a5c5ae5fabf3c982ffef50e76989b46a287b84497cc75fa96ead4c560eb090b89caecbd8f90a1ad541656bcaecb6954c7
+EBUILD pytest-import-check-0.0.3.ebuild 768 BLAKE2B 475ec69f10e4741811337922b1e7424c57b6bbb5f095025e9a053ec9b1c83e0ec6df3797d3d551cbc70ad04e22bc921ed220ce9574c137b6e7677a84e4c21b45 SHA512 0759521b9ff14464285f180a9c1c6a9e4a8a2771705dc3fee56b7f34893a5cd2f706dcd0c6ef01a55e654ff98efba619124444467a4c85f3f942d6503588cff6
 MISC metadata.xml 420 BLAKE2B d0c04ab196aea14db06ac2a84d74c2ca17de890ebca32ebdd1d6a67a4d36b4169988d39575ab4dd0d92d5d0ff39d007567da134f94d94a681c2164abaa477845 SHA512 7841162b18b5f8735d0b142d9399742ec6e8404916564aa01d635cfd6120fe4996496ce6aa0562a721d1d6753213c888b76c29f13ca4be3ffbb283c70a592519
diff --git a/dev-python/pytest-import-check/pytest-import-check-0.0.3.ebuild b/dev-python/pytest-import-check/pytest-import-check-0.0.3.ebuild
new file mode 100644
index 000000000000..62fbf37420b0
--- /dev/null
+++ b/dev-python/pytest-import-check/pytest-import-check-0.0.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="pytest plugin to check whether Python modules can be imported"
+HOMEPAGE="
+	https://github.com/projg2/pytest-import-check/
+	https://pypi.org/project/pytest-import-check/
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-8.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_import_check.plugin
+	epytest
+}
diff --git a/dev-python/pytest-lazy-fixtures/Manifest b/dev-python/pytest-lazy-fixtures/Manifest
index eaa86d706666..eff75a0c87e4 100644
--- a/dev-python/pytest-lazy-fixtures/Manifest
+++ b/dev-python/pytest-lazy-fixtures/Manifest
@@ -1,3 +1,5 @@
 DIST pytest_lazy_fixtures-1.0.7.tar.gz 6958 BLAKE2B e8bd937592fc0773077712517655f25a3051263c3ef0a9450e78a22b3e69fa028ecbe17b8f9c5d4e38eff263a2a3a8cb5b0a64e0ca77cd47c80b3128f9a46122 SHA512 abb4cc08d3a3a3de5e1df2df7df8b9f552cefc715408b402a738ebc0368475480f63c627d49b7fe0bdfdb468f15cfc8e568ac1057511f9f9cc4c13231a8c3e71
+DIST pytest_lazy_fixtures-1.1.0.tar.gz 6952 BLAKE2B 487e449368a0cc38a2249c4b1863ddaf050f6c1841624639365b3c972400be677ab2b40e4a9032cd41fbfcadb125109d1801459d48519faaa72533ea54213e3d SHA512 71c55335153520c72dc12b8decc99f2f82369e737ff5067b2a5d53d09ebd5550cf182bb594ef74c574d77f0ce851856eb982860c952147d3fe65b32345e8d6b7
 EBUILD pytest-lazy-fixtures-1.0.7.ebuild 703 BLAKE2B 7354e8e65fc80fe555566328a8b8055017c896f3734df482ceb84fd1599636227714df1f81ccd5a752389d71ffbd88d45103daac55fa9d4cb7ca9190986d1ff6 SHA512 e6381ea208cb5c694997630a1fa82cdf9653fffbb6f8987a9a49907751342fcad57e2395b58635fd3f868acf86c5e2bfdfd87967780866683e08d97d5e68b7d6
+EBUILD pytest-lazy-fixtures-1.1.0.ebuild 708 BLAKE2B 5e0fc37d2b453afffb78459f5b05ed1f6881069a42c4125b7d2bd0f162be9852f62114d1ea2fc0f84e80c765b4c1fe51659f15a90d3994c30e890341731e6cea SHA512 6dc18b79862d2ebbecfd7449c2828dadf37d909d677356847035e14fd46804960d90dba809fa85324ccd0cb32a8d89973a84fb2218492e510b14a1950f92f217
 MISC metadata.xml 397 BLAKE2B 99b31408b673a22388daa05cfe76d1f44e94e684dc14717d2a403e1734b703cabc100d687e888bd7c36df54fb49128b849ad6817bdcf01f1c36e497c32106427 SHA512 f5f34da24f19be54a81e06235102712399cd253b2981e7d01aedf730891cdf55cbaf816d99a0ef09b108475db79f05d940cd8b0487f5b9fc0c399fe29ba7ae95
diff --git a/dev-python/pytest-lazy-fixtures/pytest-lazy-fixtures-1.1.0.ebuild b/dev-python/pytest-lazy-fixtures/pytest-lazy-fixtures-1.1.0.ebuild
new file mode 100644
index 000000000000..507bf3099c3d
--- /dev/null
+++ b/dev-python/pytest-lazy-fixtures/pytest-lazy-fixtures-1.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 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="Allows you to use fixtures in @pytest.mark.parametrize"
+HOMEPAGE="
+	https://github.com/dev-petrov/pytest-lazy-fixtures/
+	https://pypi.org/project/pytest-lazy-fixtures/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-7[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_lazy_fixtures.plugin
+	epytest
+}
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index 0926d7bac9a7..fc2656f14132 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,6 +1,8 @@
+DIST pytools-2024.1.10.tar.gz 81741 BLAKE2B 39d44636c82ce7f2cadd543e9e3f7a32def0e11b3df24f0ae43aa47da924a1c2d9258b3147187dc9b0a12a5485e74bb906a87655ee863390af61ec6ce03ec95e SHA512 2e8d401b9f26b9a60ef4f479c982ff2b8801b00ac35b7ec06e36980fb5071c709d574e2a841f826d7ceff8a1303591c46a269284b09730c30eaca6759ca88ad5
 DIST pytools-2024.1.6.tar.gz 81344 BLAKE2B ff68e2606170bf54e3f609ee7f4cfe58e063f43dcfb2706d5ed7659ea2fde863e6315d0d81dff2e62a3378f195413561a927b0c1e7bedc06388cf4893c07b873 SHA512 a9e934f1cbaf0ace32420f9b74224a06ce8421ee291b837292133969c6788c4cc8bea01446cd4d1505aca9fa81e8ae0d3eacf60d3285186e66d67d5abe10ce3e
 DIST pytools-2024.1.8.tar.gz 82220 BLAKE2B bc1dd2eb80be38f6ee450f2d0a780b4815b3a3349bc99ca8521a891bccbc0c4e532881db749def53e26e088238f852ca9174e0fc2a7a7a43a064c1caadec2772 SHA512 d49a6c2cd73915dbc9446f4ed2a05ac30c3235b8fd57fc26814c42cb31ab43c54ae3b06ad69354c7932f266e0f2e0fcde4b9ff91426f8744f924e3d6837f0060
 DIST pytools-2024.1.9.tar.gz 80992 BLAKE2B 0c097690eaba7e40be3bc6ec5a0a3a3fd19cd793cd637a7c4ecf89adbd0a64ee63340f7d631c3b23a35e9230de37b239306da35fd7a8d9d9a50a7ea39198f977 SHA512 224bc9e98f6e2fdac1433f1d486946ce17d7b48271b78110066ebbb59384e0e8f3087ad82899fc6fdae4494198872acda384426c49a01b3d3c879eaf9b618323
+EBUILD pytools-2024.1.10.ebuild 872 BLAKE2B b33a167ee1c61e098ff877dfdbcb8c9b81d6f71d050af767dd2b6899a0c515e3c2dc8f6a30dd052c363103bd8dc071ac273cc56999fddf0c9246744bd5066916 SHA512 f2e346bc670b8b6f96e9192ecd01a83d481d008259e3da521382ddfd6f6ae35d345fde1297fc4180858dc1fbf690135a5db9e34672bde0c6750706a69f8296db
 EBUILD pytools-2024.1.6.ebuild 831 BLAKE2B b0402da628468a2977e2975b84cd0ce0060604d2de7864bd21d45d88270e7819decb9ee8d78078deb352107780da13461e36e0909ac68686c526d32a9e311243 SHA512 1fa17b25019dc6487332bf36042629b08b4214b4fb68e4f54e5b032f11cdc0eab6737ae731d86f5c4188b18a1d5dfb39ce056ff1b0c77aa612429d91e36ca528
 EBUILD pytools-2024.1.8.ebuild 866 BLAKE2B 607b33e74a595a59eca6d47e9c191986546dedc1b2684ea31034f2e3749e700aec3df4ddfc703265e78318eb00b2ed1007fd8c8ff19454ab8b16c4810244ecc3 SHA512 4b6f77e97646af484d6bef91d11c15e22f7610bdc71e511788a078c8b7d8d1b119612bf14b847326be6dd27b6cecf437f7f3566fb90b4167c13a618919db8059
 EBUILD pytools-2024.1.9.ebuild 872 BLAKE2B b33a167ee1c61e098ff877dfdbcb8c9b81d6f71d050af767dd2b6899a0c515e3c2dc8f6a30dd052c363103bd8dc071ac273cc56999fddf0c9246744bd5066916 SHA512 f2e346bc670b8b6f96e9192ecd01a83d481d008259e3da521382ddfd6f6ae35d345fde1297fc4180858dc1fbf690135a5db9e34672bde0c6750706a69f8296db
diff --git a/dev-python/pytools/pytools-2024.1.10.ebuild b/dev-python/pytools/pytools-2024.1.10.ebuild
new file mode 100644
index 000000000000..0f076af0c8bc
--- /dev/null
+++ b/dev-python/pytools/pytools-2024.1.10.ebuild
@@ -0,0 +1,34 @@
+# 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'
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Collection of tools missing from the Python standard library"
+HOMEPAGE="
+	https://mathema.tician.de/software/pytools/
+	https://github.com/inducer/pytools/
+	https://pypi.org/project/pytools/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+# NB: numpy is now an "extra" (optional) dep -- we can remove it from
+# RDEPEND If revdeps don't need it
+RDEPEND="
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2[${PYTHON_USEDEP}]
+	>=dev-python/siphash24-1.6[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-4[${PYTHON_USEDEP}]
+	' 3.{10..12})
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sabctools/Manifest b/dev-python/sabctools/Manifest
index 6baaaee1cb2a..78ab944d438d 100644
--- a/dev-python/sabctools/Manifest
+++ b/dev-python/sabctools/Manifest
@@ -1,5 +1,7 @@
 DIST sabctools-8.1.0.gh.tar.gz 8963885 BLAKE2B 36d6bbc34f636ac4e892f941eb6e583166ee1f5f740440b3f07faacddf7715d8b4c642a4e6252ece1bdef69017be3d04ce5d6c8e36479bb176e4cd0635f1567d SHA512 862c39f2e386622b528f120a431f214e1e2e92b7c5a751e47d0768f40ce06ad2736d867f7ac2e1810d676e980312bbfedd29951cbadeddefe75246cdcf53fcc6
 DIST sabctools-8.2.3.gh.tar.gz 8974172 BLAKE2B 15b15cb1a5b7e923cc43e5e619e02f09d34f69d05d692b11bf3de8b12a1f33efcf6cf8cd8b251c646f1e2be7e2941c755e2e30a205b9e066d280038b287b262d SHA512 7bf1b0e9f55d9f6384166cca911c0d1dd79b3d4d1c33effe295fe4e053394a674a36548e5241a86817ce109a1165e0814954550436f5381daddfc8c1a7c188e5
+DIST sabctools-8.2.4.gh.tar.gz 8974209 BLAKE2B ddea09ec8a0a4b34779f1e8fe5fc4712ce7dd311ded308c77fb7925b8236e740bb8c345998f7e8e92837c7c19e9c4bbaf0bd0c2ac2b967cf98aa660105814d59 SHA512 2e79a7b854be51b04a91fffb3401a4bd2e7c6d74d1815d1228a9fca97b79c599463a062386f85555ba6ce9a3e8130a1615a3c576fe5411b7dff48c37eaf6b34b
 EBUILD sabctools-8.1.0.ebuild 762 BLAKE2B 6ca7839b09454d14cebeb9de943f2fbe6b7e1a09734c2bf1190b020d1bbdbc9eed74756051085c47c5bc86c3d0fe8cecfb19706e340a5e770575621c384b07b4 SHA512 82555f53deb0e08a2c46b363664d0ab082ce4e23995f90df3e69435764f3acdc55b3f3f530d2c84a1d6e53dc6cc18e55733635b60489a418d08a6c8ead7cbaf0
 EBUILD sabctools-8.2.3.ebuild 762 BLAKE2B 6ca7839b09454d14cebeb9de943f2fbe6b7e1a09734c2bf1190b020d1bbdbc9eed74756051085c47c5bc86c3d0fe8cecfb19706e340a5e770575621c384b07b4 SHA512 82555f53deb0e08a2c46b363664d0ab082ce4e23995f90df3e69435764f3acdc55b3f3f530d2c84a1d6e53dc6cc18e55733635b60489a418d08a6c8ead7cbaf0
+EBUILD sabctools-8.2.4.ebuild 763 BLAKE2B 35320ffd5dd6496783d6a12611b6ab397d98f2b222f42f75681a03f0057fe93e54c54bb162b31236384074aa5931b82bdb2cc8bf3e56d076728c3589cfd70fc9 SHA512 d1886f3f3dcfa4be1bee18a90a259032eb854441374a19218aa4c7ac01d2c6cabeeaa5535c9b31bd2cb841a742bf640402922b8b185dae63a227b2c033622628
 MISC metadata.xml 373 BLAKE2B edc4fca97bbcc667510d4ef70c33512a3b82f05cefe62f9791cae70f5e99d757a4050b60f81bcd7bc5e0227ba12ac36f069ffcfbce37aa9b80e1102d4deed82f SHA512 adc4d0e1a96bf35378f12b93456d06b9c57c3db2be18951a91f6d308c6edd27fc44d81c39f66c6cf8b9de76923fff014487652652ab652a6e3b0f44fbe8721c1
diff --git a/dev-python/sabctools/sabctools-8.2.4.ebuild b/dev-python/sabctools/sabctools-8.2.4.ebuild
new file mode 100644
index 000000000000..5660f5098ba9
--- /dev/null
+++ b/dev-python/sabctools/sabctools-8.2.4.ebuild
@@ -0,0 +1,39 @@
+# 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..13} )
+
+inherit distutils-r1
+
+MY_PN="sabctools"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Module providing raw yEnc encoding/decoding for SABnzbd"
+HOMEPAGE="
+	https://github.com/sabnzbd/sabctools/
+	https://pypi.org/project/sabctools/
+"
+SRC_URI="
+	https://github.com/sabnzbd/${MY_PN}/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( README.md doc/yenc-draft.1.3.txt )
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphinx-argparse/Manifest b/dev-python/sphinx-argparse/Manifest
index 6fda0d7040a7..5e10c7c6580d 100644
--- a/dev-python/sphinx-argparse/Manifest
+++ b/dev-python/sphinx-argparse/Manifest
@@ -1,3 +1,5 @@
 DIST sphinx_argparse-0.4.0.tar.gz 15020 BLAKE2B 73118f56ff82d52f04066b9d500aebc77eb5a0fecd03fa69f382c0f2afc0cbffdd395da707cf37b59f039e93935f8d5c3fe0e0f7a2820d3b6509dd78b37b0d74 SHA512 b96050da6c02f87c54f9dc9146bed955e99258df740b467575a2b3e9919fa8c4c6d30a736dab24360086bfc0d7d09c4bc7a818700af2c7846eed3a3b99053d65
+DIST sphinx_argparse-0.5.2.tar.gz 27838 BLAKE2B 273b08c02ed9d43483988170857389c3e933a850774a721e59049c8c42c82f85cfd60aa324d8189a9f06993166bbe079449fff48a4947c271a8ebe19cbb13d86 SHA512 d200099392f7ab657f98b98bf0a02992baa5e2762805f4b066cc971a8181fb53ea20c522fbc1927e7be73cb69725c31a0aa9433b59a1deea0d1a805321fa77dd
 EBUILD sphinx-argparse-0.4.0.ebuild 579 BLAKE2B 1b61a1631046f67d3b72740a603c97ccd5f60062e8dc118734b84f9eb0f2f3c8b432804ea66cb0f52b19a99e6a166e29d0b4ea7f8bd4eedbafe68dc86e1bef11 SHA512 31e3015cdb6ea1648aa6d28f53e499a88f6b063328f28c5452c26153082020954104139049d39ca9a505097826c5349e3e1eb75489498d15156eada4335a3e05
+EBUILD sphinx-argparse-0.5.2.ebuild 701 BLAKE2B 1e413285fec05c5ed352edcf72ffff630c0752ac9f35a16e6a57746dacf8b8bd6d87df8080a75b7c09ed085b7fa3da2d5088cca87a0a04f016dfd29a186c73ce SHA512 2efbdf7f16fab58c79675e5d972bcf6e9002cf2444fdc2574ba7ceaebbf06607c0b10fc3dddbce156e381a08ccaa767e0edd2e62dfeddcdeccfa74ae6d4e348b
 MISC metadata.xml 397 BLAKE2B 84e74c41dd570020518232a2b36f5c32ec366255dc9da6ea268f9c3cbbc1acf90632a2cea442cbdf8d591f28c35820afbec79d22a2582584943afeb4efc2a39a SHA512 777f0c6de3fea39696176d7eb1cfef323d64eb440cf07f4eb52815d3ac81ff31df7d9d31816bf560383f33e3c4d6074381b29493a155fc2f0e431bd79014ffbe
diff --git a/dev-python/sphinx-argparse/sphinx-argparse-0.5.2.ebuild b/dev-python/sphinx-argparse/sphinx-argparse-0.5.2.ebuild
new file mode 100644
index 000000000000..07cc564179b6
--- /dev/null
+++ b/dev-python/sphinx-argparse/sphinx-argparse-0.5.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2020-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} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Sphinx extension that automatically documents argparse commands and options"
+HOMEPAGE="
+	https://github.com/sphinx-doc/sphinx-argparse/
+	https://pypi.org/project/sphinx-argparse/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/docutils-0.19[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/commonmark-0.5.6[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index b77c1be30366..59b83d0467a7 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -1,3 +1,5 @@
 DIST sphinx_autodoc_typehints-2.2.2.tar.gz 40324 BLAKE2B 113a3ce262ca5c1bab60d388080ce33559dc24388c0690b9db8413825b136830015afd70cfa0c95464d6bdc4824fb8b511a22579eb2ab0fec267405ce953ace9 SHA512 11996f0cf916ccf7f630bbdad7e4b4f0e0969c97c5714c71a08a2c0eda3c1e36a27843048cf44c42b1a71e7d50b4353d94cf3c201bf2356ded2f305709bd1b1e
+DIST sphinx_autodoc_typehints-2.2.3.tar.gz 40394 BLAKE2B eece3fd99898bf6c93561b0269a7cae2d9b5bd7868ef3d9cd61868b57b9435ef255731db7fdbde2cf05b1f1ed1c8864060fd15ad5b44bbd122f2c2d4fd264aeb SHA512 8a39129ae3e90703c7de8d25c7616256b4d203f6e3c6971f382265361236e7606fa16169e189ca47cd4f1dfdf27a98a16c7b92ce409e2431886e4dacd0159fcf
 EBUILD sphinx-autodoc-typehints-2.2.2.ebuild 1067 BLAKE2B 218eb8d8c6d1fc4b5458751c276e99de75efd1d4466452910499021cdc1f1a9418f97203a4ddd163aad458ad81d89973e26ff8b401e660b925137e840d832cb3 SHA512 a17094710d36c11e9c4f0eb656fab4464277019dcd2f88baf131e4dfc580bcc9cb002f94bcb2c1aeba2d38d6d0d3c7893eafd07c8502a7ecebe94c85fbfcc1bf
+EBUILD sphinx-autodoc-typehints-2.2.3.ebuild 1074 BLAKE2B c22a1519062f4fd3cd5e9fa4e2f9d71ee093fa358ebf6b9e000b243d92251fb366c76099c9e95be13e2e542d4e91a3ea180a9a6293781dab0d5db1b6aa04b537 SHA512 3774856f78cd0f7d64067af2a8409986b3df143eae5010eaa15403434fcd5f4e9ab2029e180dd290b32a3f21de330f962f3617585c1dbc714fae8b247f7bc31d
 MISC metadata.xml 682 BLAKE2B f8b48894f28411a17c73956bb75d43906c893b33d3dc611dfcc46e7a71ac43824aa54f660ab4f49c9870248b2b9ff405a2a3229f92975337e69201868eed3378 SHA512 87a0ea2b2e4cb2b5f0d1593b2c4bd96b46dabb8baae71a6ba18cfd83dedb2a1d5f0ae0f8711144967a5d44015e9ae7ca013dc0aa54e20604633ae062d95649ef
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-2.2.3.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-2.2.3.ebuild
new file mode 100644
index 000000000000..f6053e2167f7
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-2.2.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Type hints support for the Sphinx autodoc extension"
+HOMEPAGE="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/
+	https://pypi.org/project/sphinx-autodoc-typehints/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/sphinx-7.1.2[${PYTHON_USEDEP}]
+"
+# skipping optional test dep on dev-python/nptyping as that package
+# is horribly broken and on its way out
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/sphobjinv-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/typing-extensions-4.5[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# this package is addicted to Internet
+		tests/test_sphinx_autodoc_typehints.py::test_format_annotation
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index e0fd61ba1f7a..f6c8f38ed035 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -5,8 +5,10 @@ DIST sphinx-7.2.6.gh.tar.gz 7067425 BLAKE2B 4da1cb5ccebea4df0dc134c552311d7b70ce
 DIST sphinx-7.3.7.gh.tar.gz 7165383 BLAKE2B bcc68f26937e6aefe60cedea533a5c8e245c76b59ab4913fb6516f285e3afc32be60b336c662ac8305fb88e82fcc2b477128f2d8b9bf92f037b124f4c855df2a SHA512 540553ecddc55b3e673c79bc776a899d2c660f1e93ef819711be52174accf5b70465883a46bed81d163534e56718caf0765b4bae153e9307a3792387d8228df5
 DIST sphinx-7.4.0.gh.tar.gz 8186356 BLAKE2B 968d2bc887c6326c44c741cfdfeb67bb303c718d4283d8149b1ab7bafa84ef7f3ef5ff3fd72b82a207846e91bda3fff72ed6c8953c1bcf8482bc79b992f636f3 SHA512 fea84f86e414bba741537f4db68a1f0e0922f8fe6eea5e0eefac4a76bfb30d5eb97eb5590404c7e427b03c57b589844ebba8ef5f3f6d786ca91bb2dbbc704d8f
 DIST sphinx-7.4.4.gh.tar.gz 8184232 BLAKE2B cf75b1dc39d194293845a621c12246fd78249541634dc5edee6ed6da15285ab763223729a63ef2c375215a394c12e189333d248b7f047195b66d8e7c6706ed18 SHA512 4f2ef5f0c4270517a12b9dc169903ece7ec809687c14961522c37a5ea829d1624ee45926a5fe48fefce77ac73b5dc4035e2452b2b6c4bbdf14c06e9201596f66
+DIST sphinx-7.4.5.gh.tar.gz 8187162 BLAKE2B 95aa15db43abfb9671c3d7a3094525afb4f3a56eda6ef6c81a2e669b3d6512ff8a5e7c0c6f29614abe06316fbea1fef34f8b6884ed04c1e060e043f04950748c SHA512 649d8776561fe0fc3452302cafe01cca66680db19ab5283d34656023ab78f9803d3cd33156aeb00c8d5d205f78afbc75d0d676a44ace52a86e51200afd14fb3a
 EBUILD sphinx-7.2.6.ebuild 4353 BLAKE2B 4e6f4767fd2b2f7de9174a745fc40c926af6acd89f62423bfa284721601a95c95694472e7b77be2a029860625821b33f11049c151cfd5c04e23a85c06a7def40 SHA512 73efc9db67471cc131fcaec408545dfdea8a04122efa57878062964d2b887fc2e8c6f5cca0d34ee321feaf9d1a77e72cd2ff4db8c0a5d7d2318fd7012d7865ab
 EBUILD sphinx-7.3.7-r2.ebuild 5310 BLAKE2B 128efb1a41ce24b53330a72259e3c77077e10da299fd8603b17dd9713706459bab6850f2ab33f6dbd334ee8391a72f85438cf2576be1d36964ddaaac3dfe2b06 SHA512 b8ba39628d84b873f503eeb35f8195e0e133ebcc8416cab007ec737b1c57967106504d01bc04ab412a66bebde0c68a0f5e7d92c4b9469147a4ad66ac130fa86e
 EBUILD sphinx-7.4.0.ebuild 5189 BLAKE2B f1e0bae36d2ecfd4d53cfc21252b01586cef38d61467c1e2df9c8e6439178ff6266d05ef06c5ffd40f2c6d9fb15f62143fa5a17bff9318883dc3175fb97c2635 SHA512 16a168d9340475a7ba36b5c961ea863e00153ae6df42626e17d71c74808c8db3cc7ee2813b4b1127d8308a6e61cc6d252706e131c62c1fb2c325d074a34644d5
 EBUILD sphinx-7.4.4.ebuild 5189 BLAKE2B f1e0bae36d2ecfd4d53cfc21252b01586cef38d61467c1e2df9c8e6439178ff6266d05ef06c5ffd40f2c6d9fb15f62143fa5a17bff9318883dc3175fb97c2635 SHA512 16a168d9340475a7ba36b5c961ea863e00153ae6df42626e17d71c74808c8db3cc7ee2813b4b1127d8308a6e61cc6d252706e131c62c1fb2c325d074a34644d5
+EBUILD sphinx-7.4.5.ebuild 5189 BLAKE2B f1e0bae36d2ecfd4d53cfc21252b01586cef38d61467c1e2df9c8e6439178ff6266d05ef06c5ffd40f2c6d9fb15f62143fa5a17bff9318883dc3175fb97c2635 SHA512 16a168d9340475a7ba36b5c961ea863e00153ae6df42626e17d71c74808c8db3cc7ee2813b4b1127d8308a6e61cc6d252706e131c62c1fb2c325d074a34644d5
 MISC metadata.xml 568 BLAKE2B ddb7175070df6da4088813cc6b66f25bb4364e2619b1e7da94370f7ce8e73b68b12f618412f81e6be57fcb0c60c10e3913f26a6a578b0f9defa7b9ee8091fcde SHA512 d32b37cbe88f5e3db0c6968bc7aa22c7edfb3794bf7c62facd17e7ae1f4f0fbfc7c9f5512230cce16ed32e2ebb70c23dfe9b36ce38785c5f5b76585410313214
diff --git a/dev-python/sphinx/sphinx-7.4.5.ebuild b/dev-python/sphinx/sphinx-7.4.5.ebuild
new file mode 100644
index 000000000000..457f27a037c2
--- /dev/null
+++ b/dev-python/sphinx/sphinx-7.4.5.ebuild
@@ -0,0 +1,141 @@
+# 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 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="
+	https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx/
+	https://pypi.org/project/Sphinx/
+"
+SRC_URI="
+	https://github.com/sphinx-doc/sphinx/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc latex"
+
+RDEPEND="
+	>=dev-python/alabaster-0.7.14[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.13[${PYTHON_USEDEP}]
+	<dev-python/docutils-0.22[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.20[${PYTHON_USEDEP}]
+	>=dev-python/imagesize-1.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-23.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.14[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.30.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-2.2[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-serializinghtml-1.1.9[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2[${PYTHON_USEDEP}]
+	' 3.10)
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		app-text/dvipng
+		>=dev-python/cython-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-67.0[${PYTHON_USEDEP}]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		virtual/imagemagick-tools[jpeg,png,svg]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
+	#"${FILESDIR}/sphinx-4.3.2-doc-link.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# we can't use distutils_enable_sphinx because it would
+	# introduce a dep on itself
+	use doc && build_sphinx doc
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local EPYTEST_DESELECT=(
+		# less interesting failures
+		tests/test_builders/test_build_latex.py::test_build_latex_doc
+		tests/test_extensions/test_ext_math.py::test_imgmath_png
+		tests/test_extensions/test_ext_math.py::test_imgmath_numfig_html
+	)
+	case ${EPYTHON} in
+		python3.13)
+			EPYTEST_DESELECT+=(
+				tests/test_extensions/test_ext_autodoc.py::test_autodoc_special_members
+				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_typehints_format_fully_qualified
+				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_typehints_none
+				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+			)
+			;;
+		pypy3)
+			EPYTEST_DESELECT+=(
+				tests/test_extensions/test_ext_autodoc.py::test_autodoc_exception
+				tests/test_extensions/test_ext_autodoc.py::test_autodoc_ignore_module_all
+				tests/test_extensions/test_ext_autodoc.py::test_autodoc_inherited_members_None
+				tests/test_extensions/test_ext_autodoc.py::test_autodoc_subclass_of_builtin_class
+				tests/test_extensions/test_ext_autodoc.py::test_automethod_for_builtin
+				tests/test_extensions/test_ext_autodoc.py::test_cython
+				tests/test_extensions/test_ext_autodoc.py::test_format_signature
+				tests/test_extensions/test_ext_autodoc.py::test_partialfunction
+				tests/test_extensions/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
+				tests/test_extensions/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
+				tests/test_extensions/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+				tests/test_extensions/test_ext_autodoc_autofunction.py::test_builtin_function
+				tests/test_extensions/test_ext_autodoc_autofunction.py::test_methoddescriptor
+				tests/test_extensions/test_ext_autodoc_automodule.py::test_automodule_inherited_members
+				tests/test_extensions/test_ext_autodoc_preserve_defaults.py::test_preserve_defaults_special_constructs
+				tests/test_extensions/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+				tests/test_extensions/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+				tests/test_util/test_util_inspect.py::test_isattributedescriptor
+				tests/test_util/test_util_inspect.py::test_signature
+				tests/test_util/test_util_typing.py::test_is_invalid_builtin_class
+			)
+			;;
+	esac
+
+	# note: pytest-xdist causes random test failures
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/sqlglot/Manifest b/dev-python/sqlglot/Manifest
index 1eb570e25a97..0741c81af9d1 100644
--- a/dev-python/sqlglot/Manifest
+++ b/dev-python/sqlglot/Manifest
@@ -19,10 +19,8 @@ DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d7
 DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 DIST smallvec-1.11.2.crate 34801 BLAKE2B 58645e99db8f02db64d02c75860c7ea41836c427c03ee3b0b23365e73a406e4fd6ac312bf13fc5faef8bb6111c10fcfd5f839d5b3686e9b34d1626f8469fc327 SHA512 5cfb427c3b99b0dbd71f6154ed899abcde9d7d2992977ac7b2ef3a4c3ff51e4efafd133071a69609b4ed6cb269bdc26b79eb72e1988f10dfcaef8185d950cd1d
-DIST sqlglot-25.4.0.tar.gz 18986774 BLAKE2B 0d47dfd72aa404bdce6ce716ebac4d9a0af012807142af0015649825818e8d45d3e451913defec4563b953e33b0888782ee3644c0c24f3d775bb008a3ecb1ea9 SHA512 fe5346c8675b8b21a60359941501854c2861f9ceb3f4ae9e2fc23eb395935051c757dddbe72b101fb3781923cb4f89c4838facc96fe0e0419ceadf705320f77b
-DIST sqlglot-25.4.1.tar.gz 19001867 BLAKE2B 3b24a44859dd0ab873caa6c13944f0da80baf5ea63a39949111dbc8ca8862c51bd9b1e9a449959e32a6dec8a959478f3a8820ddaa8b57d584fe6a8730b8cbb50 SHA512 e3f0a77325cb6b328f365a3c8287c5cef898cf7cbb80531ac396514889c6b49f8f7c11d0c585956c8e140ee4c8a44ebeceb6bf2827959aa51f6377320c11b5b1
-DIST sqlglot-25.5.0.tar.gz 19004386 BLAKE2B 4ff8aad3e10e9edb3db83f4b7e8025f84fb66ab24f050d21e95534e8ed349fa05ea160c5ca19d13350733dab0ecc317b4b21a68738ff0c43e814fe4f219dfe82 SHA512 03de9e1f10ac35ccac66fbac28fabbd953ed9d424e587d9c3eeb294626258ca44ecd78c8080202885324ade06f662d25b3a1ccc3812a64d40b40bae57e81c1d1
 DIST sqlglot-25.5.1.tar.gz 19034839 BLAKE2B 5af6d4d9893f70831729ff1107ac2159e42a099ab6896e7a004a9337d95ab4f63500fceacbbe3e329908787345420e1ed95fddeb672e2c65045526025dfca390 SHA512 e2f3ad495d77810211368bf172af8351d52102462bd7c568915e9eeddced60d46627a6f443b28fb58e1aa48d2d647a6425f5262c4eaec2433ec9e3fc81fbaa2e
+DIST sqlglot-25.6.0.tar.gz 19040214 BLAKE2B a471b18f4b815265682b22ab0f1640157e895650251ec3d5598047163f6efd73601a3c33c2ba8fbe53d5452e4c2bec293ec8e5c7fedf7b743f359d104b2e9526 SHA512 f7a565878d867eb7e46a7528d0ad69a26711e0a0eeabd88e11bd389b96d511de9cf56129dce4f336a0d278629be7806282e465b25df20d594f44d92b76b6dc9f
 DIST syn-2.0.41.crate 246016 BLAKE2B 9d389f2e2a0acb4c84c309456e8ffcc88c5d4d541535ed136832d7a6054dde45a598bb68e8a6f3062ca2a96e1ceae947d54b3aec9bad65b0c51d6733aa6c80db SHA512 6bbaf69ca783025dfb81ac3612ac60bfbed31b2d87792909b35c12892dadebdaff2ddf9463105e536b671dce5870610ab90fe29471284bbd3014dca8d6993f1a
 DIST target-lexicon-0.12.12.crate 25156 BLAKE2B f3803596c75f6c89438592a1176c3748fc2c0524d7d50a20056de1cd26d40c572b05bafcdf6dd702752864bea37c8b4f28f96dadc12a5b3bb1d279b25e489f85 SHA512 6147295c43ba1b7b087a3c5ab51534b2985e4e77e5e15687978cfb9d07e21c4fd9bc7191576d6cabd268d08a44dc733c4a957e59dba8b948c2055d8bb433aeca
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
@@ -35,8 +33,6 @@ DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1d
 DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74
 DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
-EBUILD sqlglot-25.4.0.ebuild 2602 BLAKE2B 2ebe12c252293a3ff60948e560fb6a49f93e202003fd3a94870eb874cf6be356807cdd62413bc26ae2f01757b913a396d988a856f938d5685162b639fa3ab8f9 SHA512 5386d1a924752114b0c24079e25bc6b4da42b65aacea2e7f8dccce8acb460940dbdc10238ed3e205d76c3ffc4fe5ec69bec0c1d4109f63bc220c89b02ae3e3b2
-EBUILD sqlglot-25.4.1.ebuild 2602 BLAKE2B 2ebe12c252293a3ff60948e560fb6a49f93e202003fd3a94870eb874cf6be356807cdd62413bc26ae2f01757b913a396d988a856f938d5685162b639fa3ab8f9 SHA512 5386d1a924752114b0c24079e25bc6b4da42b65aacea2e7f8dccce8acb460940dbdc10238ed3e205d76c3ffc4fe5ec69bec0c1d4109f63bc220c89b02ae3e3b2
-EBUILD sqlglot-25.5.0.ebuild 2602 BLAKE2B 2ebe12c252293a3ff60948e560fb6a49f93e202003fd3a94870eb874cf6be356807cdd62413bc26ae2f01757b913a396d988a856f938d5685162b639fa3ab8f9 SHA512 5386d1a924752114b0c24079e25bc6b4da42b65aacea2e7f8dccce8acb460940dbdc10238ed3e205d76c3ffc4fe5ec69bec0c1d4109f63bc220c89b02ae3e3b2
 EBUILD sqlglot-25.5.1.ebuild 2602 BLAKE2B 2ebe12c252293a3ff60948e560fb6a49f93e202003fd3a94870eb874cf6be356807cdd62413bc26ae2f01757b913a396d988a856f938d5685162b639fa3ab8f9 SHA512 5386d1a924752114b0c24079e25bc6b4da42b65aacea2e7f8dccce8acb460940dbdc10238ed3e205d76c3ffc4fe5ec69bec0c1d4109f63bc220c89b02ae3e3b2
+EBUILD sqlglot-25.6.0.ebuild 2602 BLAKE2B 2ebe12c252293a3ff60948e560fb6a49f93e202003fd3a94870eb874cf6be356807cdd62413bc26ae2f01757b913a396d988a856f938d5685162b639fa3ab8f9 SHA512 5386d1a924752114b0c24079e25bc6b4da42b65aacea2e7f8dccce8acb460940dbdc10238ed3e205d76c3ffc4fe5ec69bec0c1d4109f63bc220c89b02ae3e3b2
 MISC metadata.xml 611 BLAKE2B 10bf684677182565c9932d51ed9b3b9c80d376d6db945bd7b0dd0d9a19a85dc0d10cb169ff2048ae5f7f73d0f438d259b6231c13c525b5374ec99377f4ffdd10 SHA512 2b26d0f77962807052b94ad78addcfdce9859042af3be34df267dc6e70b6231dd779563935fd21955cd8646fd0cce3fee8c939387ac8056194a0b777743dd2ae
diff --git a/dev-python/sqlglot/sqlglot-25.4.1.ebuild b/dev-python/sqlglot/sqlglot-25.4.1.ebuild
deleted file mode 100644
index 3ecfcc322a3e..000000000000
--- a/dev-python/sqlglot/sqlglot-25.4.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 2023-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..13} )
-
-CARGO_OPTIONAL=1
-CRATES="
-	autocfg@1.1.0
-	bitflags@1.3.2
-	cfg-if@1.0.0
-	heck@0.4.1
-	indoc@2.0.4
-	libc@0.2.150
-	lock_api@0.4.11
-	memoffset@0.9.0
-	once_cell@1.19.0
-	parking_lot@0.12.1
-	parking_lot_core@0.9.9
-	proc-macro2@1.0.70
-	pyo3-build-config@0.20.0
-	pyo3-ffi@0.20.0
-	pyo3-macros-backend@0.20.0
-	pyo3-macros@0.20.0
-	pyo3@0.20.0
-	quote@1.0.33
-	redox_syscall@0.4.1
-	scopeguard@1.2.0
-	smallvec@1.11.2
-	syn@2.0.41
-	target-lexicon@0.12.12
-	unicode-ident@1.0.12
-	unindent@0.2.3
-	windows-targets@0.48.5
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_msvc@0.48.5
-	windows_i686_gnu@0.48.5
-	windows_i686_msvc@0.48.5
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_msvc@0.48.5
-"
-
-inherit cargo distutils-r1 pypi optfeature
-
-DESCRIPTION="An easily customizable SQL parser and transpiler"
-HOMEPAGE="
-	https://sqlglot.com/
-	https://github.com/tobymao/sqlglot/
-	https://pypi.org/project/sqlglot/
-"
-SRC_URI+="
-	native-extensions? (
-		${CARGO_CRATE_URIS}
-	)
-"
-
-LICENSE="MIT"
-LICENSE+=" native-extensions? ("
-# Dependent crate licenses
-LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016"
-LICENSE+=" )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+native-extensions"
-
-BDEPEND="
-	native-extensions? (
-		${RUST_DEPEND}
-		dev-util/maturin[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/sqlglotrs/sqlglotrs.*.so"
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-src_prepare() {
-	# remove fragile timing check
-	sed -i -e '/assertLessEqual(time\.time/d' tests/test_parser.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	if use native-extensions; then
-		local DISTUTILS_USE_PEP517=maturin
-		cd sqlglotrs || die
-		distutils-r1_python_compile
-		cd - >/dev/null || die
-	fi
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Tests require pyspark or duckdb which aren't in the tree.
-		# Pandas would be a requirement normally, but it gets ignored by proxy.
-		"tests/dataframe/integration/test_dataframe.py"
-		"tests/dataframe/integration/test_grouped_data.py"
-		"tests/dataframe/integration/test_session.py"
-		"tests/test_executor.py"
-		"tests/test_optimizer.py"
-	)
-
-	# make sure not to use an earlier installed version
-	local -x SQLGLOTRS_TOKENIZER=$(usex native-extensions 1 0)
-	rm -rf sqlglotrs || die
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "simplifying timedelta expressions" dev-python/python-dateutil
-}
diff --git a/dev-python/sqlglot/sqlglot-25.5.0.ebuild b/dev-python/sqlglot/sqlglot-25.5.0.ebuild
deleted file mode 100644
index 3ecfcc322a3e..000000000000
--- a/dev-python/sqlglot/sqlglot-25.5.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 2023-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..13} )
-
-CARGO_OPTIONAL=1
-CRATES="
-	autocfg@1.1.0
-	bitflags@1.3.2
-	cfg-if@1.0.0
-	heck@0.4.1
-	indoc@2.0.4
-	libc@0.2.150
-	lock_api@0.4.11
-	memoffset@0.9.0
-	once_cell@1.19.0
-	parking_lot@0.12.1
-	parking_lot_core@0.9.9
-	proc-macro2@1.0.70
-	pyo3-build-config@0.20.0
-	pyo3-ffi@0.20.0
-	pyo3-macros-backend@0.20.0
-	pyo3-macros@0.20.0
-	pyo3@0.20.0
-	quote@1.0.33
-	redox_syscall@0.4.1
-	scopeguard@1.2.0
-	smallvec@1.11.2
-	syn@2.0.41
-	target-lexicon@0.12.12
-	unicode-ident@1.0.12
-	unindent@0.2.3
-	windows-targets@0.48.5
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_msvc@0.48.5
-	windows_i686_gnu@0.48.5
-	windows_i686_msvc@0.48.5
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_msvc@0.48.5
-"
-
-inherit cargo distutils-r1 pypi optfeature
-
-DESCRIPTION="An easily customizable SQL parser and transpiler"
-HOMEPAGE="
-	https://sqlglot.com/
-	https://github.com/tobymao/sqlglot/
-	https://pypi.org/project/sqlglot/
-"
-SRC_URI+="
-	native-extensions? (
-		${CARGO_CRATE_URIS}
-	)
-"
-
-LICENSE="MIT"
-LICENSE+=" native-extensions? ("
-# Dependent crate licenses
-LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016"
-LICENSE+=" )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+native-extensions"
-
-BDEPEND="
-	native-extensions? (
-		${RUST_DEPEND}
-		dev-util/maturin[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/sqlglotrs/sqlglotrs.*.so"
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-src_prepare() {
-	# remove fragile timing check
-	sed -i -e '/assertLessEqual(time\.time/d' tests/test_parser.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	if use native-extensions; then
-		local DISTUTILS_USE_PEP517=maturin
-		cd sqlglotrs || die
-		distutils-r1_python_compile
-		cd - >/dev/null || die
-	fi
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Tests require pyspark or duckdb which aren't in the tree.
-		# Pandas would be a requirement normally, but it gets ignored by proxy.
-		"tests/dataframe/integration/test_dataframe.py"
-		"tests/dataframe/integration/test_grouped_data.py"
-		"tests/dataframe/integration/test_session.py"
-		"tests/test_executor.py"
-		"tests/test_optimizer.py"
-	)
-
-	# make sure not to use an earlier installed version
-	local -x SQLGLOTRS_TOKENIZER=$(usex native-extensions 1 0)
-	rm -rf sqlglotrs || die
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "simplifying timedelta expressions" dev-python/python-dateutil
-}
diff --git a/dev-python/sqlglot/sqlglot-25.4.0.ebuild b/dev-python/sqlglot/sqlglot-25.6.0.ebuild
index 3ecfcc322a3e..3ecfcc322a3e 100644
--- a/dev-python/sqlglot/sqlglot-25.4.0.ebuild
+++ b/dev-python/sqlglot/sqlglot-25.6.0.ebuild
diff --git a/dev-python/structlog/Manifest b/dev-python/structlog/Manifest
index e324c837111f..6e0df5b06503 100644
--- a/dev-python/structlog/Manifest
+++ b/dev-python/structlog/Manifest
@@ -1,3 +1,5 @@
 DIST structlog-24.2.0.tar.gz 1346958 BLAKE2B d47e78ec3c55048460a32a860ac2e5ebed9e49f546277e562104fec66e73e25702b61c2b8a250a9729c0c774e7c0c1492733957a9a551328267533187e63972e SHA512 df470f292bbf1de6a4a509f034c3bccb87e21afc31cf31a0ef998485a4b69e5bf6ec46d90236d556c876aa96e5a3dcb323d0bfe9bd8ac63a47b527a747af73c8
+DIST structlog-24.4.0.tar.gz 1348634 BLAKE2B 29b35ad7471e6e681c86363880397869b5a149ff06bd1e5c68c7587ff2da6663ded7d278788b77fbc6d945cadda89073dbb3f43fbd4b0e21a71380a6d361593a SHA512 0dedb73caa9cd8f288267f129b9b61ae7db542fec1c92a38d785e1606d56a1272fb9fb5dd23c04a8fd0ce0a3c41f430d51230475bde4eab1919998187fbe680b
 EBUILD structlog-24.2.0.ebuild 749 BLAKE2B 4e5d4b7d06e1eb80f02902c9bb6954c54c7629a3a3453c43dcc275e49d20938767ca9abd4e003a232f4fdeffcc4afc5157f3e8de2bcbf7c6dfe618a73d23afee SHA512 57f9a7dc7b6fb5ae3302d2a0b9e32175b4acee80db89fa45517833094f1e6909a76867ef908c0d0ec0df7fd375bd4443e00fb62d703811e80eb760a79608eb4e
+EBUILD structlog-24.4.0.ebuild 755 BLAKE2B e3d47b4e8ae8795f4258eaf331625112888bcaef9363a7233f99864e2126e88e1902488ae6e0409b4c74d56c65ff92d8e128ad88b04dd355b04a116ef14ddd02 SHA512 3f965c42be7fe56f0d829eebb5d9b6d25f8f77629b3122c4a7d0e575e9d66796800edf13cd4e66cfd299004a59f2ae1eec078d7000efbf53d87afdc6be316669
 MISC metadata.xml 499 BLAKE2B 3fd4b395c6312a21c1db3ad187013d4fafe64725d00fc7e0c1b7db7b1be3cdae014c0688f9bfc867af791cc806d4212d88b7f5f7e8446d32262e1f7d77aa7964 SHA512 87195f8f65e6892029749b08fe428f2d2bad0d261c562caebed9e6052f932d9f73d57227acdc456601bb9ed48f313d9ba8f2581f6d7949a2fd9b7ff3d9f03e57
diff --git a/dev-python/structlog/structlog-24.4.0.ebuild b/dev-python/structlog/structlog-24.4.0.ebuild
new file mode 100644
index 000000000000..a523146cc838
--- /dev/null
+++ b/dev-python/structlog/structlog-24.4.0.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=hatchling
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Structured Logging for Python"
+HOMEPAGE="
+	https://github.com/hynek/structlog/
+	https://pypi.org/project/structlog/
+"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/textdistance/Manifest b/dev-python/textdistance/Manifest
index 339beeb8dffd..ba7579f4304b 100644
--- a/dev-python/textdistance/Manifest
+++ b/dev-python/textdistance/Manifest
@@ -1,3 +1,5 @@
 DIST textdistance-4.6.2.gh.tar.gz 46619 BLAKE2B 0a205bd5615f252f4ab832597b26cd81f3a817fa9544675b947b2ba8a9d8c128ad261a09fb1ee118e0ca807ff7721f3594de5da11f5df59c90c2d9b7110b84ff SHA512 4e5ec7ef76cfd45b05f5813d624d934a6aa90c326b8bc1af50fdde51c4fda141d5aa826e7a145f4cf59f7d7cbcdcf775746eeb197a2adef3c62ad8570d699890
+DIST textdistance-4.6.3.gh.tar.gz 46631 BLAKE2B 9d4c2172934ba14326fe8ecdf7e955cd664196e58d8cc0c58f712525e6ea3aaa267879c09ba5a67ab015f6abd37593af959f02262c5a4a2fa08a859fe38a52b4 SHA512 ad9b8e031a8ae11dd2cd0f8ee8ee42f15e14eccc05910a45b4b5bf2f2048c4895da354832f88957502998b423616a54e64b94a093e4ddb7be2744c19e7f283e9
 EBUILD textdistance-4.6.2.ebuild 691 BLAKE2B 4c67d2fbbe0adc1c02ae5fe505e8573be0e342fe4b6d8e6237715871ff9885dab3367454a94c1a39609adfcfa6636014634d696ea985266e318a7695a30ef0ca SHA512 8e9de580203a53041c2b82fa48cf6efe0cd4003e80c9975fd093538fc65c4d1149468f551da014a8d92f82043a90af37539017af69ab98c7117321ff8f514550
+EBUILD textdistance-4.6.3.ebuild 694 BLAKE2B 3604dff0b26ac6d1d14c442170b1229f2b8bdcf5c36d4b73bf38e8cc2278d5410677f8f1184968a19f992b020480a3081a184892a94b757b7627d45cd8e6c508 SHA512 cd8dac499dfa8a3568d3c16957914b490b35d08eef5ede59141e00b8dcdb4e14f136897c366bce0052a6e841ee5151b401304123c0a15a36e1b90817efa6251b
 MISC metadata.xml 517 BLAKE2B a429684151f5700f148c5350b16026e797fdedc80b950d3c79c050a4d7418763918a05936eaeeed07b9756d9ec39602128570cd8c27049234bbda27e006ff00f SHA512 be445c2c21f5fd0bee241f8f76094b51c2fcbd7fe0d2175f7455beb881c3b83e8070c8a14817695d2b7a7dfabcdb856e12d7749aadc91ca31f7af8187e9a409e
diff --git a/dev-python/textdistance/textdistance-4.6.3.ebuild b/dev-python/textdistance/textdistance-4.6.3.ebuild
new file mode 100644
index 000000000000..cbe654456441
--- /dev/null
+++ b/dev-python/textdistance/textdistance-4.6.3.ebuild
@@ -0,0 +1,36 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Compute distance between the two texts"
+HOMEPAGE="
+	https://github.com/life4/textdistance/
+	https://pypi.org/project/textdistance/
+"
+SRC_URI="
+	https://github.com/life4/textdistance/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	tests/test_external.py
+)
diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest
index 80ae847cf308..39eb56cd8bdf 100644
--- a/dev-python/uv/Manifest
+++ b/dev-python/uv/Manifest
@@ -7,6 +7,8 @@ DIST uv-0.2.23-crates.tar.xz 63724280 BLAKE2B 32f66ef8a6580d1dd0b7369656784c40da
 DIST uv-0.2.23.gh.tar.gz 1314282 BLAKE2B 0d662a513b77a4da73945c3eedfa381cd65ad615975b22790ccde2eb467b356a70eacff20a15d37fff6f7b41b155824b0fda9f715d3a45f02c37c5f992f6fe0b SHA512 6b0c8f65e51dc8bf0654976b8866cb225784d91f44af935b243507a404ac4f297697ea22df29da43038eb335938be04e42fda39cbb292fe02715841c9f818380
 DIST uv-0.2.25-crates.tar.xz 63731168 BLAKE2B 5693f7db28756e74ad619f1ed0ad9f1c7a14b385da65b71abd0989ef8cce3f961d5e6edb9b8318a495b76ba8352ef0c6b557bbdec2741ff35073b407756cbd90 SHA512 40813d91c90b949f0666f4734717abc6430be293c3fe7336ed907e75a809fc51fc79d520d308fc8d8ddb8f11251137f9219b755b5e3711bf3b9f55fcecac10c0
 DIST uv-0.2.25.gh.tar.gz 1377235 BLAKE2B c8c3a68b16c82d51de31700973e52e6745c26a5349696065e9b140f2304ca5cfc30e8a0922178c4630ed6a4823141a82bf0cd8a6631b1a4de1e77a733b70251a SHA512 c78a4bf66ac1140767d0fb7af35ba3f3cd044d04447862a9374b9491742a627e7a27df04689ee64f9dcb6445619a419022e0ae0da4a0fdedf531db9f902583e0
+DIST uv-0.2.26.gh.tar.gz 1401835 BLAKE2B 24d4fdb7f332635293235602ba117167432aa9d9ca196dc835b444a55f0c16fa19aaefb883282c08299aedce1e586dfd8d1f90a889c7ff0c907c366c9391865a SHA512 a630c4c7e8e306336f49d16eebe0bbb20ccbcb0401c495b2c3ab273d04df736737167ad6d368193f39d4bc7ad0e7475cb0e42d81fd2c420fd4f8ef000b820002
 EBUILD uv-0.2.23.ebuild 2732 BLAKE2B 04a2e7cc7e8cddcee20be38d133ccd2facc7f1f994f84e09157f9499306374e044c89abe8f98c720bed16ac40f15ef5e5d6a65c2d3c4a7962c2dd3afaabdf9ff SHA512 34cf34422fb6180d10e4d977c398dcc437e270783ed2115689bcb9c5f9fb04e8d15b3f880cad92041da1bcfe2549cca3174c6de66ccadc7b8d25b99b5234ac3f
 EBUILD uv-0.2.25.ebuild 2753 BLAKE2B 628824cde80b966bfcb5cdf05189addfec329b6bbee50030f8c27acce1863cc764d067a9fb4362e9494765a36616b0500a9a246168f89a41b03a121c74f2fa77 SHA512 e49892970a12eb115b2e35c559dfcb3e76422399a0ed22f67ee018458dda7535e2b692c5204ebbcd20895774abcb8b4376d7a74b50f1f5999b83279cde63eb4e
+EBUILD uv-0.2.26.ebuild 2754 BLAKE2B 26ee5e8052e740a3cb973b8e0a1f4bc6b41d216e520e21c93510a1b36b47f830b3a15a578bc1e14cdd0124da3c499b1db588471333bdee7e85ec092a405f95f9 SHA512 36b80a5fee6c7f092365c71c15b32b58db31acb9c853f227849fab8e4713acb43ae4d219a6f58024f122830f836ddf4933b8a4ec486f6a7680d42e4f0ef46759
 MISC metadata.xml 336 BLAKE2B 4b5933e24e3e9450dde5da099185dcdf3afb5916b55cffa7c2f3f6fac77e439197cbe4ba529a87f83442d8f87d238e8abef06dc052ce9a62659060ffea9fdb47 SHA512 9910fd10ebbc395b9c330774b74798c9ffdba3bb368347658380a22e01d6dc9d1961ea50fbfb4a904c9db84b94c713c054e418a7294425b86ff41a607fd3e310
diff --git a/dev-python/uv/uv-0.2.26.ebuild b/dev-python/uv/uv-0.2.26.ebuild
new file mode 100644
index 000000000000..735538f84a08
--- /dev/null
+++ b/dev-python/uv/uv-0.2.26.ebuild
@@ -0,0 +1,109 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+"
+
+declare -A GIT_CRATES=(
+	[async_zip]='https://github.com/charliermarsh/rs-async-zip;1dcb40cfe1bf5325a6fd4bfcf9894db40241f585;rs-async-zip-%commit%'
+	[pubgrub]='https://github.com/astral-sh/pubgrub;3f0ba760951ab0deeac874b98bb18fc90103fcf7;pubgrub-%commit%'
+	[reqwest-middleware]='https://github.com/astral-sh/reqwest-middleware;21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe;reqwest-middleware-%commit%/reqwest-middleware'
+	[reqwest-retry]='https://github.com/astral-sh/reqwest-middleware;21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe;reqwest-middleware-%commit%/reqwest-retry'
+)
+
+inherit cargo check-reqs
+
+CRATE_PV=0.2.25
+DESCRIPTION="A Python package installer and resolver, written in Rust"
+HOMEPAGE="
+	https://github.com/astral-sh/uv/
+	https://pypi.org/project/uv/
+"
+# pypi sdist misses scripts/, needed for tests
+SRC_URI="
+	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	SRC_URI+="
+		https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-crates.tar.xz
+	"
+fi
+
+# most of the code
+LICENSE="|| ( Apache-2.0 MIT )"
+# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
+# Dependent crate licenses
+LICENSE+="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
+	MPL-2.0 Unicode-DFS-2016
+"
+# ring crate
+LICENSE+=" openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+BDEPEND="
+	>=virtual/rust-1.77
+	test? (
+		dev-lang/python:3.8
+		dev-lang/python:3.9
+		dev-lang/python:3.10
+		dev-lang/python:3.11
+		dev-lang/python:3.12
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+check_space() {
+	local CHECKREQS_DISK_BUILD=3G
+	use debug && CHECKREQS_DISK_BUILD=9G
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+}
+
+src_prepare() {
+	default
+
+	# remove patch.* that breaks GIT_CRATES
+	sed -i -e "/^\[patch/,\$s@^\(reqwest-middleware = \).*@\1 { path = \"${WORKDIR}/reqwest-middleware-21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe/reqwest-middleware\" }@" Cargo.toml || die
+
+	# https://github.com/vorot93/tokio-tar/pull/23
+	# (fortunately uv already depends on portable-atomic, so we don't
+	# have to fight Cargo.lock)
+	cd "${ECARGO_VENDOR}/tokio-tar-0.3.1" || die
+	eapply "${FILESDIR}/tokio-tar-0.3.1-ppc.patch"
+}
+
+src_compile() {
+	cd crates/uv || die
+	cargo_src_compile
+}
+
+src_test() {
+	# work around https://github.com/astral-sh/uv/issues/4376
+	local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH}
+	local -x COLUMNS=100
+
+	cd crates/uv || die
+	cargo_src_test --no-fail-fast
+}
+
+src_install() {
+	cd crates/uv || die
+	cargo_src_install
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 93f81b36a80f..4e75b7b516d5 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/acts_as_list/Manifest b/dev-ruby/acts_as_list/Manifest
index 6a7feaae9cdb..910b21df9e25 100644
--- a/dev-ruby/acts_as_list/Manifest
+++ b/dev-ruby/acts_as_list/Manifest
@@ -1,7 +1,9 @@
 DIST acts_as_list-1.1.0.gem 41984 BLAKE2B abeb0325795276294451b4cb86e20dab6871003c72679ce28f9326cd844234ad56457a03d9b9ecd81b8c143deeefc25dd15df88a38ebdd1324a953b2399465e7 SHA512 bdcaf07bc4ad3854d68c8d95e666e86c2500474ffa212c315b6b4abd321341ac782c0e301f2c859c12b80ecfdd1cc743ccf8a7bdbdb36e30fafcd98d4928a00a
 DIST acts_as_list-1.2.0.gem 41984 BLAKE2B 98652e8b974501a499fb06f73807adfca411912f7b6e705ca91f654b814c61d419018af068ea4977abae55b6ebcea7d2dd7c48a2b107f0d31f1027799875978a SHA512 16e5b5549db7884077b3fe3131b1f91f3b857a083ab80b9b1c19a59b25740b53b032081743f222850fd06cc5892164e0c06cc0c63ae35cf646920f5e7d87292d
 DIST acts_as_list-1.2.1.gem 42496 BLAKE2B ba7d009db1a0cabaea360401df3dbaddbae4d94cf4f9be2d6f9001c1be720d17a5ec7556723878923e85ad9acd231af8c5014f393aff0744bae0c110b01101a6 SHA512 095d402c49f855cd1274e3ca3afdcbdd4e4d747c7bf2d0a010257c14de8751a13da889273acf9fa134c7da12d7bb92474377c8f6082bc7b9fa919c67d992bebc
+DIST acts_as_list-1.2.2.tar.gz 38316 BLAKE2B 8fca217bab42ec45f8860323347e0d5282c99b494588f84f623cbb395bbf1cbeaa8cd8c7fd5344a7c1900a65a3a5f263ffd11fc340e2a0533dc8cbddc297d2a8 SHA512 1e985593b849cb4da5749bce72d09354454b06e40eeefbba161b0e8ceeccf08702761793692213bce013848151de373f0407d7794e7d1745e60646070e4946d7
 EBUILD acts_as_list-1.1.0.ebuild 904 BLAKE2B 78a9fd1533080ecdeffa18579fbf9e7ba3ccff01ea7277a3f23fe24c7b64b7159830e8d1b10865e769f67eaac95d1de9efd833fa9e648f9afc9486f62b2848ed SHA512 492761a0a0204a1406c7005c8fadf10bbb36fc0fe159b4f4e91bebb0eda16f5d17c701fc2e35441c92a8da745682b3ae4408d377e535a298ef0208389e1db6f9
 EBUILD acts_as_list-1.2.0.ebuild 1000 BLAKE2B 3e6d04f6b4b6bb1d9269294fa3bc0af180b8304cdc619dedd31e3ccf8fe7ea51c045f242263b48c64fba2d5e42cc38924d5b84970ffdacb7e2124139d8f6100d SHA512 82479f9b8dd2656da0a1821af66eca003efb685300f33f5f0eaeb0e53803643dab5c1e0a9fcbc2a90e1631532d80625e3fcf19641b906679ea292a466a631667
 EBUILD acts_as_list-1.2.1.ebuild 1000 BLAKE2B 3e6d04f6b4b6bb1d9269294fa3bc0af180b8304cdc619dedd31e3ccf8fe7ea51c045f242263b48c64fba2d5e42cc38924d5b84970ffdacb7e2124139d8f6100d SHA512 82479f9b8dd2656da0a1821af66eca003efb685300f33f5f0eaeb0e53803643dab5c1e0a9fcbc2a90e1631532d80625e3fcf19641b906679ea292a466a631667
+EBUILD acts_as_list-1.2.2.ebuild 1256 BLAKE2B f6b20ecf5854159605b5d324c927524e777f19ad5b721f7c7230e75b8b877b9406254571cbefb15c603eb346c37ae82b4e38cefd6c0286ccd61eb9b6131d2f5f SHA512 f553ccb674ce62c8ce0859f6b5ef9e55f7941d5dc8c8956539035a6bdb8e66d320f11d840a5610a41c5ae6066029f9b2c95fe996e886a6a60f1e1bf679749d04
 MISC metadata.xml 347 BLAKE2B 2d2ba105cf2f5b444977deadbfe99bc236c4a5a2ee227ebc72215161b9cd9dc0decb036f71205ced7560adffcb55c7bba220163d4a24b6113f8e54241615d7d3 SHA512 64a245beb42b2c7e87ba21faa689a45ea32b2222f675b0b3e72cf666bec981a74d62e60cd1090a304309bbc6d516cc4170b70dd71137bf0fa4b0e59211d60665
diff --git a/dev-ruby/acts_as_list/acts_as_list-1.2.2.ebuild b/dev-ruby/acts_as_list/acts_as_list-1.2.2.ebuild
new file mode 100644
index 000000000000..e31722ad807a
--- /dev/null
+++ b/dev-ruby/acts_as_list/acts_as_list-1.2.2.ebuild
@@ -0,0 +1,47 @@
+# 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
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+DESCRIPTION="Capabilities for sorting and reordering a number of objects in a list"
+HOMEPAGE="https://github.com/brendon/acts_as_list"
+SRC_URI="https://github.com/brendon/acts_as_list/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/activerecord-6.1:* >=dev-ruby/activesupport-6.1:*"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/minitest-hooks-1.5.1:1
+		>=dev-ruby/mocha-2.1.0:2
+		dev-ruby/test-unit:2
+		>=dev-ruby/timecop-0.9.8
+		dev-ruby/activerecord[sqlite]
+	)"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/bundler/,/^end/ s:^:#:' test/helper.rb || die
+	sed -e 's/git ls-files -z/find lib CHANGELOG.md README.md init.rb -print0/' \
+		-e '/executables/ s:^:#:' \
+		-e 's/__dir__/"."/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/github_changelog/,$ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	DB=sqlite each_fakegem_test
+}
diff --git a/dev-ruby/elastic-transport/Manifest b/dev-ruby/elastic-transport/Manifest
index ed2ba6c69cf2..687f2f6c7d44 100644
--- a/dev-ruby/elastic-transport/Manifest
+++ b/dev-ruby/elastic-transport/Manifest
@@ -1,13 +1,11 @@
-DIST elastic-transport-8.2.2.tar.gz 55336 BLAKE2B e68c5280c706cbef9b72681c8f2e1ba1847460f6d3f04a35c4faa05a000f236fbbf19a70d129e3d0a31937626d11c7fc077046d6b843d2c3e15c908ef32e9e18 SHA512 34d52bc39f51fe5011e389de6fadaa943a11d0216198976ef06768222eb34583d0ae50d250edc3253e0956eb68e58c507e7f2598535f807425fbd8224caa1154
-DIST elastic-transport-8.2.3.tar.gz 55339 BLAKE2B 648bef27a8fb55c9d617429f8c9921963b8c79c4ed4ca47652f8ab351178b472a63b7ff3b7e3736281a2c31f26433a159acae7704d745ecda118730f091bbd47 SHA512 a35538fc9dbea9262418b34bb91cb2b48b7729536e160b2c30a0ecb2c65d81b7c749015c4254e55950687d30ba6996ad618ed3d11e975eb6a7a32c284a0ea755
 DIST elastic-transport-8.2.4.tar.gz 55964 BLAKE2B 8f995985e543dcf4a472a8b034116eede1a4ca7fd71e710cef57c4437243e9607ecf80cd8d345a09b1583df98f5539f0e9702940cdeca13845c6f3a4b6f3dbee SHA512 79ec2b0dadd4c63e502e426264ceabf8fc76c7c28c78ec3e03b91f9e09c5a347c8151c2a99a7cb775fb5558ee42e24b8c9b8cceaa112df0fc3d2b02daebb12e6
 DIST elastic-transport-8.3.0.tar.gz 59938 BLAKE2B 664bac3ba0f644657a633b32366d7f6d5b5078313b9225dbbb1f8d7bb26ee103a123664ed9f0032d82689c8e7fa3f69174da828fbf1eac250d16ecce0a89c269 SHA512 19d6c91de2891887e1f2d5203dd6e1223e6da664448ef2817370c9c67056a4d094323c80a5e5c049c61d38ce06fe93f7e7e4cf858f9c1e6cb63091dc01606bf9
 DIST elastic-transport-8.3.1.tar.gz 59992 BLAKE2B 867eadff08e73a003cf66c09616cd9430cccde0aa0a58b0a64c92775d799c606a4e592ee5e94ecf3553def7d669081ce8986a3db0a224232ac15cece5a860fd0 SHA512 55b18908b5981bb9d80a99eeef740c79cc10a3a1433b08b898cce76f2c1c4c4c38a459e8a1ba834fd240d7c519632a930182f8621bf095107984ac49012e6597
 DIST elastic-transport-8.3.2.tar.gz 60159 BLAKE2B 1eac8f50148fd48f8421922d7d5d57403ea2874642958de71812522556103e63901072f9b35edc762430353d99c7b8a843ea53153cd98deee661939687bf2cec SHA512 81eaf0fd044cf20b024d3dc865c90dabc68a1b739e2db89dfd9b29410e2c2f47930ac6c8d540817046c6e69f37617f8f21127add0b1b7ae95ad7cf6c0ff6565c
-EBUILD elastic-transport-8.2.2.ebuild 2589 BLAKE2B 15505b7b315efcdcdeb4d4fd5ece9febe53292d92ba140e5a8e29f519598580a21026ef689e3a7910db047d992b3738ab669c38dc79a59b06a215f5790c06f50 SHA512 a89354a9775e5167884d43fb98c8c2d712d40ce8a5dd5890fe514c4138ae3d1b9917d9369c2b5ab9f7a47359cd839a20b4bc5d53aa81a50485b4cc1fade82379
-EBUILD elastic-transport-8.2.3.ebuild 2582 BLAKE2B 96ac1c68cee2aa9508476cfca05d8240de29dffb73d8402c9d9c91ff68faf5ea27919150a48cc5c7cd5a057c758c30fe38696bd0fe558380d07f9e6c44814899 SHA512 cbf30dafa9c34fd1728d798f7740081a0d5dbab690ba2799913d145f30aa7b78424d278786d2f9c574a2684e0b7b05d5fa148d18db228f0b04af65ea9864d64d
+DIST elastic-transport-8.3.5.tar.gz 60375 BLAKE2B 7e5b62feb31b82f07ad5f538dbb5a7ad53808d5e8754274b0053f90ef5c16905ea65a81221484410cff2c7615fd673c10e3ebadaaf5b15296a0510be5891c86b SHA512 4bdeb1744e059784b3e618d098bbde5d731480fa4a8b79428a0e11d3f8026909e4282125820ae5f1a05a2cb908a9a13a7366dd1d881f506ebd236c595fd5f220
 EBUILD elastic-transport-8.2.4.ebuild 2582 BLAKE2B 96ac1c68cee2aa9508476cfca05d8240de29dffb73d8402c9d9c91ff68faf5ea27919150a48cc5c7cd5a057c758c30fe38696bd0fe558380d07f9e6c44814899 SHA512 cbf30dafa9c34fd1728d798f7740081a0d5dbab690ba2799913d145f30aa7b78424d278786d2f9c574a2684e0b7b05d5fa148d18db228f0b04af65ea9864d64d
 EBUILD elastic-transport-8.3.0.ebuild 2582 BLAKE2B 96ac1c68cee2aa9508476cfca05d8240de29dffb73d8402c9d9c91ff68faf5ea27919150a48cc5c7cd5a057c758c30fe38696bd0fe558380d07f9e6c44814899 SHA512 cbf30dafa9c34fd1728d798f7740081a0d5dbab690ba2799913d145f30aa7b78424d278786d2f9c574a2684e0b7b05d5fa148d18db228f0b04af65ea9864d64d
 EBUILD elastic-transport-8.3.1.ebuild 2592 BLAKE2B d4f997b8e22121a6e27b944f3e00dbde221d551309f12017900ea263911d23fede88f690fee854a50b645d4f6e86e095f8fc3b5e83699067ee59c7241aafffef SHA512 e48dffa804f304f3f0dbb150e58c7a5918b31d97e414c54d9c8b1f68f6252add68a90d46caeab09240b6c18c146772126857be4921bb27ef2c6ea075fea5bad9
 EBUILD elastic-transport-8.3.2.ebuild 2592 BLAKE2B d4f997b8e22121a6e27b944f3e00dbde221d551309f12017900ea263911d23fede88f690fee854a50b645d4f6e86e095f8fc3b5e83699067ee59c7241aafffef SHA512 e48dffa804f304f3f0dbb150e58c7a5918b31d97e414c54d9c8b1f68f6252add68a90d46caeab09240b6c18c146772126857be4921bb27ef2c6ea075fea5bad9
+EBUILD elastic-transport-8.3.5.ebuild 2597 BLAKE2B 8519902f09993ea13af96127d8a191639d77af618a31cb92697e7a63e6d53fbb4d855c6b7323b36631e799c4c03c6b27aa18b855aa902bb23f0e8396a4c2451a SHA512 33b07473e38873cd4950df89e78fe9c8b5b0e4fbd36042c760ef3d2f2cd80a9b1b2de25cc0bba9b4d7e4d611930d8c9014fd46a44f3b59d9461976a0de7616f4
 MISC metadata.xml 320 BLAKE2B ba9eb4e83e76707d7b732615b4764e7c866ddd9c9aaba3dd36feffb7ac6da61ee0c98abf9f547ec86a5377e8da8314d387dacdd3a20bcb0bae6e80eb32ef2b16 SHA512 651d6d0facc37affbf52d64ff6a5e8bd71842fd27f8ef8399ed84f972f98cc88063af826ed2e29a00337e15ae24cb04b8fd1466f46c2571656ddbcb7e7fc0f72
diff --git a/dev-ruby/elastic-transport/elastic-transport-8.2.3.ebuild b/dev-ruby/elastic-transport/elastic-transport-8.2.3.ebuild
deleted file mode 100644
index c9d6146ca24d..000000000000
--- a/dev-ruby/elastic-transport/elastic-transport-8.2.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Transport classes and utilities shared among Ruby Elastic client libraries"
-HOMEPAGE="https://github.com/elastic/elastic-transport-ruby"
-SRC_URI="https://github.com/elastic/elastic-transport-ruby/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="elastic-transport-ruby-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	|| ( dev-ruby/faraday:2 dev-ruby/faraday:1 )
-	dev-ruby/multi_json
-"
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/ansi
-		dev-ruby/hashie
-		|| ( ( dev-ruby/faraday:2 dev-ruby/faraday-net_http_persistent ) dev-ruby/faraday:1 )
-		dev-ruby/mocha:1.0
-		dev-ruby/pry
-		dev-ruby/rspec:3
-		dev-ruby/shoulda-context
-		dev-ruby/curb
-	)
-"
-
-all_ruby_prepare() {
-	# fix to work without git
-	sed -i -e 's/git ls-files/find * -type f/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# remove useless dependencies from Rakefile
-	sed -e '/bundler/d' \
-		-e '/require.*cane/,/end/d' \
-		-i Rakefile || die
-
-	# Tweak test setup to only run unit tests since we don't have a live cluster
-	sed -e "s/RUBY_VERSION > '1.9'/false/" \
-		-e '/module Elasticsearch/,$ s:^:#:' \
-		-e '/reporters/ s:^:#: ; /Reporters::SpecReporter/,/^end/ s:^:#: ; /Reporters.use/ s:^:#:' \
-		-i test/test_helper.rb || die
-
-	sed -e '/pry/ s:^:#:' \
-		-e '/config.formatter/ s:^:#:' \
-		-i spec/spec_helper.rb || die
-
-	# Avoid specs that require a running elasticsearch instance
-	sed -e '/#perform_request/ s/describe/xdescribe/' \
-		-e '/when the client connects/ s/context/xcontext/' \
-		-i spec/elastic/transport/client_spec.rb || die
-	sed -e '/retries on 404 status the specified number of max_retries/ s/it/xit/' \
-		-i spec/elastic/transport/base_spec.rb || die
-
-	# Avoid specs that require unpackaged gems
-	sed -e '/when using the HTTPClient adapter/ s/context/xcontext/' \
-		-e '/require.*httpclient/ s:^:#:' \
-		-e '/when the adapter is \(patron\|typhoeus\)/ s/context/xcontext/' \
-		-e '/require.*\(patron\|typhoeus\)/ s:^:#:' \
-		-e '/when the adapter \(can be detected\|is specified as a string key\)/ s/context/xcontext/' \
-		-e '/when the Faraday adapter is \(configured\|set in the block\)/ s/context/xcontext/' \
-		-i spec/elastic/transport/client_spec.rb || die
-	sed -e '/using \(httpclient\|patron\|typhoeus\)/ s/context/xcontext/' \
-		-i spec/elastic/transport/meta_header_spec.rb || die
-}
diff --git a/dev-ruby/elastic-transport/elastic-transport-8.2.2.ebuild b/dev-ruby/elastic-transport/elastic-transport-8.3.5.ebuild
index 5a93f863ee26..219fe987f6fe 100644
--- a/dev-ruby/elastic-transport/elastic-transport-8.2.2.ebuild
+++ b/dev-ruby/elastic-transport/elastic-transport-8.3.5.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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -18,7 +18,7 @@ RUBY_S="elastic-transport-ruby-${PV}"
 LICENSE="Apache-2.0"
 SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="doc test"
 
 ruby_add_rdepend "
 	|| ( dev-ruby/faraday:2 dev-ruby/faraday:1 )
@@ -29,8 +29,8 @@ ruby_add_bdepend "
 	test? (
 		dev-ruby/ansi
 		dev-ruby/hashie
-		|| ( ( dev-ruby/faraday:2 dev-ruby/faraday-net_http_persistent ) dev-ruby/faraday:1 )
-		dev-ruby/mocha:1.0
+		|| ( ( dev-ruby/faraday:2 dev-ruby/faraday-net_http_persistent:2 ) dev-ruby/faraday:1 )
+		dev-ruby/mocha:2
 		dev-ruby/pry
 		dev-ruby/rspec:3
 		dev-ruby/shoulda-context
diff --git a/dev-ruby/git/Manifest b/dev-ruby/git/Manifest
index 3c7ff74766f0..81a1689e1b54 100644
--- a/dev-ruby/git/Manifest
+++ b/dev-ruby/git/Manifest
@@ -1,9 +1,7 @@
 DIST git-1.18.0.tar.gz 175341 BLAKE2B 5a8dee1fef79c0386c59d37f37f2249c72600f2f11dbf2cc2c5bf63ff91f068c9c3164d24c2670585e8261d890f07b998255ddb80ce35ce53de09f402a4ec9e3 SHA512 520886b23758229cf25bfdd17e9d86e53d62feb6b2b3c155efe493db42d2f247a29bd629ff6c80ffa599ad429bcb6f09e44b015eeeecf9d9a5f4ee6ab3f1a265
-DIST git-1.19.0.tar.gz 177079 BLAKE2B 663d6303a49315567cbac77b4acfea10e24f1c61f1e1bb6d5807681eee03633edadcac9453ea4d919d3ad8b14fc0301b03e69033427b58d46b776caabd418cd9 SHA512 1935bd6bac26b46cd8563d6545bb7e4712636469624d11089bc5a7f716ee4a0f1e217167e6d0c6023a7ea4ef1644d93431bcdbd28d2a947589c288c0280a1286
 DIST git-1.19.1.tar.gz 177887 BLAKE2B 0da2a829679fd4e2d4b3aec5e88f421d221593729b827f2207bc3d26ce290ee2a41e8dde33b81138cf9df75fa1d1316fa5c69318a1247c627889f5c6971b8fd6 SHA512 4fb27cc2c59d15b0424ac16accc13d2310fec0710815b8deee399767b3cd9707cdf767a301cae271b4cd1ff6718cb955a6c86a9ea99076aaffbbadf595c64c0c
 DIST git-2.1.1.tar.gz 189005 BLAKE2B 8c273d28bc0b8ccc1a1ac74242086e56941fb6827e39d358adab0e645d080eaf5e4727b0a9aa131ea068efbd77c1ff645b55ddf69d615d13b972566f964aca06 SHA512 4815dff308a32b4b1d4984ea8b96e3cf2870412771afa7b56c74031f66d1eba607506587bf7de740091c285b84c3f4fa1929523d653870679ea317e8933c6b4a
 EBUILD git-1.18.0.ebuild 1255 BLAKE2B 155cc93656318be5a9499f747ce8570becdebc822cb54031f48f4474c7eae5a447a3be8846b01faf34d497d33526882dc83ea25bcc6738f0d856a427954eb752 SHA512 58166a367d1ef571a29fee8fd5527107ffae592a8cd8479202cb406032d0d70e3391a172426e1a419005fd889d9b1f01cd1f20cc0fe413b319d1a68689b1b942
-EBUILD git-1.19.0.ebuild 1249 BLAKE2B d9968a180831832d4ac28f0ed4c436d290ac80495a1cda85beecf94640627eef7dfca96e64534c905e1c089ba63627a7859b71ebe84775b78ca92f5f4918db71 SHA512 b096c54c229f4ac524987793d6f44f29f7b95e158990360b4012f136a5a4cbd3de439dc33760eac162a05f535ff8f07adb714d9f1e1b945b0ce385e193c41143
-EBUILD git-1.19.1.ebuild 1279 BLAKE2B 3c4a0d53e3d861c54c67af61b18a0152db6faed3020e05a9d11b0fdf1c572de45d38c3a6f3af0c6364989ad2f1a9a86cf8f780e5700ffa588a74f42c4547e27e SHA512 07353917a893563d8c898ca6af03876854eba7dea439d9c8fed6987f30e4aaab1b9dc9f79e3d98904320eb94283f6454cf11dc2ef2776098b00ead45912ff64b
-EBUILD git-2.1.1.ebuild 1351 BLAKE2B e1d4f1e4272e75f68c8917483c3af31ec919a98b77bcc988d491b0b1ebd72377b29dfaf6ae29f40533af02c6e7f19fb5de05938d498950b44d7b56401b3dd1f7 SHA512 acf1bd62faf056cf05e76583245ebc548009702aab11425362b29dfaa8ef3eeade152ec7a5ac61961b3228ba20ca5584d932b87c963deac2d269e014d2e34ffb
+EBUILD git-1.19.1.ebuild 1413 BLAKE2B 04cbd3817b4a3967372ec354fdd44ef7f9b065d6cd52f7d4058c7da14b09457eac098db194abfc8dec53ae7d1c880186b5ac0603e74257067f78ed15915da79f SHA512 4e41f916509bb7e3748708772c9db21c417f781433821ca4011c68cf44d763c17507b25299bde928fb66a7d976924e78551fbf3d0157fdb8b051b7b6a44de029
+EBUILD git-2.1.1.ebuild 1503 BLAKE2B 87facd870fc890e41162242a3ea2ff3bcaad4925f508f2fd8063ae8fca28b2b32c497685b1d8b0c89ea2e44d126a1ecd3c7c1c8a600d383aaec39fed83b132b3 SHA512 acc269209d7a67c418e93c2f11be9fcd6b3b3a12b58b5823d5764426ce26d5c33a8bab58c83cad23a81f65fca58add70b5f3efc0370b15150b73e741685426ea
 MISC metadata.xml 391 BLAKE2B 3d03aece790440be04e0a72615824cb5aeb627e67b87b9457b7625a330c5d4736b77897a9b6655b0e45d99d134615090a95077fe2ee62131d572686f9a4bc682 SHA512 0ac01abe3193d7e8566420333c2bbf301bdc2ad3c4587ef9f48bf260322a3763eed3319c879472c0028cf8d63c73e82d24f2e2164692a06f3e14bd992e3b301c
diff --git a/dev-ruby/git/git-1.19.0.ebuild b/dev-ruby/git/git-1.19.0.ebuild
deleted file mode 100644
index 86a5200e027c..000000000000
--- a/dev-ruby/git/git-1.19.0.ebuild
+++ /dev/null
@@ -1,42 +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_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="git.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for using Git in Ruby"
-HOMEPAGE="https://github.com/ruby-git/ruby-git"
-SRC_URI="https://github.com/ruby-git/ruby-git/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="ruby-git-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-DEPEND+="test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar )"
-RDEPEND+=">=dev-vcs/git-1.6.0.0"
-
-ruby_add_rdepend ">=dev-ruby/addressable-2.8:0 >=dev-ruby/rchardet-1.8:1"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/minitar dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	# Don't use hardcoded /tmp directory.
-	sed -i -e "s:/tmp:${TMPDIR}:" tests/units/test_archive.rb tests/test_helper.rb || die
-
-	sed -i -e 's/__dir__/"."/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	git config --global user.email "git@example.com" || die
-	git config --global user.name "GitExample" || die
-	${RUBY} -Ilib:.:tests -e 'Dir["tests/**/test_*.rb"].each {|f| require f}' || die
-}
diff --git a/dev-ruby/git/git-1.19.1.ebuild b/dev-ruby/git/git-1.19.1.ebuild
index 36d7c68160a4..bbf958a96748 100644
--- a/dev-ruby/git/git-1.19.1.ebuild
+++ b/dev-ruby/git/git-1.19.1.ebuild
@@ -18,7 +18,7 @@ RUBY_S="ruby-git-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND+="test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar )"
@@ -33,6 +33,9 @@ all_ruby_prepare() {
 	sed -i -e "s:/tmp:${TMPDIR}:" tests/units/test_archive.rb tests/test_helper.rb || die
 
 	sed -i -e 's/__dir__/"."/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Don't use deprecated key type that is removed from openssh
+	sed -i -e 's/-t dsa/-t rsa/' tests/units/test_signed_commits.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/git/git-2.1.1.ebuild b/dev-ruby/git/git-2.1.1.ebuild
index c74d6b700a04..b09921a3b99e 100644
--- a/dev-ruby/git/git-2.1.1.ebuild
+++ b/dev-ruby/git/git-2.1.1.ebuild
@@ -21,7 +21,7 @@ SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64 ~ppc64"
 IUSE="test"
 
-DEPEND+="test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar )"
+DEPEND+="test? ( >=dev-vcs/git-1.6.0.0 net-misc/openssh app-arch/tar )"
 RDEPEND+=">=dev-vcs/git-1.6.0.0"
 
 ruby_add_rdepend "
@@ -38,6 +38,9 @@ all_ruby_prepare() {
 	sed -i -e "s:/tmp:${TMPDIR}:" tests/units/test_archive.rb tests/test_helper.rb || die
 
 	sed -i -e 's/__dir__/"."/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Don't use deprecated key type that is removed from openssh
+	sed -i -e 's/-t dsa/-t rsa/' tests/units/test_signed_commits.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/omniauth/Manifest b/dev-ruby/omniauth/Manifest
index 09e4d4a09488..69255ca3e7fd 100644
--- a/dev-ruby/omniauth/Manifest
+++ b/dev-ruby/omniauth/Manifest
@@ -1,5 +1,3 @@
-DIST omniauth-2.1.1.tar.gz 31414 BLAKE2B 180ee40499a61e8b6360dc4c462ca10933dc7bac976f76dd8c9579e73da6618ffae71ed532fab024f0eb65c3830db1e52f866c40b6e160e65c8fa403c7c1ab37 SHA512 e86fbd3c1f239b4950f17fdfe4ebd97a9a135831b63892dd009bae97f4372b3a6fa2452233e414c6097c3b835ee4e75821e795599da9613affdaf163d31964a3
 DIST omniauth-2.1.2.tar.gz 31631 BLAKE2B 73faa82db781c3980eae55f3fa8a099d3ec0769326201f51f57840566a3b2da2331bdaaddd4ef17d957e389ea8863fc7bfdc11f0278753c27f3a7eabc01ec138 SHA512 bd0c65af815502f3df2dbb104ede35de093c6cc6f25285e9bbcdd58df3d31ac6c05d410888a40aca86a00b17a4851856d158593b06415e8b69ff426f171b9857
-EBUILD omniauth-2.1.1.ebuild 1252 BLAKE2B ade8731df10b75ef5c381e501d9a3453552fbba284f9da4a09fa9e725178dc2ada36ecc12e9a54f010d5b887a516f8e7bfce4882650a203009c9704589b8ad10 SHA512 cd99ee7e55948d8415461418356c4ad865283942cbac17ad8a1abfba59b8698bc8efc8e1e53f07da15f7b023aabfa97ee9588d7547b9ed53d2700f87303f2931
-EBUILD omniauth-2.1.2.ebuild 1287 BLAKE2B 1832f229bfe93d70e4ca3f507622baffcc3c16218d2087e5257f3b01117bcacee8edbf6c93ab531b97e264e19a254d5a1588d93f30286cdd25435f79a25a87c8 SHA512 25770615260f8337d5b3d86de4f218bdca970b41eb5dbcb5fac02012ffabc749989a25795d3baa8e88dde970b4219789b94664eb0b3153015f9ff8e44e9effdf
+EBUILD omniauth-2.1.2.ebuild 1356 BLAKE2B a39a5703238364405109ffcfefa104ad951de366e4e4700963b3437e6bf8a0869e4b195a00306a9c22f0c7081a552130628321ac931236d6f8a83f689a912399 SHA512 322ce485711b064ecbf6946a6fc166f39aad87cf6da0d0a5256e4e7e9632e7987ed36c16167f6c94320afa694cf53be2d47ffcd3131459f9a87f9a30435d7e46
 MISC metadata.xml 344 BLAKE2B c7059ea07b51a0b3ab1a54c9650410245a68a18b0c860f7b10994800da7ee46ba0f0b939381113a4541e6a91247e784a6c3816f07b556d259279a2a897ef526b SHA512 f1ccdfd7394d1eb7a007ed14135d0f5f46c953a7602206ce8de5c3f38ce34ae1e20b2a95d4bf1befdcbd3ae2f04e9bc363239253f17d89b05e58dd6c8a0923a1
diff --git a/dev-ruby/omniauth/omniauth-2.1.1.ebuild b/dev-ruby/omniauth/omniauth-2.1.1.ebuild
deleted file mode 100644
index ece4591244e5..000000000000
--- a/dev-ruby/omniauth/omniauth-2.1.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A generalized Rack framework for multiple-provider authentication"
-HOMEPAGE="https://github.com/omniauth/omniauth"
-SRC_URI="https://github.com/omniauth/omniauth/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/rack-2.2.3
-	dev-ruby/rack-protection
-	>=dev-ruby/hashie-3.4.6:*"
-ruby_add_bdepend "doc? ( dev-ruby/yard )
-	test? ( dev-ruby/rack-test dev-ruby/rack:2.2 )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' \
-		Rakefile ${PN}.gemspec || die "sed failed"
-	sed -e '/RUBY_VERSION/,/^end/ s:^:#: ; /freeze/ s:^:#:' \
-		-e '2igem "rack", "<3"' \
-		-i spec/helper.rb || die "sed failed"
-	# maruku fails, resorting to default markdown implementation
-	sed -i -e '/maruku/d' .yardopts || die "sed failed"
-
-	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc ; then
-		yard || die "yard failed"
-	fi
-}
diff --git a/dev-ruby/omniauth/omniauth-2.1.2.ebuild b/dev-ruby/omniauth/omniauth-2.1.2.ebuild
index 0ff88ca09fd5..84c249a9576a 100644
--- a/dev-ruby/omniauth/omniauth-2.1.2.ebuild
+++ b/dev-ruby/omniauth/omniauth-2.1.2.ebuild
@@ -16,22 +16,23 @@ DESCRIPTION="A generalized Rack framework for multiple-provider authentication"
 HOMEPAGE="https://github.com/omniauth/omniauth"
 SRC_URI="https://github.com/omniauth/omniauth/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
-KEYWORDS="~amd64"
+
 SLOT="$(ver_cut 1)"
-IUSE=""
+KEYWORDS="~amd64"
+IUSE="doc test"
 
 ruby_add_rdepend "
 	>=dev-ruby/rack-2.2.3
 	dev-ruby/rack-protection
 	>=dev-ruby/hashie-3.4.6:*"
 ruby_add_bdepend "doc? ( dev-ruby/yard )
-	test? ( dev-ruby/rack-test dev-ruby/rack:2.2 )"
+	test? ( dev-ruby/rack-test dev-ruby/rack:2.2 dev-ruby/rack-protection:3 )"
 
 all_ruby_prepare() {
 	sed -i -e '/[Bb]undler/d' \
 		Rakefile ${PN}.gemspec || die "sed failed"
 	sed -e '/RUBY_VERSION/,/^end/ s:^:#: ; /freeze/ s:^:#:' \
-		-e '2igem "rack", "<3"' \
+		-e '2igem "rack", "<3"; gem "rack-protection", "~> 3.0"' \
 		-e '/simplecov/,/^end/ s:^:#:' \
 		-i spec/helper.rb || die "sed failed"
 	# maruku fails, resorting to default markdown implementation
diff --git a/dev-ruby/rouge/Manifest b/dev-ruby/rouge/Manifest
index 725e7681a0f8..2cd112532a04 100644
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@@ -8,6 +8,6 @@ EBUILD rouge-3.30.0-r1.ebuild 1031 BLAKE2B 4704bd2c997593b21512df2bc0f77098768fd
 EBUILD rouge-4.1.2.ebuild 1035 BLAKE2B 7b18c8dde433b3328eee5d0cabdb6b25c51cc1ab4f0969405102510802cd7f6b1d55b874c9cd2f06ae689592fe70ede7a16fc717d76f9819e5b52830a08fd4d5 SHA512 64d1484178fc87257e6a0805c2c66f51cd6ddb3c77a6ea12693ab727360615a71b45b42d35748dfdd871a79e477da71bccf5a025a5403b0fe325b78fb4ab421f
 EBUILD rouge-4.1.3.ebuild 1049 BLAKE2B 0548402aeeaf54c07560d9a5286189cdec315c6f98029ee3bce38ba7095ac7cba54ce8f7e7669d7aa6c81b9b212dfeed91a0d4940346ab9eadc49fd2f1129c39 SHA512 041ea1b213840e91c5f051f9f890f9643ea61a4719a29b420a07232fb2de87249c0983ec764402769f7b9137f756e3a605f062796257d175d248946f810580b0
 EBUILD rouge-4.2.0.ebuild 1055 BLAKE2B 57f410028b642ef92037934f573a1a0ef43d95004133dfedb62584279cfa48677d928fd2fc002e209a56fedb86a355718d315dad8c5fd4ae8408f2b290ee2670 SHA512 735185abe1c80d6f4082d85ff8a5eee5565d305e683e2318732b47c9e0d604423ef64ce40a6917b09dc7b30cd52e1ba1774df13f050dd86ed45a56efb2d7ad8b
-EBUILD rouge-4.2.1.ebuild 1063 BLAKE2B c31bb7d93d5c3a0f2f35fe4f2cc6ac31b4a7b96f553c8996d20dcc1b18c1e3d7b4ede0a9fd140b378c4fd29120ecd5f773f900cd621a75f37e9b581c5a3b7ca8 SHA512 96351f10a7479c05f2a93b7ec0e218ac37254f76ff639550bba178ac6debf319ca78a95834b178d9193a0d53334d5dac5d6803261d525a6fe386e5444b314a5c
+EBUILD rouge-4.2.1.ebuild 1056 BLAKE2B b6e18541c159130e0a1e60f54a5b61988c28ad5cf21e65dd10cb4513f8fee780cc23b349b81a7e8a9be64fd795f8c8762de9d670a41def715e33c86111d05c4e SHA512 02130e92e5008341e47190dfefa2ac33e44919f2613ba4c21531be8ae978e25aa169f73d80f1cdf5ca37cc3adf314902dd154521eab607ec78e1fbf75fb79a33
 EBUILD rouge-4.3.0.ebuild 1063 BLAKE2B c31bb7d93d5c3a0f2f35fe4f2cc6ac31b4a7b96f553c8996d20dcc1b18c1e3d7b4ede0a9fd140b378c4fd29120ecd5f773f900cd621a75f37e9b581c5a3b7ca8 SHA512 96351f10a7479c05f2a93b7ec0e218ac37254f76ff639550bba178ac6debf319ca78a95834b178d9193a0d53334d5dac5d6803261d525a6fe386e5444b314a5c
 MISC metadata.xml 392 BLAKE2B 4db1396051514c7b0dc3a627c54c571dda876ede2f1154a16355876a421622efcec037022ab66d2240123b3d24a36f0e9f568c79d623f9f7b363fc7505b72fd5 SHA512 93b8c3e72d5836cc1fea2472f09b42571a7c8496422b1f454c2b607b912125a044d501c6e6ee75bce78324b1d078081188df421d0d8cbecf28bd7c2d22266fc9
diff --git a/dev-ruby/rouge/rouge-4.2.1.ebuild b/dev-ruby/rouge/rouge-4.2.1.ebuild
index dd5ef6a25191..ba9936d06de9 100644
--- a/dev-ruby/rouge/rouge-4.2.1.ebuild
+++ b/dev-ruby/rouge/rouge-4.2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rouge-ruby/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="BSD-2 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="doc test"
 
 ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
diff --git a/dev-ruby/sass-rails/Manifest b/dev-ruby/sass-rails/Manifest
index c57b6e8a67bf..ba0cc578450e 100644
--- a/dev-ruby/sass-rails/Manifest
+++ b/dev-ruby/sass-rails/Manifest
@@ -1,3 +1,3 @@
 DIST sass-rails-5.1.0.tar.gz 89994 BLAKE2B dc0083af8399d2ff1210a6430d47ccaaac88b337da5cfeb61c7a4f0c6b1f55d59d896a874945a943cc322fabfb3a31d80a1a467a12d04f2c1a1f9c84cbb452a0 SHA512 894b957b6b72d340ef2eebdc721c58c2d101fd275a10265f859f17f654736b3d3542a7100db922236925af40ae090406689815a4bb4f623c5f70652685571b7e
-EBUILD sass-rails-5.1.0-r1.ebuild 1063 BLAKE2B ebf64d30a7837c8b30179d04b2c5cd69a88619e24d7debc63781cb337c4c7af5f92fa18068ddf59c06008966f640c81b316729253bc3f5605e7ab40609894b78 SHA512 3b53d5aefb9a0cab3373edf138cd6e34a80f9ce8bb72fc592e1cc1d315b25f93eeea6a07b77b28501cdc99b6292c6e2f46f844bfb731492c60a7dfce6d7c24e9
+EBUILD sass-rails-5.1.0-r1.ebuild 1067 BLAKE2B 3536b9ec436cb53298a4708cca272934328aa818b57cec983bfb6f985ab70f56ed1ebe0aaec86fb63b0bf1cbf76d322c998b2e4ec8fef5e72ebf90f3f62abcff SHA512 6c743bf3f8a4dfc83ebc574a147e539179f3f87d224a5481c53d5d9ea28b8b8e26514bbd05b207ce88a61668b393f3d72da5d6872c7c237686b5973bdbe012af
 MISC metadata.xml 343 BLAKE2B c5a05184557a2483d634a9684fedf6bc5d53522e766510829d3765a937f68dc7b8c887ff82f4e81bdf3e25385d32a043813032beb255a061b51ccb03c094b9c1 SHA512 a2d0d0783101ee59353b76a9557f50876157228c532442184f2ed72ff21286127cc83d0f0040ec6e2927d4ec45b04e891d7f13cf221d1fe09e176ac9896c195d
diff --git a/dev-ruby/sass-rails/sass-rails-5.1.0-r1.ebuild b/dev-ruby/sass-rails/sass-rails-5.1.0-r1.ebuild
index d593abeefec5..e3445ec6a735 100644
--- a/dev-ruby/sass-rails/sass-rails-5.1.0-r1.ebuild
+++ b/dev-ruby/sass-rails/sass-rails-5.1.0-r1.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="ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -18,7 +18,7 @@ LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 
-IUSE=""
+IUSE="test"
 
 # Restrict tests for now since it is hard to set up the right
 # environment with the correct ruby interpreter and Rails test
diff --git a/dev-util/0xtools/0xtools-2.0.2.ebuild b/dev-util/0xtools/0xtools-2.0.2.ebuild
new file mode 100644
index 000000000000..d73227e1d32b
--- /dev/null
+++ b/dev-util/0xtools/0xtools-2.0.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..12} )
+
+inherit python-single-r1 systemd toolchain-funcs
+
+DESCRIPTION="Always-on profiling for production systems"
+HOMEPAGE="https://0x.tools/
+	https://github.com/tanelpoder/0xtools/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/tanelpoder/${PN}.git"
+else
+	SRC_URI="https://github.com/tanelpoder/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}"
+
+	sed -e "/^sys.path.append/s|(.*)|('$(python_get_sitedir)/${PN}')|"	\
+		-i bin/psn -i bin/schedlat || die
+}
+
+src_install() {
+	# C executables and scripts
+	exeinto /usr/bin
+	doexe bin/{cpumhz,cpumhzturbo,vmtop,xcapture,xtop}
+	doexe bin/{run_xcapture.sh,run_xcpu.sh}
+
+	# Python executables
+	python_domodule "lib/${PN}"
+	python_doscript bin/psn
+	python_doscript bin/schedlat
+	python_doscript bin/syscallargs
+
+	# Service
+	systemd_dounit xcapture.service
+	systemd_dounit xcapture-restart.service
+	systemd_dounit xcapture-restart.timer
+
+	# Service config
+	insinto /etc/default
+	newins xcapture.default xcapture
+
+	# Service logs
+	keepdir /var/log/xcapture
+
+	einstalldocs
+}
diff --git a/dev-util/0xtools/Manifest b/dev-util/0xtools/Manifest
index 167666236972..0000a48d2362 100644
--- a/dev-util/0xtools/Manifest
+++ b/dev-util/0xtools/Manifest
@@ -1,4 +1,6 @@
 DIST 0xtools-1.2.4.tar.gz 61830 BLAKE2B 6221ded289bc4cf4c39527f35d1ad3ee43f41a60a4a9877056a5ff74fcdd203575d96edbf13af1d32bcc49465d87a2133a8dbec813ae9a5bb233b5fe2e4a36b3 SHA512 f835de65e783d9eb4b26f38be155961a2f4da91639c7e1e39df71cf8be17d27987c8749e44b7b6affe6cdc45c5f65c90be5b2cf22b2f37dcc2eb45452a384ff3
+DIST 0xtools-2.0.2.tar.gz 5989710 BLAKE2B 5e4efd4d21e3ed1fc8b1eed5378d25af3170f2386c738a68d28df5bad44ebdb88fd20a0b554d101b678c15131adb83ae786df1267c8333075c58ea58b8c2ce88 SHA512 5cb627e9b990063867869cdbbdefd7e2b6151410ac19950f683086c9200a8ba1f92192378779dbabc4efd91283cd23243a4b46259d97426331f823941b85883b
 EBUILD 0xtools-1.2.4.ebuild 1359 BLAKE2B 16f5d4a8baf958a55eab1a130d18d39ac25d0e824889de9336abfc557e7980c9c8b74a438f00fb27846055ad749ca43d162124be26c376f1fd641c431a3b1be9 SHA512 ba018d77933c4e2e347a7817ace9f79ebb642b3f92080f09c386816fd3681b7a9d7a8d16526e29e2a63a6611ecf40362c37f15e0b37647c6bac0ca7a7fef4062
+EBUILD 0xtools-2.0.2.ebuild 1442 BLAKE2B 3cae7b29f4f271fd2fadf7e63edd79255ccac5d81d985c06cdc67959ef940128a59a97fa965062dcb80c94e2007e74a51a2203b77392414a9d4199e87b25d9a6 SHA512 02b648a82c35c85eaeb574739418a241c6ae4584287888f1cd24d07934cd00ec1b7547fa5c83a8f83d4d3f5c5bf354a4bfb3a901fb6fc1c048fd554d69fd39e6
 EBUILD 0xtools-9999.ebuild 1360 BLAKE2B 1a710510aeade291b21d2b1e124244ae2ce5e5666909198a45fb3a4544fe88bfa5f964fb6a98d510f3a0544336a10538e50396663c7d0e47394f02fcf4c4b2ca SHA512 7404eda4db8655977d3db08b594c9f2861937e3663faa57781f19e2697d57310a2ccb08db8df3f617b1ce6006f1caa7d07b79baa123d97e971fb703d6a29c089
 MISC metadata.xml 1292 BLAKE2B b7e2505d33b7af4424dc4336a7d8d1536ed70f92e4dccccf725a54473b109f7718adac34960b5238753336c6b2da5fd0e49def8ae249509c4b0c9e4bc42a89cf SHA512 0ecf2c2bab2cf03656f980788cf05849c3d2e5905f70753b03f76615da377a5463b3d30decddc3a97eaf83d9bef55e31ce104ca6cd459eb0f116c9edeba0edf2
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a5662d93b59d..08a7cde3f326 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/intel_clc/Manifest b/dev-util/intel_clc/Manifest
index b2165c144d10..a73ffda6957d 100644
--- a/dev-util/intel_clc/Manifest
+++ b/dev-util/intel_clc/Manifest
@@ -1,6 +1,6 @@
 DIST mesa-24.0.9.tar.xz 20197892 BLAKE2B 3c68e544898031fe76a57ea754f46ede5b105c259d13dd484eaa63fe51b7d52cf76a4084529b11a586c4d8d06f4cb32f993fd1ea4e6ccc4cbc91e78fe755743a SHA512 de2ee6c9df1fc106ee10befe0a76be1e9cfe83d65dbdb83bad6d8d7cfaa085232fb115293a1a790b37b50b1fe14bd58aafbcfe5a15e953b5901a7105d57569a5
 DIST mesa-24.1.3.tar.xz 29086488 BLAKE2B 2e8e4ee98f904aa02f304a6c3cbbb81d04802203e270e6b8ad2b7a62b334ac28f5e91687d7a92501f66b0043255a533d024537ff5ef3f2f03d986e46a7272eeb SHA512 db4071ac80747397023762d6e0355b001f4e942cdc706c67f8aced80e162058667c02a0dc0804a45afc2656cb65d8b16e17148bc03f0a1692067ec170f193c1a
 EBUILD intel_clc-24.0.9.ebuild 1741 BLAKE2B b4fc7184409bedcfec1cd559149b7d57b9a5bd708cc4aea847c47573cd194804e3435a15120914fadc4bd5f9172e946d93a9164a875809feae2cc7589a36f74e SHA512 d9825be298668fb6bc933ff6131c5a2d18b76bbcb9b6ca2176512d7a4273cf42f5fe00097478a4cd3e9c678fa53c8a95f83115c4f569ac37eebe940749ba340e
-EBUILD intel_clc-24.1.3.ebuild 1748 BLAKE2B 1546870b9ef18aeaa21da10acf8edd2875015453e22dc15ee3c2bf6e37afab1454f83040af343c7fec75d5fcdd8819e4ff0a8f56f27691b6a78c6d5438601efc SHA512 3981e62ce60c42485d2faedf58ff68f261d264c5d0fa891b0db41cbc1427a9cdd761b2119afbbd04f37b5ec34d9ec516cff233a31445d72af0962b570e0f3c1b
+EBUILD intel_clc-24.1.3.ebuild 1747 BLAKE2B 4cb4efc5074e18226021fc2b9233b03544ae56b0e84c1678e0ac809ace3295eda50c952cd991eda23b0ea22eec659abf617ccb1faa5edb57058b6e6c10a5fba2 SHA512 9a21ac0d5656f43eb721c1b5f7aa90b0fa95333f18f68bdd3936a7b9452f00bbe53db37aa7626c910d7be9f953128ead58307b0e4272eb0e88705151b5dcd8aa
 EBUILD intel_clc-9999.ebuild 1748 BLAKE2B 1546870b9ef18aeaa21da10acf8edd2875015453e22dc15ee3c2bf6e37afab1454f83040af343c7fec75d5fcdd8819e4ff0a8f56f27691b6a78c6d5438601efc SHA512 3981e62ce60c42485d2faedf58ff68f261d264c5d0fa891b0db41cbc1427a9cdd761b2119afbbd04f37b5ec34d9ec516cff233a31445d72af0962b570e0f3c1b
 MISC metadata.xml 388 BLAKE2B 0558cfe706987a93605fb383bc2c30ff4f4cf5837ca19afd3e16d9702ea7dcd3d575579d53aacb531e1d421c8b1692eb4607d713793a89240223c031d7781a31 SHA512 e0375912a94fa92b49ed78d9a88c4eacc8b441d8b2fa117a48df2d8a958f1cf91279299aca109e24f76b27ca04f0067f83e5b8e4141f85ac64d379bca0945d2a
diff --git a/dev-util/intel_clc/intel_clc-24.1.3.ebuild b/dev-util/intel_clc/intel_clc-24.1.3.ebuild
index df38191345d0..40ac06697204 100644
--- a/dev-util/intel_clc/intel_clc-24.1.3.ebuild
+++ b/dev-util/intel_clc/intel_clc-24.1.3.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	S="${WORKDIR}/mesa-${MY_PV}"
 	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="MIT SGI-B-2.0"
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index eb21310c344b..f9fbc855f237 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 0b8cea43c19f..513ac5d9d58b 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,4 +1,6 @@
 AUX 3.32.0-default-fonts.patch 1386 BLAKE2B 7d1c4a8279b9b8ca752804ea45efed9b61ec9844843793dc568e3012d3cd80c7a5f7a921e8dcc42406c6e15010fa472edf9cb10b7c86d1f8f69da2f6a3a034b7 SHA512 190129064554a36b56ba308f8dd75a9b8ee5ccfadffc0b5d528b5ba70324bcb3436acab116ad7768f59d316c3c2bd85dad9e8147050cb475b21fce439cb92705
 DIST gsettings-desktop-schemas-45.0.tar.xz 750056 BLAKE2B b65c846654fac5a104ad9a7d67546c6fb3d54aada178d58c575d22a8c2adc0057c1f1dc177562740f7ae94d0e17743789ca902db7c2fcc42c844bb66e401eaec SHA512 b3e00164aa47cf19b53bf8fd9cd9526c0a4f3d770e8c77953dba0bdf49b85d56f87f45254d18260e7a7b0ec7e24fc049fde503a1ea93e87946dbbd53b5dfc0f2
+DIST gsettings-desktop-schemas-46.0.tar.xz 767460 BLAKE2B 537b37640c17aa8338e2bb520fb1a8184c74a5cb28d6b7d9fa35393c0a76a4a144f6518b58546393c39a9f57889bcb99decc0e9bfbf4a1969c44ecf89462c4ee SHA512 04d43ce3885741afdda2d971ef61332474a114e2b7f82d28e5fb7c831992f95359e3edb1bf60f39d29b5ad509a77d65b76d482c9659cbdd1f7bb1e07c86da912
 EBUILD gsettings-desktop-schemas-45.0.ebuild 982 BLAKE2B 2b75b5f5ab711932af31986ec49cd25d8c4e477265ca4a017abb697425a288aa63429a77ee6dd8540dedb043cf0fa5eed73c4a4594e71ef070c24edc56e7fad1 SHA512 d180cfbb34a0a696e0f3d0f89662de1e44c9b61317f1d342fa5357dcfed0b78b8775abb7d682e95ef9f8adf78178a1e56cca8270e7bafa912f4bda4f36882b5c
+EBUILD gsettings-desktop-schemas-46.0.ebuild 990 BLAKE2B b2eeba90e1b7211cc37f8d338f2b72b6ba36f43ee72a7cdd601d3ddd698ac8466b580d7622644700930b6c62996012a94d81d4a75fd8f613cafb78519074f186 SHA512 1c3bd155caf447a1b9fe549dff0acbfe07d77e62e83fd99498c393386966b6ef6712d67ce1b9738aea238681ae5fbf57d4abab23fd960a8baa37de3c239c1cf3
 MISC metadata.xml 391 BLAKE2B 8f62d3c558dcf5523f03d85268b9c5b08654c8c4405194596a4a040aeccd42766a969aeae050850bc823b2c6e4f357e862bf5771f52d4979cf01deefc19bc2a5 SHA512 95ed4eb3d13cd1437648c5923f0b21cefd2f40c53b64f8baf56bc673383c6d0048910a3e4782a36f0fec715f2f23bba90de04693ef0ed657019c616bfb018b90
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-46.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-46.0.ebuild
new file mode 100644
index 000000000000..5911315d0ebf
--- /dev/null
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-46.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="+introspection"
+
+BDEPEND="
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Revert change to 'Source Code Pro 10' and 'Cantarell 11' fonts back to generic sans and monospace aliases
+	"${FILESDIR}"/3.32.0-default-fonts.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 83b9c5a37fc4..34417d670f20 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index 101e34c7799f..d41b8c197711 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-tweaks-45.2.tar.xz 738788 BLAKE2B 55c0cc91d137dab1d39701660e6be987b87957601c9c315599eac4b0d4e478a7c07bd0fe24d8ce72a7c3224c6a466dcdd5608adde28527b3ff31865c90399b3a SHA512 b07d99f53de990de04f1d2aefed932633253cb2584d719bdd7bb197e431d622e777f911bc3f454a336e0fce3bf93a8ae55744b09e99e9f014d244bf82e5118f9
+DIST gnome-tweaks-46.1.tar.xz 691844 BLAKE2B ffb2522139bb96a48aacaedd713d3bd8c3e2fc87416e6ca66e71d856996364e32cc2417ab71119903f175e42c060fb46405aaf47fd34222cc4b853cfb82bac84 SHA512 8e167a84cc2eb700fe098cf7221bb3f8a3cc039826e1267e5585b5362862e4626dea3c84dfb8ccc9d08b34d2894422ca8505623148415116423738d2c07956f3
 EBUILD gnome-tweaks-45.2.ebuild 1216 BLAKE2B ad9b623bb666517f549587da3caf6cf2115fa266cb97b7e60045a0dba756ddd98ff9d7559fb5c07372cb0b53368b030d16bf9eca8f8f2c350be6510f160101ba SHA512 ff8255f0a2be5b8a723afc336614fbd7fcc3d0ceae1623771291bda123317092abd39bc9abf5e553322b1b8669c34bf339396412071dc926d2a6868b63bd55d4
+EBUILD gnome-tweaks-46.1.ebuild 1288 BLAKE2B 48ce04e5919c21b68c15d5411bf10e1a1b7e9eed0dc8563cbcd5b4b891d435a39d8040aeef48cbeb7dba91d0ff2022f9ebd2d942a53d95bdff50a219e5ed9082 SHA512 333d3a12105d7e1b322161d4cdf1db8140c09fc45c5de66b0bb5f3b2ed8c8020fb36484db93e94d0c029429a2a22bae2d57870ddeb7855b4532d5a0a925a3d7c
 MISC metadata.xml 680 BLAKE2B 0262d35712bb1b29428738120e961ed7128b381ed0f0ced9546d35fcbdff179575906b910055ec3e616d7bf7860c4d1f0d66c50aded1500c9f24ba9ad0c34c1b SHA512 16ae57ccf79658fd5a717f7fbad121ba5f48f0bd63ad882e1055897d14eec3ca3dd6467179110689066ddde0d21f1c3f12fcf46f97dc81dc9091d758d37a0913
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-46.1.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-46.1.ebuild
new file mode 100644
index 000000000000..fb6005959b12
--- /dev/null
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-46.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="Customize advanced GNOME options"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-tweaks"
+
+LICENSE="GPL-3+ CC0-1.0"
+SLOT="0"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+DEPEND="${PYTHON_DEPS}"
+# See README.md for list of deps
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.46.0:3[${PYTHON_USEDEP}]
+	')
+	>=gnome-base/gnome-settings-daemon-3
+	x11-themes/sound-theme-freedesktop
+
+	>=dev-libs/glib-2.78:2
+	>=dev-libs/gobject-introspection-1.78.0
+	>=gui-libs/gtk-4.10.0:4[introspection]
+	>=gui-libs/libadwaita-1.4.0
+	>=dev-libs/libgudev-238
+	>=gnome-base/gnome-desktop-3.30:3[introspection]
+	x11-libs/libnotify[introspection]
+	x11-libs/pango[introspection]
+	>=gnome-base/gsettings-desktop-schemas-46.0
+	>=gnome-base/gnome-shell-3.24
+	x11-wm/mutter
+"
+BDEPEND=">=sys-devel/gettext-0.19.8"
+
+src_install() {
+	meson_src_install
+	python_optimize
+	python_fix_shebang "${ED}"/usr/bin/
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index fcafb1ee0ae0..3895a25f5382 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 8c21cb5118e6..7784c280829a 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -136,5 +136,5 @@ DIST thunderbird-115.13.0-zh-CN.xpi 772579 BLAKE2B a74d96bd5e8be22f7820860b790c7
 DIST thunderbird-115.13.0-zh-TW.xpi 777571 BLAKE2B 6c87f941a7764dfb8c6edab6785a700c13aeb9ac879a275262ed6c5c2fd606e727ed8b64455079ad8462d5147b104483ae2b09f720967ff808e37a2c4de52985 SHA512 5ddf1e877688e3d3dce43b21112ebfde881794d04f4421ba65dfdaea90a54d34d71db822fd34b78b7594019154db8f187c5eee5ff67a220e87bd1e1f57bba4d7
 DIST thunderbird-115.13.0.source.tar.xz 536438476 BLAKE2B 7c6af03008a39a4a35052097b94cef79c3c8f8128c9cbcd5ed4f85ca88c1e67ef0f8b63168766cf9839c50e8d5ae1473d4aecad9e3b24cc1f46516fc4d55766a SHA512 98ee23f684aa7a166878459a6a217bf3bcc4ddd8fa8ebbd0a1d2d66392ec1ebff67dbad55d145cdd0771539f127d91c4137211cf4efc80e450e6a34c95e8529c
 EBUILD thunderbird-115.12.1.ebuild 39750 BLAKE2B 12e5fb761b631ce6c8d3b2b847b774578eefd67bcfea63a4eb3c9d5683a0d1ce62a0a58f12e025d42f9038c9fdb9660ee17efd62dc37c89bb53d961a9c9de5e1 SHA512 190e8171902c90f31995f572db7f2396d6595106bfd178190e4f46a5a50d58142e5fc465e4039ec5d727edd39c059b0fdf1232f2784576bdfb5cc7f7cd712380
-EBUILD thunderbird-115.13.0.ebuild 39752 BLAKE2B eb508e4637904eb1c8a59563f3aa8127944c1efeb61397d6457ba8c348a9ccded7d0a5fdceef7df0386461d5cd0ada37504d7be539abc95394d85a25b689e839 SHA512 0d2b36a10691d6349495f4a4e761fde386ec4e85161668ebe7d53e5c9a7f8c6e9ee23f33164153268b086609a25e153aeb8cea09e5bdb0ce382add1cbb961b27
+EBUILD thunderbird-115.13.0.ebuild 39750 BLAKE2B 12e5fb761b631ce6c8d3b2b847b774578eefd67bcfea63a4eb3c9d5683a0d1ce62a0a58f12e025d42f9038c9fdb9660ee17efd62dc37c89bb53d961a9c9de5e1 SHA512 190e8171902c90f31995f572db7f2396d6595106bfd178190e4f46a5a50d58142e5fc465e4039ec5d727edd39c059b0fdf1232f2784576bdfb5cc7f7cd712380
 MISC metadata.xml 2387 BLAKE2B 3602296d8cca60f79ea66089332dbce63b9da3625e476659e0a663966e65bc060e67b263c8fdcdbf8fa5545adf7b8f958cc36f9011459c715ee31bb494e7ce5e SHA512 e51ee84ed715cba36beb240db27265ac37b8df684c0e98f3b81ccf7785c1f465f1bbe3729c1c01717445e787129b449c009815f62a7455ea3fc4db8d1d9e82c3
diff --git a/mail-client/thunderbird/thunderbird-115.13.0.ebuild b/mail-client/thunderbird/thunderbird-115.13.0.ebuild
index ab8e6c458cab..a866aecacfb0 100644
--- a/mail-client/thunderbird/thunderbird-115.13.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-115.13.0.ebuild
@@ -57,7 +57,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="https://www.thunderbird.net/"
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index b4b886000696..f3641fcc9048 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/symbols-nerd-font/Manifest b/media-fonts/symbols-nerd-font/Manifest
index 91943f736d45..edfab6bd499e 100644
--- a/media-fonts/symbols-nerd-font/Manifest
+++ b/media-fonts/symbols-nerd-font/Manifest
@@ -1,3 +1,3 @@
 DIST symbols-nerd-font-3.2.1.zip 2459998 BLAKE2B f13ca414ebe7b49c3c2e5c02b276c4617b76fa34e4a7cccaf7b055fa5b903a2eb55a4f491c0afb0ae14694190f59275bfe8179e60a20f0b4667014454a43d4c8 SHA512 a9aa8b0a5eafe1e04205e824e48c175d63c2e2a15d5cd8441e37603a71d9698efe3cb0f4490e9ce899333d4a2bc3764ca417a9ce93d3120a61c1dcb6f0eace27
-EBUILD symbols-nerd-font-3.2.1.ebuild 961 BLAKE2B d01138be4445f0deda248ffd8766cee0e5b0678a275edd5a51c79dce752322d8bae711d38a50704d30af702af03c7cabd7b75419dcc1191a44657febc70f9bc8 SHA512 8f2d91964b7a01dd293b3c11060632af8fd6f9f7006f77fe255325bfd948b98ddc0a763e0dc84bba25b927b9bb90d09461411ae7737890d973e1b56b3299665b
+EBUILD symbols-nerd-font-3.2.1.ebuild 975 BLAKE2B 47eddaaa902bea9faa4ca5d4ccb58cef4f48068868290129ad806597b30e838776e40cc3d21b5ad79c38ccbbbb030e0c4c8a0df750aad03207edb3bc2cc36848 SHA512 8326cc8d4d9fc24415398306d3f318632c222fe2618a4e89b2771350778cc5be3949b8ad6d93963a61b27b8d8411259ef7468e6d1777dc2d9234271548142536
 MISC metadata.xml 355 BLAKE2B 0959870a3cb0fb59ce57cb336f1ff408c3f9673b578185cecadb5a9a398d5be73196a7bc46304cd8eeb3303c7952bcd298d045e3665f00f35ae1e6c868529f9d SHA512 6401836bf08aff3b319eaca774a33242b95768ed25df1207341d27164d81950ba7072be8451ebdcf43f7c3c49f7f408923a37faff202c6f52c22b119b6cccc5a
diff --git a/media-fonts/symbols-nerd-font/symbols-nerd-font-3.2.1.ebuild b/media-fonts/symbols-nerd-font/symbols-nerd-font-3.2.1.ebuild
index 939ff41621da..b34c8ab39fa4 100644
--- a/media-fonts/symbols-nerd-font/symbols-nerd-font-3.2.1.ebuild
+++ b/media-fonts/symbols-nerd-font/symbols-nerd-font-3.2.1.ebuild
@@ -4,8 +4,8 @@
 EAPI=8
 
 # Note: no interest in supporting building or packaging the full suite of
-# fonts, only quickly added because x11-terms/kitty requires it -- if want
-# more, feel free to take over maintenance and re-arrange.
+# fonts, only quickly added because x11-terms/kitty requires it -- if a
+# Gentoo dev wants more, feel free to take over maintenance and re-arrange.
 
 FONT_SUFFIX=ttf
 inherit font
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 334b8365a9bd..6cf8859ad22d 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index 56de8953e997..0c511318e1db 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -1,7 +1,7 @@
 AUX scrot-1.7.bash-completion 2622 BLAKE2B febdade3f2b5cb094d9162e66d3b0d0b8ad72659e33ca9b6c55c4888ef3122c8f16430cc5f74d32367ea7a74905e3c8c49e9570d996c1324ffd9b72f42e9f534 SHA512 c0a6ac7347164e007eef219b567a554b5aac91c4afdc585d2ed299f46880a46343e3aef83ad8fe50e090ed8521ca241b7e3661a59511064a43164fbe366e1ebb
 DIST scrot-1.10.tar.bz2 156519 BLAKE2B ca1441823521d14559afe49ed36853bb5448cc5c2ee345ddb617324b63e8f599678cbdc94b862938017a62d2f5ceea3cae03f80e473e86cafc76dd34144d41bb SHA512 7a72b6d7ae350b0ec27b949934ff67cb8800f731f3dfc783bfdf66c4316b318118b8b46d98aca05543144b757c659791f4a9aeae43364277501238a405eda57d
-DIST scrot-1.9.tar.bz2 158710 BLAKE2B d823c0875a260ee9741e1c9038fe743e69d0afa83220448857d109dd3ebad9977f07871b25c6a4a979efdf2abd246a2facec91c5b0af01c47307dc6266c801d3 SHA512 ace3bcb26ecebc5bb139a6e011a562287be8f676f21211b540dd937ab2d4487047d3565d0aec84e099bd2c5c9b037d9044924b031f930dc45a3040df399a3312
+DIST scrot-1.11.1.tar.bz2 158007 BLAKE2B e0c8f166444bfdfbed41a5588036b861973c90d057e302f7bd35cf9630a9f0311735977632ba068c1b3542baed251a3d682da7d8f56c114880a425b3056a0692 SHA512 6a6435c6e0562a367d895f2d1c7a03b050f6588a5843376c5e33a5b8ef1b0b684390530f8c61c340b3f0928caeefb95d9df1f8fe0b145768c336685b1c8d8deb
 EBUILD scrot-1.10.ebuild 1388 BLAKE2B e99af4ac52022803494f6ae62b004b8a3bb0c40c72300905908e759829ec222a3ce4c24213d3707e3e52664736df01ec120b0813363cd93ac7a25bd6db382042 SHA512 bef2cc2eba090e3a3b9549c7bd464784a1dc0c1ca7fd0b1b9b38de2a15407be66e6953859014ee15b292dec8b91ea37ce0e9c21b33c8a14256e5c32c2d23fa7b
-EBUILD scrot-1.9.ebuild 1388 BLAKE2B e99af4ac52022803494f6ae62b004b8a3bb0c40c72300905908e759829ec222a3ce4c24213d3707e3e52664736df01ec120b0813363cd93ac7a25bd6db382042 SHA512 bef2cc2eba090e3a3b9549c7bd464784a1dc0c1ca7fd0b1b9b38de2a15407be66e6953859014ee15b292dec8b91ea37ce0e9c21b33c8a14256e5c32c2d23fa7b
-EBUILD scrot-9999.ebuild 1395 BLAKE2B 7b42b90681e7bdb83ad6a5f649a4ebdd5abbf9a0c2375ca2a3ebca58f17b9c3be315401a0ed97db0b39796b8de15db60b8f82f835f2c42bc604f013588a53677 SHA512 4f14e20b0a6d94a2fcd4d1bdbc7be578e3a8860f5442facf8225abd43f1bc420b23ed600a22a34cc982ef9084ba14b94eb0c27598e2f70c6259df3502b6e8be3
+EBUILD scrot-1.11.1.ebuild 1406 BLAKE2B 0e905c915114d19fb62db734ecd30c0e98c442bd2e11535b7ba7f210d18d439cc6b108666ceb3c895cccd24960ec9ad50d2ac17585ce3596a1af2e8ce6a581ce SHA512 cea86dab25f83a013a209be9bb16bbadcfb0b5d50bd67d9eedd13a22ec40d824ef0462a0738464a35d164d684aba8a8d7a2b72edfa091db25632eaaa94df2381
+EBUILD scrot-9999.ebuild 1406 BLAKE2B 0e905c915114d19fb62db734ecd30c0e98c442bd2e11535b7ba7f210d18d439cc6b108666ceb3c895cccd24960ec9ad50d2ac17585ce3596a1af2e8ce6a581ce SHA512 cea86dab25f83a013a209be9bb16bbadcfb0b5d50bd67d9eedd13a22ec40d824ef0462a0738464a35d164d684aba8a8d7a2b72edfa091db25632eaaa94df2381
 MISC metadata.xml 486 BLAKE2B 49d843df52a3129520dc7f99058e4632bd2bef1239ae14f4ff49e315bb5d11536a2f384845c87ad69e9dcd1ccd363009f4d9b4b5d862aca69d59e5f6490573c9 SHA512 56297474babfd15627050a5d5e4ac885dcd6a9f9d861e708877c280b23251680700e006d58edf384d412df56b97ffaa5dc8d55ab1dedd34a9e4d3af1ed63980f
diff --git a/media-gfx/scrot/scrot-1.9.ebuild b/media-gfx/scrot/scrot-1.11.1.ebuild
index 81c77df2463a..d383d2bfa6bc 100644
--- a/media-gfx/scrot/scrot-1.9.ebuild
+++ b/media-gfx/scrot/scrot-1.11.1.ebuild
@@ -3,16 +3,17 @@
 
 EAPI=8
 
-inherit bash-completion-r1
+inherit shell-completion
 
 DESCRIPTION="Screen capture utility using imlib2 library"
 HOMEPAGE="https://github.com/resurrecting-open-source-projects/scrot"
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/resurrecting-open-source-projects/${PN}"
 	inherit autotools git-r3
+	LIVE_BDEPEND="dev-build/autoconf-archive"
 else
 	SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="feh"
@@ -34,15 +35,14 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
-	elibc_musl? ( sys-libs/queue-standalone )
 "
 BDEPEND="
-	dev-build/autoconf-archive
+	${LIVE_BDEPEND}
 	virtual/pkgconfig
 "
 
 DOCS=(
-	AUTHORS ChangeLog README.md
+	AUTHORS ChangeLog README.md FAQ.md
 )
 
 src_prepare() {
@@ -54,5 +54,6 @@ src_prepare() {
 src_install() {
 	default
 
-	newbashcomp "${FILESDIR}"/${PN}-1.7.bash-completion ${PN}
+	dozshcomp  etc/zsh-completion/_scrot
+	dobashcomp etc/bash-completion/scrot
 }
diff --git a/media-gfx/scrot/scrot-9999.ebuild b/media-gfx/scrot/scrot-9999.ebuild
index 092a65896df9..d383d2bfa6bc 100644
--- a/media-gfx/scrot/scrot-9999.ebuild
+++ b/media-gfx/scrot/scrot-9999.ebuild
@@ -3,13 +3,14 @@
 
 EAPI=8
 
-inherit bash-completion-r1
+inherit shell-completion
 
 DESCRIPTION="Screen capture utility using imlib2 library"
 HOMEPAGE="https://github.com/resurrecting-open-source-projects/scrot"
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/resurrecting-open-source-projects/${PN}"
 	inherit autotools git-r3
+	LIVE_BDEPEND="dev-build/autoconf-archive"
 else
 	SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/releases/download/${PV}/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
@@ -34,15 +35,14 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
-	elibc_musl? ( sys-libs/queue-standalone )
 "
 BDEPEND="
-	dev-build/autoconf-archive
+	${LIVE_BDEPEND}
 	virtual/pkgconfig
 "
 
 DOCS=(
-	AUTHORS ChangeLog README.md
+	AUTHORS ChangeLog README.md FAQ.md
 )
 
 src_prepare() {
@@ -54,5 +54,6 @@ src_prepare() {
 src_install() {
 	default
 
-	newbashcomp "${FILESDIR}"/${PN}-1.7.bash-completion ${PN}
+	dozshcomp  etc/zsh-completion/_scrot
+	dobashcomp etc/bash-completion/scrot
 }
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index a60c09120518..10e0bbb1e7a5 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -5,8 +5,11 @@ AUX xv-3.10a-libpng15-r1.patch 16530 BLAKE2B 6233c9e49f021ba3e62f9a5e9da4e360126
 AUX xv-3.10a-osx-bsd-20070520.patch 1497 BLAKE2B 1dcd54c8de29b9552a50069e627fd9dbbd327a22a8e18a12f260c1aaec2978b536cbdc571d47f17cca3f477dd574730dca7748532e6ed41f4697fa76774d5384 SHA512 a6f1160c0658ae4f3394cf2bb0b324392593010539ac2dd52176a587c41844cd5bca61823af31633d765f3399a9cb52e0296f894a2f08060ef4c2b4d687d8b51
 AUX xv-3.10a-vdcomp-osx-20070520.patch 455 BLAKE2B fa6cfa3657f74da7254cce5e73140c2a82614df2398a66e98c57d3056b1f574fbe80b9bce925f2f0988133596fdc4ea5c580371613a23a0283e9b09343a700a9 SHA512 8e389040ae3ac52dd086fbc1858699ea4bef417053952766a5569aab4ec70dbbd674a4e26adbc9434c0b411754d9643064d4254e72fbc79f99d3aefaf35f997b
 AUX xv-3.10a-wformat-security.patch 519 BLAKE2B 7b0ba8ee6dc33af787040e72fdfd4cf1d638dd556ff30c60c5983f6e8158fa63b49a66c97c919bdac5084c766df2b9587597c4f103fff3e2718cff8a006c1c05 SHA512 7e1150fdda9359e7b105729c92b8059bf5c762d468bcdaeadbb91ed75c2517b0ad627784a7a6f2bb8f7857884dc47f2d41c7c7247824fa4af8533dc023ceea52
+AUX xv-5.2.0-osx-bsd.patch 2103 BLAKE2B f12287becac8bfa5227523677c6118816f9dd43fd8b41c400dd6695ea4b6c610bc713f6ffdd9d2d75f8bd2b4de1f228c5349f71d3b8f7c77f10c01ac30b77301 SHA512 e2b6673d202b20a9d88dfd7711e63f702a67de7ca56de049ab27803a76b8833745ba1057ffbc53b246d077e870bce44746d28b1ced0eca31d4d9746c2a3fe57f
 DIST xv-3.10a-jumbo-patches-20070520.tar.gz 1363802 BLAKE2B 1a9f77b950dfa817aa861d9b2b6898d6e378b4a61a57c746a8822793a8e11e54165faf859e073ef99c9fbea5aa0c4c8caa4608ef03f553003b779a4bf59c3ab6 SHA512 e2ac5a3b4d743bf142c162b00815dd9d8dcaf345d0649016b2c6441fe2329879471b19453808e677c1a0b8eeb3468295dba160b1f30eacb2a7a9d8524ce03e75
 DIST xv-3.10a.png.bz2 3082 BLAKE2B 05f56053fc0a77bba155db306ae181f5404bced3b2c22a33b3a0a0750b84461ffec98934d3dbabd764fbb6ec95ce2851f4cf3959682a315fe6e6653cbaaa5ae4 SHA512 41e81c34e74a034292c2a8f525d1452614a2b42e980a1a2c93e3fcf990db528853d633496815e5fb2c897a780a2da171af590f436e2c7ef181eea00eb6922e9b
 DIST xv-3.10a.tar.gz 2259124 BLAKE2B 42cea578a879c819be8f42ffb1d247643904d8b462a4d6faa208185e49566798605c89006cbc190725fa6356b87da3375cf04d2ba86b559419cf8f7471c867e5 SHA512 5b8c5890503e2796638921cabae8967e458c73e332acea8561b1025ed13c771bc44c0e309b4592852e33726eeaa9784f933d1312073b0ba2e0b8c0cedabcaa3f
+DIST xv-5.2.0.tar.gz 4785784 BLAKE2B 46dc637cbbeabfe1c034c34e73040de6efebbf5f423fe429028ebfeefd2fce5af0fdaff1c52db4807b8eb88de89dae6b7f0e2c8a3522a3d9b103d5777783a52d SHA512 0af7ff6db152be849c27be9fba116513595deeca9e3eb42ec6fd74a4756d0c525b55a40de49aa37dd5d2ea4a29e6d644c8c4c709f0e1ec0a98cbc0ae7221b110
 EBUILD xv-3.10a-r22.ebuild 2555 BLAKE2B 92911c150ebbbafeb7001347c864bd6579c96e92de3bff55349b10da50261fc57a48bac74ae8d3023e2c3a6318c1c774203575f784442eb8657841f18b189c20 SHA512 c8db57ebd0e1ad53ad0013e57874975176356d8d6bc1f3ce6e701a715d1703f85e9472e51716a75e76687e41bbbaa60be82958c7b0f742e061af632e70f4e406
-MISC metadata.xml 250 BLAKE2B 699d6b9629cb9e0fac6509f4eec3bd2a175002f57ddadb07c2041b583ac4fd57e8cf78506850997f3a140201cbe4bbbab49a768634a50aba337e0e72630eb4b2 SHA512 efce6490cf2258fec1a8f6c77dc22583376cc0adb5aa1f862b88beccc82a7492d12addd2276a58c0a14810a3b02d9750f8ad3f28ffa74d858a86f204e8c9ab01
+EBUILD xv-5.2.0.ebuild 1219 BLAKE2B c7940a9a3e31bb4d378fa4c6c10146f78f680369b52accfb5c9e11c8cc1677a051fa3304ed1f45f0d91e65631a3d3b63d3897ffdfbc8acd3dc3cbb3a456eaa7b SHA512 6ce89b469662565b4956c5696402c99a2202cdda3ed1da33b1359663973b27ef381a4b7f92ea9915e89b75a945b6019264ea8f4c7eab8bd8bfad9beaad157f4d
+MISC metadata.xml 392 BLAKE2B e1e306f8f6bd480912d6e45b5af362d54900117ae05a21995023e6611c1410af6682af867150179ecebd9d319a9f9810723dffec59a26e3f9f9ecc0a56061127 SHA512 e8aad6d1b24943fc3aeb6533fb0dc048ea0d3edc04abe2efa9a27930698ff3ddb0185dc3a2da69e08c050c4545d907c8580add6732fd8e3258ed496784902364
diff --git a/media-gfx/xv/files/xv-5.2.0-osx-bsd.patch b/media-gfx/xv/files/xv-5.2.0-osx-bsd.patch
new file mode 100644
index 000000000000..27059386446d
--- /dev/null
+++ b/media-gfx/xv/files/xv-5.2.0-osx-bsd.patch
@@ -0,0 +1,51 @@
+diff '--color=auto' -ur a/src/vdcomp.c b/src/vdcomp.c
+--- a/src/vdcomp.c	2024-07-17 09:37:04.957769272 -0500
++++ b/src/vdcomp.c	2024-07-17 09:44:30.582594953 -0500
+@@ -130,6 +130,8 @@
+ 
+ #    if defined(hp300) || defined(hp800) || defined(NeXT)
+ #      include <sys/malloc.h>    /* it's in "sys" on HPs and NeXT */
++#    elif defined(__APPLE__)
++#      include <malloc/malloc.h>
+ #    else
+ #      include <malloc.h>        /* FIXME: should explicitly list systems that NEED this, not everyone that doesn't */
+ #    endif
+diff '--color=auto' -ur a/src/xv.h b/src/xv.h
+--- a/src/xv.h	2024-07-17 09:37:04.957769272 -0500
++++ b/src/xv.h	2024-07-17 09:41:42.912041683 -0500
+@@ -183,7 +183,7 @@
+ 
+ #ifndef VMS
+ #  include <errno.h>
+-#  ifndef __NetBSD__
++#  if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__APPLE__)
+ #    if !(defined(__GLIBC__) && __GLIBC__ >= 2) && !defined(__OpenBSD__)
+        extern int   errno;         /* SHOULD be in errno.h, but often isn't */
+ #      ifndef XV_HAVE_SYSERRLISTDECL
+@@ -199,7 +199,7 @@
+ #  ifdef VMS
+ #    define ERRSTR(x) strerror(x, vaxc$errno)
+ #  else
+-#    if defined(__BEOS__) || defined(__linux__) /* or all modern/glibc systems? */
++#    if defined(__BEOS__) || defined(__linux__) || defined(__APPLE__) /* or all modern/glibc systems? */
+ #      define ERRSTR(x) strerror(x)
+ #    else
+ #      define ERRSTR(x) sys_errlist[x]
+@@ -236,6 +236,8 @@
+ #ifdef NEED_MALLOC_H
+ #  if defined(hp300) || defined(hp800) || defined(NeXT)
+ #    include <sys/malloc.h>    /* it's in "sys" on HPs and NeXT */
++#  elif defined(__APPLE__)
++#   include <malloc/malloc.h>
+ #  else
+ #    include <malloc.h>
+ #  endif
+@@ -399,7 +401,7 @@
+  *                them later. */
+ #ifndef VMS       /* VMS hates multi-line definitions */
+ #  if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
+-      defined(__bsdi__)
++      defined(__FreeBSD__) || defined(__bsdi__) || defined(__APPLE__)
+ #    ifndef USE_MKSTEMP
+ #      define USE_MKSTEMP       /* use 'mkstemp()' instead of 'mktemp()' */
+ #    endif                      /* >> SECURITY ISSUE << */
diff --git a/media-gfx/xv/metadata.xml b/media-gfx/xv/metadata.xml
index 03458a5affcb..6f2f9f849997 100644
--- a/media-gfx/xv/metadata.xml
+++ b/media-gfx/xv/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>bkohler@gentoo.org</email>
+    <name>Ben Kohler</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">png-mng</remote-id>
+    <remote-id type="github">jasper-software/xv</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-gfx/xv/xv-5.2.0.ebuild b/media-gfx/xv/xv-5.2.0.ebuild
new file mode 100644
index 000000000000..49af68754450
--- /dev/null
+++ b/media-gfx/xv/xv-5.2.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop
+
+JUMBOV=20070520
+DESCRIPTION="Interactive image manipulation program supporting a wide variety of formats"
+HOMEPAGE="https://github.com/jasper-software/xv/"
+SRC_URI="https://github.com/jasper-software/xv/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	mirror://gentoo/xv-3.10a.png.bz2"
+
+LICENSE="xv"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="jpeg tiff png webp"
+
+DEPEND="
+	x11-libs/libXt
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	tiff? ( media-libs/tiff:= )
+	png? (
+		>=media-libs/libpng-1.2:=
+		sys-libs/zlib
+	)
+	webp? ( media-libs/libwebp:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/xv-5.2.0-osx-bsd.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DXV_ENABLE_JPEG=$(usex jpeg)
+		-DXV_ENABLE_JP2K=OFF
+		-DXV_ENABLE_PNG=$(usex png)
+		-DXV_ENABLE_TIFF=$(usex tiff)
+		-DXV_ENABLE_WEBP=$(usex webp)
+		)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newicon "${WORKDIR}"/xv-3.10a.png ${PN}.png
+	make_desktop_entry xv "" "" "Graphics;Viewer"
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index df397e7a6d50..e67d08cfc756 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libshumate/Manifest b/media-libs/libshumate/Manifest
index 094db70df91b..8800af90402f 100644
--- a/media-libs/libshumate/Manifest
+++ b/media-libs/libshumate/Manifest
@@ -1,5 +1,7 @@
 DIST libshumate-1.1.3.tar.xz 299644 BLAKE2B f07a583e1fd142a0601c725840e84397ed04962f828cbc15217dcdc0d767015664a06252879416e9422cb32154406dae2742ffb511404c5923ce9acab7efae0c SHA512 163cce5c9aca2f3c52da3ecb3b4a651798e314d38a145ed4c69b0510303c72a0934c24084036ca2dfaab8b008753a37f7116b0bd2907cddc78a2aceee4f847d2
 DIST libshumate-1.1.4.tar.xz 299700 BLAKE2B 1f60b0807d99c8ea675be2ca85ada1929c51aa1a5f27bb5565ddba062626c4bde447f95ad4b7e02b6d3f57af1365501e64b5bca18dc566b3bf0ae1f47d5c638f SHA512 f2bb90255a43fbdf9b17bd69260c9054378959900adbc26db9b7417f98595f1d5c9221db4f31b78a546f7bd30d95175f4210fc7db11db6704d7de4c9ad000619
+DIST libshumate-1.2.2.tar.xz 321216 BLAKE2B f0f26798fc9a32707d5e669c0af5396ddcdff0bea9f93150f29751ab952f72bfed457f105ea0835d3b31fbb3d66934139e1a6a06e1d056d47bf2f270cc32b23c SHA512 9e1f3f26aa591ac681ccd4613ae921f4e3f3863bacd0a0dc3be56f52749135d6c035535111808d18929d5be2a6461a47739e586f20081f485bb992b4e0a22c3a
 EBUILD libshumate-1.1.3.ebuild 1608 BLAKE2B 7ba44ffb6b282e97b5c25fa9eaeaf09d8ea0448664b8d9e1a3e646f0a4c130af9ff83f5f0fdebcbe3030a80ce0fbff7827f5d2a2085e023bd49172360f6e6353 SHA512 c9f976ad26fdf93d058c64100f9db65fd9f9242fa146a7f551dec1ea5749a22581d2a51518689daf7800ed1be173cc77b5cf88852546c7e2f23c5ae7831c7f0e
 EBUILD libshumate-1.1.4.ebuild 1611 BLAKE2B 5dc2303798124fa9f570b592951c3b7820cde4847c4e7d1d6ae6877c7a811088597bc8fa4e5c40083c487afb38d78035a27c22dfe5c2d532a2329a61a226623a SHA512 25a71dfb501c443f83bc1486bf7fa6532eb04d28401bce4f54bbaae83cfd7d43660ebe2fa7d8e5565590332cd5712f181c8b1a8488080bccf3f3b50a02b8d0f6
+EBUILD libshumate-1.2.2.ebuild 1399 BLAKE2B 007218fb1c6fb00949ba4b63af434f7329f087813f8b3f04b712a2f945d6cda1da0bf8315545e299cae676f2dfe95cf21d402be3c02f1c0900371624ff5c3832 SHA512 7c83e5ba08fbf90b73be399b875c5d83ed7378145a26738f83f4b6762a1c94b2e7e572e0c2ca222e0f6cb21b144cdbfa8faf0ca117327118645b23aa01a5c854
 MISC metadata.xml 445 BLAKE2B 58a069a9ded7b8fab96c93fd3b11e1fd7b4ae4a58966f5bbeedb560547005a56f62167bc31aa5c05ca68f1855e12c2d915825922d5b6504e359893e0786579a5 SHA512 3e5352258641f4a9e6722777971cc3fb02359e831708c1749f2d77c7b15d147adbf54097d311435f5220cd49bab9e298b3379f4a59c0f4563a6706f608343299
diff --git a/media-libs/libshumate/libshumate-1.2.2.ebuild b/media-libs/libshumate/libshumate-1.2.2.ebuild
new file mode 100644
index 000000000000..425d110b1dd0
--- /dev/null
+++ b/media-libs/libshumate/libshumate-1.2.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson vala virtualx
+
+DESCRIPTION="Shumate is a GTK toolkit providing widgets for embedded maps"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libshumate"
+
+LICENSE="LGPL-2.1+"
+SLOT="1.0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+REQUIRED_USE="gtk-doc? ( introspection )"
+
+IUSE="gtk-doc +introspection sysprof vala"
+
+RDEPEND="
+	>=dev-libs/glib-2.74.0:2
+	>=x11-libs/cairo-1.4
+	>=dev-db/sqlite-1.12:3
+	>=gui-libs/gtk-4:4
+	>=net-libs/libsoup-3.0:3.0
+	introspection? ( >=dev-libs/gobject-introspection-0.6.3:= )
+	>=dev-libs/json-glib-1.6.0[introspection?]
+	dev-libs/protobuf-c
+"
+DEPEND="${RDEPEND}
+	sysprof? ( dev-util/sysprof-capture:4 )
+"
+BDEPEND="
+	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
+	vala? ( $(vala_depend) )
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection gir)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+		-Ddemos=false # only built, not installed
+		-Dvector_renderer=true
+		$(meson_feature sysprof)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+src_install() {
+	meson_src_install
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html || die
+		mv "${ED}"/usr/share/doc/libshumate-1.0 "${ED}"/usr/share/gtk-doc/html/libshumate-1.0 || die
+	fi
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 6e2de5b0132f..268baebb5699 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -7,6 +7,6 @@ DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d7
 DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
 EBUILD mesa-24.0.9.ebuild 11904 BLAKE2B fbd74015635daad6ced24491c05e077b2617f42b154f208eba92c3f880bc2381e57db3287d1b5c6c129924e6a8476812ef8883ddbd1509b4b2206d1a58f8317e SHA512 a25ecf8382dd350d306ada954e54a049a9a61d95afd65c16ef378538a44ba532ea893a3212835758871c782502598fb5a533a5f7fe0e49f155f836c24679fcac
-EBUILD mesa-24.1.3.ebuild 13739 BLAKE2B 23b5b302962a028676b753f1bf71b85986445e64540e4c702969e4c2045d7994ffa7e6424ed87b02406c9d300f29383df54eb397eec452e0714c827e9b7b3c05 SHA512 ad37b061d392cfe67d8fcefa82ebed2634bc5f0ae61f6b4f84193ffa9c866f10abd7ab7f915fee381c36643b88b1c6cdbb0ee40dd3f7a25fe0502caf07140309
+EBUILD mesa-24.1.3.ebuild 13735 BLAKE2B d817851aa4330333e2ea82f427a2f45216e7e030f016f2adce629a489ff5c04fe9a9ea79937e7ed3bbcf718c2566211ab025cfdadae971c49dba5cad776d70fa SHA512 76a85df36495adb5588ab231b061d39223cc3cfb189894a8839d796668eca62e088e30386dcd3001232e34711db6d4d26d99c41b664551936be90f7db0a5a095
 EBUILD mesa-9999.ebuild 13739 BLAKE2B 23b5b302962a028676b753f1bf71b85986445e64540e4c702969e4c2045d7994ffa7e6424ed87b02406c9d300f29383df54eb397eec452e0714c827e9b7b3c05 SHA512 ad37b061d392cfe67d8fcefa82ebed2634bc5f0ae61f6b4f84193ffa9c866f10abd7ab7f915fee381c36643b88b1c6cdbb0ee40dd3f7a25fe0502caf07140309
 MISC metadata.xml 1435 BLAKE2B 53690878512b86ce0b8dce38b083684c85ad5c1a655d5a69cb3265e156869845263eb16f271691b66c9f0cd76e97b56908acf7a1792d6abac0ec99447826cbb5 SHA512 842106e5d6eb60ff33c8cae7f0d52983c4f7e104152718b50fc790cbcb2506551a6fc7841fe8e3c7963850c238f77505b0e49b10a3a936baf459e1acaf73e07f
diff --git a/media-libs/mesa/mesa-24.1.3.ebuild b/media-libs/mesa/mesa-24.1.3.ebuild
index 9a583c95d8ec..af31d00a89a8 100644
--- a/media-libs/mesa/mesa-24.1.3.ebuild
+++ b/media-libs/mesa/mesa-24.1.3.ebuild
@@ -32,7 +32,7 @@ else
 	SRC_URI="
 		https://archive.mesa3d.org/${MY_P}.tar.xz
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 fi
 
 # This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 7e8ecefa4252..569c5c42d144 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index b7cb73eeeaf0..3ebb59f5da4e 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-music-45.1.tar.xz 1666152 BLAKE2B 27403070735003df5d907fae2675b67f5b907e10e55e2ed3b31e369e146c03a2d7c95371092043862d83968fc45131ddb7643e34634b0a98d686402fdf676118 SHA512 6cc123eda769d524e5c215c7167248b15ac21fd99a1ac385069c8bac8a03652d458460438adec5853daf329f61d70339f5765b938badc862151b655ba64a80cf
+DIST gnome-music-46.0.tar.xz 1667376 BLAKE2B b8eff0b4b1815af7e29b09be066f2415b1c41fb7724564d7724aefc8804b51ed1f26022f3b5d2d4be640980ddb2446f557a6861b57a020ff119aadb1b37e9809 SHA512 f0fc16029c9e7dc2f9824604ac81b5c3d6f4165878f8558e6a1372ae1a6188d9bfc100f658897a37db7f1250d6b3c50154aee75225d3bb333749fa3176751b14
 EBUILD gnome-music-45.1.ebuild 1859 BLAKE2B d6fa7efe5ed942144f001da61e5d4a245a9663d4f8b9938ca99e2e626b73e2bc97083749b9fe75a6f355e09d86592cb1c1046ce2fb60cbb0de005f416b2bfcf7 SHA512 251f75405b129ef2d8f8151581dba351ccfac7b58c1ef56ebc548f0e2128a023917d709fdbb76ec52627329b0ddd90e4b2ef1795dcf2ebdf6e103b40f25958fb
+EBUILD gnome-music-46.0.ebuild 1807 BLAKE2B 714d2c1bed13e60790cd4f93029f41e26e479c4d043047241669cab0c422c27b730331bd2748736e60477ae15499ae2cc9404960cfee763e69c59cdbc82ff560 SHA512 4f4a79a7a9766668913784b139f349fccf24a7eedaa80f193bf599df7c625f57d460dc196d46094da2de5bde6350a6f79ddc307ff92c6ad9923fb3c808a1076e
 MISC metadata.xml 352 BLAKE2B 8f9983c2cfeccb1a920be308931a9eef0700560f7c7a249fbf0a8d450467d77b670c6de9e3a3ef470933fd10a4e9190314c7a98470064addef7667dc2d19c92e SHA512 eaa3bfbb8fb4078c94f9b0300d3574345138899056cb3e9ba114448728f347a0cbdc45aea2b3501bb85dc459eeccc4e2f1f56212a4982d99d9113732bc17998c
diff --git a/media-sound/gnome-music/gnome-music-46.0.ebuild b/media-sound/gnome-music/gnome-music-46.0.ebuild
new file mode 100644
index 000000000000..9ee0df80f6cd
--- /dev/null
+++ b/media-sound/gnome-music/gnome-music-46.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{11..12} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="Music management for Gnome"
+HOMEPAGE="https://apps.gnome.org/Music/ https://gitlab.gnome.org/GNOME/gnome-music/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/gobject-introspection-1.54:=
+	>=gui-libs/gtk-4.10.0:4[introspection]
+	>=gui-libs/libadwaita-1.5_beta:1=[introspection]
+	>=media-libs/libmediaart-1.9.1:2.0[introspection]
+	net-libs/libsoup:3.0[introspection]
+	app-misc/tracker:3=[introspection(+)]
+	>=x11-libs/pango-1.44:=
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.47.0:3[cairo,${PYTHON_USEDEP}]
+		>=dev-python/pycairo-1.14.0[${PYTHON_USEDEP}]
+	')
+	>=media-libs/grilo-0.3.15-r1:0.3[introspection]
+	>=media-plugins/grilo-plugins-0.3.16:0.3[tracker]
+"
+# xdg-user-dirs-update needs to be there to create needed dirs
+# https://bugzilla.gnome.org/show_bug.cgi?id=731613
+RDEPEND="${DEPEND}
+	|| (
+		app-misc/tracker-miners:3[gstreamer]
+		app-misc/tracker-miners:3[ffmpeg]
+	)
+	x11-libs/libnotify[introspection]
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/grilo-plugins:0.3[tracker]
+	x11-misc/xdg-user-dirs
+"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${D}"/usr/bin/gnome-music
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 60b11350e3ed..8be65d725037 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,7 +1,4 @@
-AUX ncmpcpp-taglib-pc.patch 1582 BLAKE2B 1997e7dc25c6a36ad108003d7b6b23e5eed894fb795c43f2ec1ec877ebc9d4ec6219aa0622f3ebab6e1af71567c25b5c3b2a2173031ec2c344112e33f71c0e1b SHA512 f0e1f482d5e6a3a7d835ac5de2a3bf2f58e327d6c5c6dfce8f34fff960a6602b921db8b1a2fee5dbccdb732bebdb2f363fb9b185dcdee7a861f1a00a2adaf09c
-DIST ncmpcpp-0.9.2.tar.bz2 486266 BLAKE2B 160597493b93bac790b8619881e8a1fcf0efce4a538e35f54f31b06f3ed66691f02b37198cca46b475b7296aebbc864cb62a4398c60bd1e43907f9907a9bc118 SHA512 bbcb3b50233e363412af3c1cf1c0118122733dc376759cd35dee79950f42e098a0402ff670684df91847b990b26022630c9a71192e462bd46e70628e31489742
 DIST ncmpcpp-0.9.2_p20221231.gh.tar.gz 229678 BLAKE2B edb03554a14b90fbb5a4c99cb46ed73ffd702ff2fa417765d4e4bdaddd6bc40554f18aae10db81af87bbc8c91a4f966785fefdf43cfc97b18fc950c1aa59a370 SHA512 8affb5115c7531ee005544f002068b0b13b6aa41c5e11213ba8c979373a5328f298612903e531b6d384749469d6fa0ddb0d06ac4dac5ab2ca5485c7814db32a3
-EBUILD ncmpcpp-0.9.2-r3.ebuild 1530 BLAKE2B 11e396d91a64e20797206c3167ee47b9801bdc8de5d2fec6aeca68a883fac019a758c0e23f0514fd9443987a7a275727541e15ae19d3352df4f09f723f154414 SHA512 207b3f33a94c7b23dfc717da041c956fc5397006d8bb2e342b5e01f77aa0f02eaa00b3e024a3470b60bbad58b5ebb4cdb93abeaa306762705c0f8c9da0e14492
-EBUILD ncmpcpp-0.9.2_p20221231.ebuild 1606 BLAKE2B d5b7c2b80db7b2a55ea9d481c6f953754f1f6ed87d941b4ed8546d527a2cd321a331c96dfb552281a5827aa597d2fc0410ad5e40bf96e26be90ba15ec967334a SHA512 5d4500dbd44d4cee4d65eab405538604cdf67df6343422422f1ed5c910c96e83604732a401a4a335159176aa15d16d5f57b846146d8df9f70696ec1f2d1a9756
-EBUILD ncmpcpp-9999.ebuild 1410 BLAKE2B 1aecf9dc70e99d7d56477630d21c2bbe4272e571a60382f48d9e7d4cfb60bdb86ebf7357e1063884bc683c0ac9f5d9a5acb5b89fb69b9e70c26ef2f2c2985f10 SHA512 96d3e4d109862c8c60a455e2a8c09e2961ba5c7707ce42147d93e0fdbe90711d76440adb5ec35c245782225f27c003de3e5e041b640da1f427dc4c0ff932574c
+EBUILD ncmpcpp-0.9.2_p20221231.ebuild 1616 BLAKE2B 3359a58bb1e4037187ca37fb7d9f9ab97c3b1d3dcbd32e087c8e50837d3ea1df8f9aa59b3c783e04f3443c035343f5637f2b2f4e47bc17f3e914bdeed4b50de7 SHA512 42d28c92e5e380ceaa0bd3fe24332153a28d41111d72216040aa528a7e0e7ae74fd297ee5e86250d978727c763bbf26418fd89cb404a958ca02ea823f399b0f6
+EBUILD ncmpcpp-9999.ebuild 1428 BLAKE2B 2c4e043cb89840f4018dfe7bbe6e80d7284d4888f5dd6c65afc73b2d357128e10c48812fb0b38f6c0374c3a0dd40fe2142debc16aabb70bc1b17d09dbffa3881 SHA512 adda232410f3c1451ca394f398181cebe49627f8c9a2b684424e2dfbff5a0dfbf272f941d2405b4e37c911c774943f9b75f1250ca786b763edd7cedc738a0e78
 MISC metadata.xml 1298 BLAKE2B 23fbb704bcb628530ce2b9c2b62ca52bc2bca6f8cc5b99e0941da96236827acff653645073f4711adea29c8b35c74c959a5f36398630d89d5e041d0471a170de SHA512 c5b8a39b31b543afa7f12f79233e174b27b27f8d0813c88e92650c3d9b211f18991750b8eff55b2fd433b13fa49e1f8e764de0c4f92651d1ef652c610678e0a9
diff --git a/media-sound/ncmpcpp/files/ncmpcpp-taglib-pc.patch b/media-sound/ncmpcpp/files/ncmpcpp-taglib-pc.patch
deleted file mode 100644
index 3a3c55e923d9..000000000000
--- a/media-sound/ncmpcpp/files/ncmpcpp-taglib-pc.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 8796a4469795dfb067d02e19ddb3ae380d9b2fc3 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Thu, 10 Nov 2022 23:58:33 +0000
-Subject: [PATCH] Check for taglib with pkg-config before trying taglib-config
-
-Programs like taglib-config are not good when cross-compiling.
----
- configure.ac | 27 +++++++++++++++++++--------
- 1 file changed, 19 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ef0c52b7..193840e6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -257,19 +257,30 @@ PKG_CHECK_MODULES([libcurl], [libcurl], [
- 
- # taglib
- if test "$taglib" != "no" ; then
--	AC_PATH_PROG(TAGLIB_CONFIG, taglib-config)
--	if test "$TAGLIB_CONFIG" != "" ; then
--		CPPFLAGS="$CPPFLAGS `$TAGLIB_CONFIG --cflags`"
--		LIBS="$LIBS `$TAGLIB_CONFIG --libs`"
-+	PKG_CHECK_MODULES([taglib], [taglib], [
-+		AC_SUBST(taglib_CFLAGS)
-+		AC_SUBST(taglib_LIBS)
-+	], [
-+		AC_PATH_PROG([TAGLIB_CONFIG], [taglib-config])
-+		if test "$TAGLIB_CONFIG" != ""; then
-+			taglib_CFLAGS=`$TAGLIB_CONFIG --cflags`
-+			taglib_LIBS=`$TAGLIB_CONFIG --libs`
-+		else
-+			if test "$taglib" = "yes" ; then
-+				AC_MSG_ERROR([could not find taglib.pc or taglib-config executable])
-+			fi
-+		fi
-+	])
-+
-+	if test "$TAGLIB_CONFIG$taglib_LIBS" != "" ; then
-+		CPPFLAGS="$CPPFLAGS $taglib_CFLAGS"
-+		LIBS="$LIBS $taglib_LIBS"
-+
- 		AC_CHECK_HEADERS([taglib.h], ,
- 			if test "$taglib" = "yes" ; then
- 				AC_MSG_ERROR([missing taglib.h header])
- 			fi
- 		)
--	else
--		if test "$taglib" = "yes" ; then
--			AC_MSG_ERROR([taglib-config executable is missing])
--		fi
- 	fi
- fi
- 
--- 
-2.38.1
-
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.9.2-r3.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.9.2-r3.ebuild
deleted file mode 100644
index 88dfc6c7e3b7..000000000000
--- a/media-sound/ncmpcpp/ncmpcpp-0.9.2-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="
-	https://rybczak.net/ncmpcpp/
-	https://github.com/ncmpcpp/ncmpcpp/
-"
-SRC_URI="https://rybczak.net/ncmpcpp/stable/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-IUSE="clock outputs taglib visualizer"
-
-RDEPEND="
-	>=media-libs/libmpdclient-2.1
-	dev-libs/boost:=[icu,nls]
-	dev-libs/icu:=
-	net-misc/curl
-	sys-libs/ncurses:=[unicode(+)]
-	sys-libs/readline:=
-	taglib? ( media-libs/taglib )
-	visualizer? ( sci-libs/fftw:3.0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-taglib-pc.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-
-	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
-	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
-}
-
-src_configure() {
-	# --with-lto only appends -flto
-	econf \
-		$(use_enable clock) \
-		$(use_enable outputs) \
-		$(use_enable visualizer) \
-		--without-lto \
-		$(use_with taglib) \
-		$(use_with visualizer fftw)
-}
-
-src_install() {
-	default
-
-	dodoc doc/{bindings,config}
-}
-
-pkg_postinst() {
-	echo
-	elog "Example configuration files have been installed at"
-	elog "${EROOT}/usr/share/doc/${PF}"
-	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
-	elog "as user configuration files."
-	echo
-	if use visualizer; then
-	elog "If you want to use the visualizer, you need mpd with fifo enabled."
-	echo
-	fi
-}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.9.2_p20221231.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.9.2_p20221231.ebuild
index 4f310241770f..90bf5a5ab81a 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.9.2_p20221231.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.9.2_p20221231.ebuild
@@ -8,8 +8,12 @@ inherit autotools
 NCMPCPP_COMMIT="9f44edf0b1d74da7cefbd498341d59bc52f6043f"
 
 DESCRIPTION="Featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp"
+HOMEPAGE="
+	https://rybczak.net/ncmpcpp/
+	https://github.com/ncmpcpp/ncmpcpp/
+"
 SRC_URI="https://github.com/ncmpcpp/ncmpcpp/archive/${NCMPCPP_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${NCMPCPP_COMMIT}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,9 +21,9 @@ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="clock outputs taglib visualizer"
 
 RDEPEND="
+	>=media-libs/libmpdclient-2.1
 	dev-libs/boost:=[icu,nls]
 	dev-libs/icu:=
-	media-libs/libmpdclient
 	net-misc/curl
 	sys-libs/ncurses:=[unicode(+)]
 	sys-libs/readline:=
@@ -29,8 +33,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}-${NCMPCPP_COMMIT}"
-
 src_prepare() {
 	default
 	eautoreconf
diff --git a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
index 83a7d42906c9..8c02f3f600fe 100644
--- a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools git-r3
 
-DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
+DESCRIPTION="Featureful ncurses based MPD client inspired by ncmpc"
 HOMEPAGE="
 	https://rybczak.net/ncmpcpp/
 	https://github.com/ncmpcpp/ncmpcpp/
 "
 EGIT_REPO_URI="https://github.com/ncmpcpp/ncmpcpp"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 IUSE="clock outputs taglib visualizer"
 
@@ -26,18 +26,15 @@ RDEPEND="
 	taglib? ( media-libs/taglib )
 	visualizer? ( sci-libs/fftw:3.0= )
 "
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
-
-	sed -i -e '/^docdir/d' {,doc/}Makefile.am || die
-	sed -i -e 's|COPYING||g' Makefile.am || die
-
 	eautoreconf
+
+	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
+	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
 }
 
 src_configure() {
@@ -60,7 +57,7 @@ src_install() {
 pkg_postinst() {
 	echo
 	elog "Example configuration files have been installed at"
-	elog "${ROOT}/usr/share/doc/${PF}"
+	elog "${EROOT}/usr/share/doc/${PF}"
 	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
 	elog "as user configuration files."
 	echo
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index fd9c699fe2fa..e160360244cc 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 6c0086e1296d..7dbbe5ff0bda 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 17 Jul 2024 10:40:41 +0000
+Thu, 18 Jul 2024 10:10:47 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index c5354c8fd632..ba9a27763e5d 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 579649 BLAKE2B d1b796ba5c81fee046c2e8c50455a5b776ebdd09dbedb326c8b97fd5a0d51be46e3603ca79b91a71dddcacfb3c0dcbadcc62be2abe02515b84ef69f62cf23d68 SHA512 6c576e78234ac4cfe0606f825efe9766e6c0c6089da4549966b3883ac5df1b6a6d7f6f6061ae2839e5d62620ccb8ae330b1e639ff04bdc50050fb951bed139e2
-TIMESTAMP 2024-07-17T10:40:45Z
+TIMESTAMP 2024-07-18T10:10:51Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmaXn61fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmaY6itfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCPpg//V6Ny7C4TcdCieVTDtZe14MWgPhQEQTJadOfWICMybyaK6Wkdpe/75XR6
-W8r2l3fgRjNfsfgahS4OX60jigxfr2jrLw7i6ZGd67oTOm7ZNyPmrGoidFN99KTa
-dbSWfAt/Vs8QcQ6fFeKORaVsbuaQCBflVBigVif9t3MNcxdIJbgzxoXCN+iFpOZg
-2QOmM/m7PNO9r4o8T2tLzAa41nLuclXa1xOYdoX7TNdxa870hrWUH1mJQF+u9p+t
-a9kYmBDABoDOttBaaK3KXSYZYJ9zbuFVQnxM4ZJF4MYK8G0GuAOu4n0T/aNrSbwy
-yiS7Xw6PQec7S9lwq6/l7m6aEFCCuc4N3x+1XIp87U+WEIy2qGq6GQ8PMQ0Vo1WQ
-jWW9rnJTJJxRZnVUUgJIFUB1OoZYJo7ziSBfvTpatWDlictmmzX9QqLA/0VZXwZU
-O7Af8P3PcvlkgjjppuzoppBnLcoeovSQH4keSWzGNgZoyRE5i06pRyU5Nsh50jjk
-UBdoaijsRi8EhPlbOqwNEoY7xyYSPBzlkGv/bxGO3/jDxmQ/tkDxAnTGoUgcxL36
-twwx/xfB7/SHCHiCpABrYJ1D+MZwNymD7LE8dU25f405E3bHn/P3gxXHzccyWzn8
-uBTt7iYlaiQHKAN+PA1iokTPXFRt6un7S6JU5jl8tlZWbMUYfik=
-=MzaW
+klB6IRAArKTZGJllrxtSDyxxOw0IpCpV5xzEAD4uRu6YczmJyxp7mhg18yM7xD93
+Ynt5ELhRVnzTBBWU/cmEVPCzIGCpzUPISwLSfmVSXKPDFZ/IidJY3MBawkScTogC
+9B3wY5juLn8nj7+FbAASWbaiwaEyoSSB0GEHzxXBL0acvRXf9PMWLB/rU2u3PJsy
+gJqkFKvGPIxt4kH7xU2bmo6VV2n58PBs33PmfELexY4uhnHRoXqb+GqgeMdHPk7l
+S9gkb+VWPTNDCZkf9IIU681j96XEAydCnkn2mvcRDzKfRlgQtq7v6WsjjYNQKfXq
+GwC2C8+QFRF6NxeGAnNaO2x6eP05l335xpafZQ+4QIGNyqYqkx3drKAXENTs3H8M
+S/aDju3VoVg5aBNimSA/GO100IhcNDoRNBnEA/valYof+2vLJZY5whrSGyeQpnn3
+n0l02RzLzvKtet2yMv8p8VTnEFlsckvtTau3C1FQ2lx2ib509U/qeR8MJx3K/K53
+lVRxQaKHVqiEEXWqYAd1dlyj1T4FkMdgqtYp0bQzMyXZh3Xa0kzXLaZEVE+nHa8D
+F3I06kun0n2vPL33xTgA4feJdd71HLyhT0ZpdwCWRYLyVKIasf7dKZ4AfjYvmVgo
+AqcdHgZEVt2hbSXECp0rVsNDWJLRc6b5+/Flca+mXw22Fqh9kiM=
+=WW8s
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 6c0086e1296d..84c046be2def 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 17 Jul 2024 10:40:41 +0000
+Thu, 18 Jul 2024 10:10:48 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index f62d9ca33dbe..d3728a8d17a4 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index e96a81cb379c..bf0eee698b76 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/swtpm-0.9.0 b/metadata/md5-cache/app-crypt/swtpm-0.9.0
new file mode 100644
index 000000000000..9d599e4f3f18
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/swtpm-0.9.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.17-r1:1.17 >=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=fuse? ( dev-libs/glib:2 sys-fs/fuse:0 ) seccomp? ( sys-libs/libseccomp ) acct-group/tss acct-user/tss dev-libs/gmp:= dev-libs/openssl:0= dev-libs/json-glib dev-libs/libtpms dev-libs/libtasn1:= net-libs/gnutls:=[pkcs11,tools] test? ( net-misc/socat dev-tcltk/expect )
+DESCRIPTION=Libtpms-based TPM emulator
+EAPI=8
+HOMEPAGE=https://github.com/stefanberger/swtpm
+INHERIT=autotools python-any-r1
+IUSE=fuse seccomp test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=fuse? ( dev-libs/glib:2 sys-fs/fuse:0 ) seccomp? ( sys-libs/libseccomp ) acct-group/tss acct-user/tss dev-libs/gmp:= dev-libs/openssl:0= dev-libs/json-glib dev-libs/libtpms dev-libs/libtasn1:= net-libs/gnutls:=[pkcs11,tools]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/stefanberger/swtpm/archive/v0.9.0.tar.gz -> swtpm-0.9.0.tar.gz
+_eclasses_=autotools	d12ccbad07b44642a75ac97a3334d8e0	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=a537793b4311c24aa3beefbb2d0d17a0
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 0cebc5f5db8b..9ab6a8f74054 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/bluefish-2.2.15 b/metadata/md5-cache/app-editors/bluefish-2.2.15
index 08dc13a5e6b9..3bfdacf57b8d 100644
--- a/metadata/md5-cache/app-editors/bluefish-2.2.15
+++ b/metadata/md5-cache/app-editors/bluefish-2.2.15
@@ -7,7 +7,7 @@ HOMEPAGE=https://bluefish.openoffice.nl/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools python-single-r1 xdg
 IUSE=gucharmap nls python spell python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-3+
 RDEPEND=sys-libs/zlib x11-libs/gtk+:3 gucharmap? ( gnome-extra/gucharmap:2.90 ) python? ( python_single_target_python3_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 ) ) spell? ( app-text/enchant:2 )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.15.tar.bz2
 _eclasses_=autotools	d12ccbad07b44642a75ac97a3334d8e0	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b28d7ff9ea3a9c09ee021292feea0b97
+_md5_=34f581d2997c017476632778847046f0
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index a644fd2d2897..848056c7a849 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/calcurse-4.8.1-r1 b/metadata/md5-cache/app-office/calcurse-4.8.1-r1
index a870375d9aff..5bc0143c5c93 100644
--- a/metadata/md5-cache/app-office/calcurse-4.8.1-r1
+++ b/metadata/md5-cache/app-office/calcurse-4.8.1-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://calcurse.org/
 INHERIT=python-single-r1
 IUSE=caldav doc python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~amd64 ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc ppc64 x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/timezone-data 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 ) caldav? ( python_single_target_python3_10? ( dev-python/httplib2[python_targets_python3_10(-)] dev-python/pyparsing[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/httplib2[python_targets_python3_11(-)] dev-python/pyparsing[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/httplib2[python_targets_python3_12(-)] dev-python/pyparsing[python_targets_python3_12(-)] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 SLOT=0
 SRC_URI=https://calcurse.org/files/calcurse-4.8.1.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a7a86d12ed57b71c09e8ea0b1cbdbd13
+_md5_=7668b85ffad7473becaf3b7c0b39df2c
diff --git a/metadata/md5-cache/app-office/scribus-1.6.1-r1 b/metadata/md5-cache/app-office/scribus-1.6.1-r1
deleted file mode 100644
index cd6ec78d7bad..000000000000
--- a/metadata/md5-cache/app-office/scribus-1.6.1-r1
+++ /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 setup test
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[tk?] ) python_single_target_python3_11? ( dev-lang/python:3.11[tk?] ) python_single_target_python3_12? ( dev-lang/python:3.12[tk?] ) python_single_target_python3_13? ( dev-lang/python:3.13[tk?] ) app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen dev-libs/icu:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only,X] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libjpeg-turbo:= media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:= net-print/cups sys-libs/zlib[minizip] x11-libs/cairo[X,svg(+)] boost? ( dev-libs/boost:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) hunspell? ( app-text/hunspell:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python3_10? ( dev-python/pillow[tk?,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pillow[tk?,python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pillow[tk?,python_targets_python3_12(-)] ) python_single_target_python3_13? ( dev-python/pillow[tk?,python_targets_python3_13(-)] ) )
-DESCRIPTION=Desktop publishing (DTP) and layout program
-EAPI=8
-HOMEPAGE=https://www.scribus.net/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake desktop flag-o-matic optfeature python-single-r1 xdg
-IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[tk?] ) python_single_target_python3_11? ( dev-lang/python:3.11[tk?] ) python_single_target_python3_12? ( dev-lang/python:3.12[tk?] ) python_single_target_python3_13? ( dev-lang/python:3.13[tk?] ) app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen dev-libs/icu:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only,X] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libjpeg-turbo:= media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:= net-print/cups sys-libs/zlib[minizip] x11-libs/cairo[X,svg(+)] boost? ( dev-libs/boost:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) hunspell? ( app-text/hunspell:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python3_10? ( dev-python/pillow[tk?,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pillow[tk?,python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pillow[tk?,python_targets_python3_12(-)] ) python_single_target_python3_13? ( dev-python/pillow[tk?,python_targets_python3_13(-)] ) ) app-text/ghostscript-gpl
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13 ) tk? ( scripts )
-SLOT=1.6
-SRC_URI=https://downloads.sourceforge.net/project/scribus/scribus/1.6.1/scribus-1.6.1.tar.xz
-_eclasses_=cmake	258a4691fd43b8cd5814cb1acbb3c7df	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=313b77ccd0c2f8aaea98a08d56201c4f
diff --git a/metadata/md5-cache/app-office/scribus-1.6.2 b/metadata/md5-cache/app-office/scribus-1.6.2
index bc6207e80fac..a71e197e3743 100644
--- a/metadata/md5-cache/app-office/scribus-1.6.2
+++ b/metadata/md5-cache/app-office/scribus-1.6.2
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.scribus.net/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake desktop flag-o-matic optfeature python-single-r1 xdg
 IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[tk?] ) python_single_target_python3_11? ( dev-lang/python:3.11[tk?] ) python_single_target_python3_12? ( dev-lang/python:3.12[tk?] ) python_single_target_python3_13? ( dev-lang/python:3.13[tk?] ) app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen dev-libs/icu:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only,X] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libjpeg-turbo:= media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:= net-print/cups sys-libs/zlib[minizip] x11-libs/cairo[X,svg(+)] boost? ( dev-libs/boost:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) hunspell? ( app-text/hunspell:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python3_10? ( dev-python/pillow[tk?,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pillow[tk?,python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pillow[tk?,python_targets_python3_12(-)] ) python_single_target_python3_13? ( dev-python/pillow[tk?,python_targets_python3_13(-)] ) ) app-text/ghostscript-gpl
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13 ) tk? ( scripts )
 SLOT=1.6
 SRC_URI=https://downloads.sourceforge.net/project/scribus/scribus/1.6.2/scribus-1.6.2.tar.xz
 _eclasses_=cmake	258a4691fd43b8cd5814cb1acbb3c7df	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2ddffd7273a6ead79fb8994a78ff1ccd
+_md5_=4fd2545ff82ad5500b31d982736dc5f6
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index f44330b12b5e..512ea372ee2f 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/zathura-pdf-mupdf-0.4.0 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.4.3
index 1c512d5511e8..40c2b18fd26d 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.4.0
+++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.4.3
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-text/mupdf-1.20.0:=[javascript?] >=app-text/zathura-0.5.2:= dev-libs/girara dev-libs/glib:2 x11-libs/cairo
-DESCRIPTION=PDF plug-in for zathura
+DEPEND=>=app-text/mupdf-1.24.0:=[javascript?] >=app-text/zathura-0.2.0:= dev-libs/girara dev-libs/glib:2 x11-libs/cairo
+DESCRIPTION=PDF support for zathura using the mupdf PDF rendering library
 EAPI=8
-HOMEPAGE=https://git.pwmt.org/pwmt/zathura-pdf-mupdf
+HOMEPAGE=https://pwmt.org/projects/zathura-pdf-mupdf/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=meson xdg
 IUSE=+javascript
-KEYWORDS=amd64 arm x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=ZLIB
-RDEPEND=>=app-text/mupdf-1.20.0:=[javascript?] >=app-text/zathura-0.5.2:= dev-libs/girara dev-libs/glib:2 x11-libs/cairo
+RDEPEND=>=app-text/mupdf-1.24.0:=[javascript?] >=app-text/zathura-0.2.0:= dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
-SRC_URI=https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/archive/0.4.0/zathura-pdf-mupdf-0.4.0.tar.gz
+SRC_URI=https://github.com/pwmt/zathura-pdf-mupdf/archive/0.4.3.tar.gz -> zathura-pdf-mupdf-0.4.3.tar.gz
 _eclasses_=flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	meson	99466844dd8d4fcfb07578a76f5a9922	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e2a62eca54916519d5194f8655626c74
+_md5_=695f670892f53a0b5a3868aea9acf1bc
diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
index 9fd479991a80..a82d79e60e9e 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
+++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
@@ -1,9 +1,9 @@
 BDEPEND=virtual/pkgconfig >=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 prepare test unpack
 DEPEND=>=app-text/mupdf-1.20.0:=[javascript?] >=app-text/zathura-0.5.2:= dev-libs/girara dev-libs/glib:2 x11-libs/cairo
-DESCRIPTION=PDF plug-in for zathura
+DESCRIPTION=PDF support for zathura using the mupdf PDF rendering library
 EAPI=8
-HOMEPAGE=https://git.pwmt.org/pwmt/zathura-pdf-mupdf
+HOMEPAGE=https://pwmt.org/projects/zathura-pdf-mupdf/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=meson xdg git-r3
 IUSE=+javascript
@@ -12,4 +12,4 @@ PROPERTIES=live
 RDEPEND=>=app-text/mupdf-1.20.0:=[javascript?] >=app-text/zathura-0.5.2:= dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
 _eclasses_=flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	git-r3	875eb471682d3e1f18da124be97dcc81	meson	99466844dd8d4fcfb07578a76f5a9922	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8831cef704ffcde74aa411ec0db6babb
+_md5_=01faef6454f6fef53a745540f6c74e7f
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 4f35724bb1fa..dc50b8302458 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/openjdk-bin-21.0.3_p9 b/metadata/md5-cache/dev-java/openjdk-bin-21.0.3_p9-r1
index c32e79c5807d..3ffbb77871b9 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-21.0.3_p9
+++ b/metadata/md5-cache/dev-java/openjdk-bin-21.0.3_p9-r1
@@ -12,6 +12,6 @@ LICENSE=GPL-2-with-classpath-exception
 RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/harfbuzz elibc_glibc? ( >=sys-libs/glibc-2.2.5:* ) elibc_musl? ( sys-libs/musl ) sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) ) dev-java/java-config app-eselect/eselect-java
 RESTRICT=preserve-libs splitdebug
 SLOT=21
-SRC_URI=arm64? ( https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3+9//OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.3_9.tar.gz ) ppc64? ( https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3+9//OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.3_9.tar.gz ) amd64? ( https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3+9//OpenJDK21U-jdk_x64_linux_hotspot_21.0.3_9.tar.gz ) amd64? ( elibc_musl? ( https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3+9//OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.3_9.tar.gz ) ) riscv? ( https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3+9//OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.3_9.tar.gz )
+SRC_URI=arm64? ( https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3+9//OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.3_9.tar.gz ) arm64? ( elibc_musl? ( https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3+9//OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.3_9.tar.gz ) ) ppc64? ( https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3+9//OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.3_9.tar.gz ) amd64? ( https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3+9//OpenJDK21U-jdk_x64_linux_hotspot_21.0.3_9.tar.gz ) amd64? ( elibc_musl? ( https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3+9//OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.3_9.tar.gz ) ) riscv? ( https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3+9//OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.3_9.tar.gz )
 _eclasses_=java-vm-2	a4e242a071bea6071a08ad3af362c4a4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d7c4ecfc0d6238eca2719843b1ad6ed8
+_md5_=e92d79a14e33898f21e10032cd3f0cdc
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 3013c675eacf..3e4f5df4e20f 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/luau-0.634 b/metadata/md5-cache/dev-lang/luau-0.634
new file mode 100644
index 000000000000..6653dada63e9
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/luau-0.634
@@ -0,0 +1,12 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Gradually typed embeddable scripting language derived from Lua
+EAPI=8
+HOMEPAGE=https://luau-lang.org/ https://github.com/luau-lang/luau/
+INHERIT=cmake
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/luau-lang/luau/archive/0.634.tar.gz -> luau-0.634.tar.gz
+_eclasses_=cmake	258a4691fd43b8cd5814cb1acbb3c7df	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=e5d710ed8948e5cfe31af8e15927805d
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 2c14de266f67..7f583b06bca1 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/apache-arrow-17.0.0 b/metadata/md5-cache/dev-libs/apache-arrow-17.0.0
new file mode 100644
index 000000000000..658be9d4e07e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/apache-arrow-17.0.0
@@ -0,0 +1,17 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=brotli? ( app-arch/brotli:= ) bzip2? ( app-arch/bzip2:= ) compute? ( dev-libs/libutf8proc:= ) dataset? ( dev-libs/libutf8proc:= ) lz4? ( app-arch/lz4:= ) parquet? ( dev-libs/libutf8proc:= dev-libs/thrift:= ssl? ( dev-libs/openssl:= ) ) re2? ( dev-libs/re2:= ) snappy? ( app-arch/snappy:= ) zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= ) dev-cpp/xsimd >=dev-libs/boost-1.81.0 json? ( dev-libs/rapidjson ) test? ( dev-cpp/gflags dev-cpp/gtest )
+DESCRIPTION=A cross-language development platform for in-memory data.
+EAPI=8
+HOMEPAGE=https://arrow.apache.org/ https://github.com/apache/arrow/
+INHERIT=cmake
+IUSE=+brotli bzip2 compute dataset +json lz4 +parquet re2 +snappy ssl test zlib zstd
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~riscv ~s390 ~x86
+LICENSE=Apache-2.0
+RDEPEND=brotli? ( app-arch/brotli:= ) bzip2? ( app-arch/bzip2:= ) compute? ( dev-libs/libutf8proc:= ) dataset? ( dev-libs/libutf8proc:= ) lz4? ( app-arch/lz4:= ) parquet? ( dev-libs/libutf8proc:= dev-libs/thrift:= ssl? ( dev-libs/openssl:= ) ) re2? ( dev-libs/re2:= ) snappy? ( app-arch/snappy:= ) zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= )
+REQUIRED_USE=test? ( json parquet? ( zstd ) ) ssl? ( json )
+RESTRICT=!test? ( test )
+SLOT=0/17
+SRC_URI=mirror://apache/arrow/arrow-17.0.0/apache-arrow-17.0.0.tar.gz test? ( https://github.com/apache/parquet-testing/archive/74278bc4a1122d74945969e6dec405abd1533ec3.tar.gz -> apache-arrow-parquet-data-74278bc4a1122d74945969e6dec405abd1533ec3.tar.gz https://github.com/apache/arrow-testing/archive/735ae7128d571398dd798d7ff004adebeb342883.tar.gz -> apache-arrow-arrow-data-735ae7128d571398dd798d7ff004adebeb342883.tar.gz )
+_eclasses_=cmake	258a4691fd43b8cd5814cb1acbb3c7df	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=dc3e679e5bc02d2c8684b33ee39a8589
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 85768522bb5c..af13b35b6a41 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/merlin-4.12 b/metadata/md5-cache/dev-ml/merlin-4.12-r1
index 4ea38ff43358..117d1739060c 100644
--- a/metadata/md5-cache/dev-ml/merlin-4.12
+++ b/metadata/md5-cache/dev-ml/merlin-4.12-r1
@@ -1,4 +1,4 @@
-BDEPEND=!!<dev-ml/seq-0.3 test? ( app-misc/jq ) dev-lang/ocaml dev-ml/dune
+BDEPEND=!!<dev-ml/seq-0.3 dev-ml/findlib test? ( app-misc/jq ) dev-lang/ocaml dev-ml/dune
 DEFINED_PHASES=compile install postinst postrm prepare test unpack
 DEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/csexp:= >=dev-ml/yojson-2.0.0:= dev-ml/menhir:= >=dev-ml/dune-2.9:= || ( dev-lang/ocaml:0/4.14 dev-lang/ocaml:0/4.14.1 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/4.12
 SRC_URI=https://github.com/ocaml/merlin/releases/download/v4.12-414/merlin-4.12-414.tbz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	elisp-common	abb2dda42f680fce87602c8273f832c7	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=f9eb680cbf5e0d792cfdd32d12b149aa
+_md5_=73a7eb1676af9530a0b0703386fdbc3c
diff --git a/metadata/md5-cache/dev-ml/merlin-4.13-r2 b/metadata/md5-cache/dev-ml/merlin-4.13-r3
index f2aee4d2a701..a41874b00a6c 100644
--- a/metadata/md5-cache/dev-ml/merlin-4.13-r2
+++ b/metadata/md5-cache/dev-ml/merlin-4.13-r3
@@ -1,4 +1,4 @@
-BDEPEND=!!<dev-ml/seq-0.3 test? ( app-misc/jq ) dev-lang/ocaml dev-ml/dune
+BDEPEND=!!<dev-ml/seq-0.3 dev-ml/findlib test? ( app-misc/jq ) dev-lang/ocaml dev-ml/dune
 DEFINED_PHASES=compile install postinst postrm prepare test unpack
 DEPEND=<dev-lang/ocaml-5 >=dev-lang/ocaml-4.14.1 dev-lang/ocaml:=[ocamlopt?] >=dev-ml/dune-2.9:= >=dev-ml/yojson-2.0.0:= dev-ml/csexp:= dev-ml/menhir:= emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/4.13
 SRC_URI=https://github.com/ocaml/merlin/releases/download/v4.13-414/merlin-4.13-414.tbz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	elisp-common	abb2dda42f680fce87602c8273f832c7	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=86723582d677f31098a3a9413a6b4020
+_md5_=ef63cee05d98111ca937fcd5e3148684
diff --git a/metadata/md5-cache/dev-ml/opam-2.1.5 b/metadata/md5-cache/dev-ml/opam-2.1.5
deleted file mode 100644
index e596952976cb..000000000000
--- a/metadata/md5-cache/dev-ml/opam-2.1.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-ml/cmdliner:=[ocamlopt?] dev-ml/cudf:=[ocamlopt?] dev-ml/dose3:=[ocamlopt?] dev-ml/extlib:=[ocamlopt?] ~dev-ml/opam-client-2.1.5:=[ocamlopt?] dev-ml/opam-file-format:=[ocamlopt?] dev-ml/re:=[ocamlopt?] sys-apps/bubblewrap >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=A source-based package manager for OCaml
-EAPI=8
-HOMEPAGE=http://opam.ocaml.org/
-INHERIT=dune
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-ml/cmdliner:=[ocamlopt?] dev-ml/cudf:=[ocamlopt?] dev-ml/dose3:=[ocamlopt?] dev-ml/extlib:=[ocamlopt?] ~dev-ml/opam-client-2.1.5:=[ocamlopt?] dev-ml/opam-file-format:=[ocamlopt?] dev-ml/re:=[ocamlopt?] sys-apps/bubblewrap >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=test
-SLOT=0/2.1.5
-SRC_URI=https://github.com/ocaml/opam/archive/2.1.5.tar.gz -> opam-2.1.5.tar.gz
-_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=da9fe9d80d2218af75b771539d8e1a57
diff --git a/metadata/md5-cache/dev-ml/opam-2.1.6 b/metadata/md5-cache/dev-ml/opam-2.1.6
new file mode 100644
index 000000000000..f9dbd1094163
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-2.1.6
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-ml/cmdliner:=[ocamlopt?] dev-ml/cudf:=[ocamlopt?] dev-ml/dose3:=[ocamlopt?] dev-ml/extlib:=[ocamlopt?] >=dev-ml/mccs-1.1.17:=[ocamlopt?] dev-ml/ocamlgraph:=[ocamlopt?] !dev-ml/opam-client !dev-ml/opam-core dev-ml/opam-file-format:=[ocamlopt?] !dev-ml/opam-format !dev-ml/opam-state !dev-ml/opam-solver !dev-ml/opam-repository dev-ml/re:=[ocamlopt?] sys-apps/bubblewrap dev-ml/cppo >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=A source-based package manager for OCaml
+EAPI=8
+HOMEPAGE=http://opam.ocaml.org/
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=dev-ml/cmdliner:=[ocamlopt?] dev-ml/cudf:=[ocamlopt?] dev-ml/dose3:=[ocamlopt?] dev-ml/extlib:=[ocamlopt?] >=dev-ml/mccs-1.1.17:=[ocamlopt?] dev-ml/ocamlgraph:=[ocamlopt?] !dev-ml/opam-client !dev-ml/opam-core dev-ml/opam-file-format:=[ocamlopt?] !dev-ml/opam-format !dev-ml/opam-state !dev-ml/opam-solver !dev-ml/opam-repository dev-ml/re:=[ocamlopt?] sys-apps/bubblewrap >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/2.1.6
+SRC_URI=https://github.com/ocaml/opam/archive/2.1.6.tar.gz -> opam-2.1.6.tar.gz
+_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
+_md5_=efec8b43b3556c20a9f65f19ba3a6d95
diff --git a/metadata/md5-cache/dev-ml/opam-client-2.1.5 b/metadata/md5-cache/dev-ml/opam-client-2.1.5
deleted file mode 100644
index f2c845d52a8d..000000000000
--- a/metadata/md5-cache/dev-ml/opam-client-2.1.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( sys-apps/bubblewrap ) dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-ml/cmdliner:=[ocamlopt?] ~dev-ml/opam-repository-2.1.5:=[ocamlopt?] ~dev-ml/opam-state-2.1.5:=[ocamlopt?] ~dev-ml/opam-solver-2.1.5:=[ocamlopt?] dev-ml/opam-file-format:=[ocamlopt?] dev-ml/re:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=opam client libraries
-EAPI=8
-HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
-INHERIT=dune
-IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-ml/cmdliner:=[ocamlopt?] ~dev-ml/opam-repository-2.1.5:=[ocamlopt?] ~dev-ml/opam-state-2.1.5:=[ocamlopt?] ~dev-ml/opam-solver-2.1.5:=[ocamlopt?] dev-ml/opam-file-format:=[ocamlopt?] dev-ml/re:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=test
-SLOT=0/2.1.5
-SRC_URI=https://github.com/ocaml/opam/archive/2.1.5.tar.gz -> opam-2.1.5.tar.gz
-_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=b8ded3a8dedec315f903831b31d42f0e
diff --git a/metadata/md5-cache/dev-ml/opam-core-2.1.5 b/metadata/md5-cache/dev-ml/opam-core-2.1.5
deleted file mode 100644
index 9c9d3306ce88..000000000000
--- a/metadata/md5-cache/dev-ml/opam-core-2.1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-lang/ocaml
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-ml/ocamlgraph:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/cmdliner:= dev-ml/cppo >=dev-lang/ocaml-4:=
-DESCRIPTION=Core libraries for opam
-EAPI=8
-HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
-INHERIT=opam
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-ml/ocamlgraph:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/cmdliner:= >=dev-lang/ocaml-4:=
-SLOT=0/2.1.5
-SRC_URI=https://github.com/ocaml/opam/archive/2.1.5.tar.gz -> opam-2.1.5.tar.gz
-_eclasses_=opam	2d0e114062b346818f6d0fee5e0df656
-_md5_=2d99e2ca066fbbc0769e7834808520bf
diff --git a/metadata/md5-cache/dev-ml/opam-format-2.1.5 b/metadata/md5-cache/dev-ml/opam-format-2.1.5
deleted file mode 100644
index be4f17184a83..000000000000
--- a/metadata/md5-cache/dev-ml/opam-format-2.1.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( sys-apps/bubblewrap ) dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile install prepare test
-DEPEND=~dev-ml/opam-core-2.1.5:= dev-ml/re:=[ocamlopt?] dev-ml/opam-file-format:=[ocamlopt?] dev-ml/dose3:=[ocamlopt?] dev-ml/mccs:=[ocamlopt?] dev-ml/cppo >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Core libraries for opam
-EAPI=8
-HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
-INHERIT=dune
-IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1
-RDEPEND=~dev-ml/opam-core-2.1.5:= dev-ml/re:=[ocamlopt?] dev-ml/opam-file-format:=[ocamlopt?] dev-ml/dose3:=[ocamlopt?] dev-ml/mccs:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=test
-SLOT=0/2.1.5
-SRC_URI=https://github.com/ocaml/opam/archive/2.1.5.tar.gz -> opam-2.1.5.tar.gz
-_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=b43f2d01d6cc0db440116b108581bee0
diff --git a/metadata/md5-cache/dev-ml/opam-installer-2.1.5 b/metadata/md5-cache/dev-ml/opam-installer-2.1.6
index 45fa0898f630..e781b98cef92 100644
--- a/metadata/md5-cache/dev-ml/opam-installer-2.1.5
+++ b/metadata/md5-cache/dev-ml/opam-installer-2.1.6
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/ocaml dev-ml/dune
 DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-lang/ocaml-4.02.3:= dev-ml/cmdliner:= ~dev-ml/opam-format-2.1.5:= >=dev-ml/dose3-6:= dev-ml/findlib >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-ml/cmdliner:=[ocamlopt?] ~dev-ml/opam-2.1.6:=[ocamlopt?] dev-ml/dose3:=[ocamlopt?] dev-ml/findlib >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Core installer for opam packages
 EAPI=8
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
@@ -8,9 +8,9 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-lang/ocaml-4.02.3:= dev-ml/cmdliner:= ~dev-ml/opam-format-2.1.5:= >=dev-ml/dose3-6:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=dev-ml/cmdliner:=[ocamlopt?] ~dev-ml/opam-2.1.6:=[ocamlopt?] dev-ml/dose3:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
-SLOT=0/2.1.5
-SRC_URI=https://github.com/ocaml/opam/releases/download/2.1.5/opam-full-2.1.5.tar.gz
+SLOT=0/2.1.6
+SRC_URI=https://github.com/ocaml/opam/releases/download/2.1.6/opam-full-2.1.6.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=d186940fb1c8e6dcfe96d564a90c4364
+_md5_=385c895a3f88cd029eb825dcd3bcd434
diff --git a/metadata/md5-cache/dev-ml/opam-repository-2.1.5 b/metadata/md5-cache/dev-ml/opam-repository-2.1.5
deleted file mode 100644
index bf74fbfde2d0..000000000000
--- a/metadata/md5-cache/dev-ml/opam-repository-2.1.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile install prepare test
-DEPEND=~dev-ml/opam-format-2.1.5:=[ocamlopt?] dev-ml/re:=[ocamlopt?] dev-ml/dose3:=[ocamlopt?] dev-ml/opam-file-format:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=opam repository libraries
-EAPI=8
-HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
-INHERIT=dune
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1
-RDEPEND=~dev-ml/opam-format-2.1.5:=[ocamlopt?] dev-ml/re:=[ocamlopt?] dev-ml/dose3:=[ocamlopt?] dev-ml/opam-file-format:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=test
-SLOT=0/2.1.5
-SRC_URI=https://github.com/ocaml/opam/archive/2.1.5.tar.gz -> opam-2.1.5.tar.gz
-_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=ea558ebb005581bfd217a95d4b701aef
diff --git a/metadata/md5-cache/dev-ml/opam-solver-2.1.5 b/metadata/md5-cache/dev-ml/opam-solver-2.1.5
deleted file mode 100644
index 471950c4a03a..000000000000
--- a/metadata/md5-cache/dev-ml/opam-solver-2.1.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile install prepare test
-DEPEND=~dev-ml/opam-format-2.1.5:=[ocamlopt?] dev-ml/opam-file-format:=[ocamlopt?] dev-ml/re:=[ocamlopt?] dev-ml/mccs:=[ocamlopt?] dev-ml/dose3:=[ocamlopt?] dev-ml/cudf:=[ocamlopt?] test? ( dev-ml/opam-client ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=opam solver
-EAPI=8
-HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
-INHERIT=dune
-IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1
-RDEPEND=~dev-ml/opam-format-2.1.5:=[ocamlopt?] dev-ml/opam-file-format:=[ocamlopt?] dev-ml/re:=[ocamlopt?] dev-ml/mccs:=[ocamlopt?] dev-ml/dose3:=[ocamlopt?] dev-ml/cudf:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=test
-SLOT=0/2.1.5
-SRC_URI=https://github.com/ocaml/opam/archive/2.1.5.tar.gz -> opam-2.1.5.tar.gz
-_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=2478c813c4ac7ea229c54e15b75ee8c5
diff --git a/metadata/md5-cache/dev-ml/opam-state-2.1.5 b/metadata/md5-cache/dev-ml/opam-state-2.1.5
deleted file mode 100644
index a2276617a101..000000000000
--- a/metadata/md5-cache/dev-ml/opam-state-2.1.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-ml/re:=[ocamlopt?] dev-ml/opam-file-format:=[ocamlopt?] ~dev-ml/opam-repository-2.1.5:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=opam state libraries
-EAPI=8
-HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
-INHERIT=dune
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-ml/re:=[ocamlopt?] dev-ml/opam-file-format:=[ocamlopt?] ~dev-ml/opam-repository-2.1.5:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=test
-SLOT=0/2.1.5
-SRC_URI=https://github.com/ocaml/opam/archive/2.1.5.tar.gz -> opam-2.1.5.tar.gz
-_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=c0ebf3672cbaf67d62f8df3cbddc6942
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 009bc3522363..74a24ea64658 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/backports-strenum-1.3.1 b/metadata/md5-cache/dev-python/backports-strenum-1.3.1
index f7be6ed42470..ecd67a378d02 100644
--- a/metadata/md5-cache/dev-python/backports-strenum-1.3.1
+++ b/metadata/md5-cache/dev-python/backports-strenum-1.3.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/clbarnes/backports.strenum/ https://pypi.org/project/backports.strenum/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~riscv
 LICENSE=PSF-2
 RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/clbarnes/backports.strenum/archive/v1.3.1.tar.gz -> backports.strenum-1.3.1.gh.tar.gz
 _eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=223c8d4571ef55293310aca47a80fc4c
+_md5_=c30c02b807359ec7febd2d27b4f93a11
diff --git a/metadata/md5-cache/dev-python/blurb-1.2.1 b/metadata/md5-cache/dev-python/blurb-1.2.1
new file mode 100644
index 000000000000..aa126f236a79
--- /dev/null
+++ b/metadata/md5-cache/dev-python/blurb-1.2.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pyfakefs[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/pytest-7.4.4[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 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/hatchling-1.21.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Tool to create and manage NEWS blurbs for CPython
+EAPI=8
+HOMEPAGE=https://github.com/python/core-workflow/tree/master/blurb https://pypi.org/project/blurb/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+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 )
+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://files.pythonhosted.org/packages/source/b/blurb/blurb-1.2.1.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=8658256688f3b915e4e4e802d01ef5d7
diff --git a/metadata/md5-cache/dev-python/cfn-lint-1.7.1 b/metadata/md5-cache/dev-python/cfn-lint-1.7.1
new file mode 100644
index 000000000000..930df4d05949
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cfn-lint-1.7.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/defusedxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/aws-sam-translator-1.89.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jschema-to-python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/jsonschema-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/regex-2021.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sarif-om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-7.4.4[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 ) >=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=CloudFormation Linter
+EAPI=8
+HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/aws-sam-translator-1.89.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jschema-to-python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/jsonschema-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/regex-2021.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sarif-om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sympy-1.0.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 ) 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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/c/cfn-lint/cfn_lint-1.7.1.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=1215331022ab60ab15d5d9ab0ed24d22
diff --git a/metadata/md5-cache/dev-python/cfn-lint-1.7.2 b/metadata/md5-cache/dev-python/cfn-lint-1.7.2
new file mode 100644
index 000000000000..358adb4f2fca
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cfn-lint-1.7.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/defusedxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/aws-sam-translator-1.89.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jschema-to-python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/jsonschema-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/regex-2021.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sarif-om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-7.4.4[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 ) >=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=CloudFormation Linter
+EAPI=8
+HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/aws-sam-translator-1.89.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jschema-to-python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/jsonschema-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/regex-2021.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sarif-om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sympy-1.0.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 ) 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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/c/cfn-lint/cfn_lint-1.7.2.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=1215331022ab60ab15d5d9ab0ed24d22
diff --git a/metadata/md5-cache/dev-python/cfn-lint-1.8.0 b/metadata/md5-cache/dev-python/cfn-lint-1.8.0
new file mode 100644
index 000000000000..409600f652eb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cfn-lint-1.8.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/defusedxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/aws-sam-translator-1.89.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jschema-to-python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/jsonschema-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/regex-2021.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sarif-om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-7.4.4[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 ) >=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=CloudFormation Linter
+EAPI=8
+HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/aws-sam-translator-1.89.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jschema-to-python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/jsonschema-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/regex-2021.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sarif-om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sympy-1.0.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 ) 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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/c/cfn-lint/cfn_lint-1.8.0.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=1215331022ab60ab15d5d9ab0ed24d22
diff --git a/metadata/md5-cache/dev-python/griffe-0.48.0 b/metadata/md5-cache/dev-python/griffe-0.48.0
index 1666a8e93dbc..8007f6d43b5e 100644
--- a/metadata/md5-cache/dev-python/griffe-0.48.0
+++ b/metadata/md5-cache/dev-python/griffe-0.48.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://mkdocstrings.github.io/griffe/ https://github.com/mkdocstrings/griffe/ https://pypi.org/project/griffe/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~riscv
 LICENSE=ISC
 RDEPEND=>=dev-python/colorama-0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_10? ( >=dev-python/backports-strenum-1.3[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 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mkdocstrings/griffe/archive/0.48.0.tar.gz -> griffe-0.48.0.gh.tar.gz
 _eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=31501eb64ebf206e5d43d31331b4d49a
+_md5_=21bb3419a202ae340369d1ef50080cb6
diff --git a/metadata/md5-cache/dev-python/jupyterlab-server-2.27.3 b/metadata/md5-cache/dev-python/jupyterlab-server-2.27.3
new file mode 100644
index 000000000000..e5abadf55991
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyterlab-server-2.27.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/ipykernel[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/jupyter-server[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/openapi-core-0.18[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/openapi-spec-validator-0.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-jupyter[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-tornasync[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/requests-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/ruamel-yaml[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/Babel-2.10[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jinja-3.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/json5-0.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jsonschema-4.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.31[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jupyter-server-1.21[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/jupyter-server-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=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(-)?] ) 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/hatchling-1.21.1[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=Server components for JupyterLab and JupyterLab like applications
+EAPI=8
+HOMEPAGE=https://jupyter.org/ https://github.com/jupyterlab/jupyterlab_server/ https://pypi.org/project/jupyterlab-server/
+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=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/Babel-2.10[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jinja-3.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/json5-0.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jsonschema-4.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.31[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jupyter-server-1.21[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/jupyter-server-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] 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/j/jupyterlab-server/jupyterlab_server-2.27.3.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=982e7fca4945d2c77556da8c891547a9
diff --git a/metadata/md5-cache/dev-python/openstacksdk-3.3.0 b/metadata/md5-cache/dev-python/openstacksdk-3.3.0
new file mode 100644
index 000000000000..c72d77bd3783
--- /dev/null
+++ b/metadata/md5-cache/dev-python/openstacksdk-3.3.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/pbr-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] test? ( >=dev-python/ddt-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/oslo-config-6.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/prometheus-client-0.4.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-mock-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/statsd-3.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/cryptography-2.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/decorator-4.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/dogpile-cache-0.6.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jmespath-0.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jsonpatch-1.21[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/keystoneauth1-3.18.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/os-service-types-1.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pbr-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/platformdirs-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pyyaml-3.13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requestsexceptions-1.2.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 ) 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=A collection of libraries for building applications to work with OpenStack
+EAPI=8
+HOMEPAGE=https://opendev.org/openstack/openstacksdk/ https://github.com/openstack/openstacksdk/ https://pypi.org/project/openstacksdk/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/cryptography-2.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/decorator-4.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/dogpile-cache-0.6.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jmespath-0.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jsonpatch-1.21[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/keystoneauth1-3.18.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/os-service-types-1.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pbr-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/platformdirs-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pyyaml-3.13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requestsexceptions-1.2.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 ) 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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/o/openstacksdk/openstacksdk-3.3.0.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=519afd713f27468c46e083be5122d044
diff --git a/metadata/md5-cache/dev-python/pyarrow-17.0.0 b/metadata/md5-cache/dev-python/pyarrow-17.0.0
new file mode 100644
index 000000000000..1d92e3c3ae18
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyarrow-17.0.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/cffi[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/hypothesis[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pandas[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytz[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-libs/apache-arrow[lz4,zlib] ) test? ( ~dev-libs/apache-arrow-17.0.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_13(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[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 ) >=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
+DEPEND=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 )
+DESCRIPTION=Python library for Apache Arrow
+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 python_targets_python3_13 debug
+KEYWORDS=~amd64 ~arm64 ~loong ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=~dev-libs/apache-arrow-17.0.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_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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://apache/arrow/arrow-17.0.0/apache-arrow-17.0.0.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=566e6b2edf743490c4e1471b767be30a
diff --git a/metadata/md5-cache/dev-python/pydot-3.0.1 b/metadata/md5-cache/dev-python/pydot-3.0.1
new file mode 100644
index 000000000000..4e1b3f6c73bc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pydot-3.0.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/chardet[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/pyparsing-3.0.9[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] media-gfx/graphviz 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 ) 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=Python interface to Graphviz's Dot language
+EAPI=8
+HOMEPAGE=https://github.com/pydot/pydot/ https://pypi.org/project/pydot/
+INHERIT=distutils-r1
+IUSE=test test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=MIT
+RDEPEND=>=dev-python/pyparsing-3.0.9[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] media-gfx/graphviz 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 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pydot/pydot/archive/v3.0.1.tar.gz -> pydot-3.0.1.gh.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=88aa52d8d989614c7883046dcc7b47a2
diff --git a/metadata/md5-cache/dev-python/pygobject-3.44.1 b/metadata/md5-cache/dev-python/pygobject-3.44.1
deleted file mode 100644
index 87ea5aa06a2b..000000000000
--- a/metadata/md5-cache/dev-python/pygobject-3.44.1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=virtual/pkgconfig app-arch/xz-utils >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) 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 )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.56:2 >=dev-libs/gobject-introspection-1.56:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.16.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] x11-libs/cairo[glib] ) test? ( >=app-accessibility/at-spi2-core-2.46.0[introspection] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) 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 GObject Introspection
-EAPI=8
-HOMEPAGE=https://pygobject.readthedocs.io/ https://gitlab.gnome.org/GNOME/pygobject/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org meson virtualx xdg distutils-r1
-IUSE=+cairo examples test test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.56:2 >=dev-libs/gobject-introspection-1.56:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.16.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] x11-libs/cairo[glib] ) 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 ) !test? ( test )
-SLOT=3
-SRC_URI=mirror://gnome/sources/pygobject/3.44/pygobject-3.44.1.tar.xz
-_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	gnome.org	e1b4f392dbfedfb8974b71b017937f08	meson	99466844dd8d4fcfb07578a76f5a9922	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b460b2f89b5a10c444f824d4a05983e3
diff --git a/metadata/md5-cache/dev-python/pygobject-3.48.2 b/metadata/md5-cache/dev-python/pygobject-3.48.2
new file mode 100644
index 000000000000..8746e224eff6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygobject-3.48.2
@@ -0,0 +1,18 @@
+BDEPEND=virtual/pkgconfig app-arch/xz-utils >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) python_targets_pypy3? ( dev-python/pypy3:= ) 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 )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.64:2 >=dev-libs/gobject-introspection-1.64:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.16.0[python_targets_pypy3(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] x11-libs/cairo[glib] ) test? ( >=app-accessibility/at-spi2-core-2.46.0[introspection] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) python_targets_pypy3? ( dev-python/pypy3:= ) 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 )
+DESCRIPTION=Python bindings for GObject Introspection
+EAPI=8
+HOMEPAGE=https://pygobject.gnome.org/ https://gitlab.gnome.org/GNOME/pygobject/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org meson virtualx xdg distutils-r1
+IUSE=+cairo examples test test python_targets_pypy3 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
+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=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.64:2 >=dev-libs/gobject-introspection-1.64:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.16.0[python_targets_pypy3(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] x11-libs/cairo[glib] ) python_targets_pypy3? ( dev-python/pypy3:= ) 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_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=3
+SRC_URI=mirror://gnome/sources/pygobject/3.48/pygobject-3.48.2.tar.xz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	gnome.org	e1b4f392dbfedfb8974b71b017937f08	meson	99466844dd8d4fcfb07578a76f5a9922	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=a6374f127d2b777a91ef740a579c67c9
diff --git a/metadata/md5-cache/dev-python/pygobject-3.48.2-r1 b/metadata/md5-cache/dev-python/pygobject-3.48.2-r1
new file mode 100644
index 000000000000..43afe1b358c1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygobject-3.48.2-r1
@@ -0,0 +1,18 @@
+BDEPEND=virtual/pkgconfig app-arch/xz-utils >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) python_targets_pypy3? ( dev-python/pypy3:= ) 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 )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.64:2 >=dev-libs/gobject-introspection-1.64:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.16.0[python_targets_pypy3(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] x11-libs/cairo[glib] ) test? ( >=app-accessibility/at-spi2-core-2.46.0[introspection] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) python_targets_pypy3? ( dev-python/pypy3:= ) 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 )
+DESCRIPTION=Python bindings for GObject Introspection
+EAPI=8
+HOMEPAGE=https://pygobject.gnome.org/ https://gitlab.gnome.org/GNOME/pygobject/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org meson virtualx xdg distutils-r1
+IUSE=+cairo examples test test python_targets_pypy3 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
+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=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.64:2 >=dev-libs/gobject-introspection-1.64:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.16.0[python_targets_pypy3(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] x11-libs/cairo[glib] ) python_targets_pypy3? ( dev-python/pypy3:= ) 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_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=3
+SRC_URI=mirror://gnome/sources/pygobject/3.48/pygobject-3.48.2.tar.xz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	gnome.org	e1b4f392dbfedfb8974b71b017937f08	meson	99466844dd8d4fcfb07578a76f5a9922	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=eca1458642853788d1e9ad0069bf9e68
diff --git a/metadata/md5-cache/dev-python/pymongo-4.8.0 b/metadata/md5-cache/dev-python/pymongo-4.8.0
new file mode 100644
index 000000000000..2d1a5658c933
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pymongo-4.8.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] test? ( test-full? ( >=dev-db/mongodb-2.6.0 ) ) doc? ( || ( ( dev-lang/python:3.13 >=dev-python/sphinx-7.2.6[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] ) ( dev-python/pypy3 >=dev-python/sphinx-7.2.6[python_targets_pypy3(-)] ) ) ) test? ( <dev-python/dnspython-3.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] kerberos? ( dev-python/kerberos[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) >=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(-)?] ) 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/hatchling-1.21.1[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 pretend setup test
+DEPEND=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 )
+DESCRIPTION=Python driver for MongoDB
+EAPI=8
+HOMEPAGE=https://github.com/mongodb/mongo-python-driver/ https://pypi.org/project/pymongo/
+INHERIT=check-reqs distutils-r1
+IUSE=doc kerberos +native-extensions +test-full doc test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/dnspython-3.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] kerberos? ( dev-python/kerberos[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) 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://github.com/mongodb/mongo-python-driver/archive/4.8.0.tar.gz -> mongo-python-driver-4.8.0.gh.tar.gz
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=23008d3ec7cb575900cdc1a25ca8b705
diff --git a/metadata/md5-cache/dev-python/pytest-asyncio-0.23.8 b/metadata/md5-cache/dev-python/pytest-asyncio-0.23.8
new file mode 100644
index 000000000000..745e0dc78029
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-asyncio-0.23.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools-scm[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] test? ( >=dev-python/hypothesis-3.64[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/pytest-5.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=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(-)?] ) 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=Library for testing asyncio code with pytest
+EAPI=8
+HOMEPAGE=https://github.com/pytest-dev/pytest-asyncio/ https://pypi.org/project/pytest-asyncio/
+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 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pytest-5.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] 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/p/pytest-asyncio/pytest_asyncio-0.23.8.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=ac7724362ce1a48f0e0beb7841f422f1
diff --git a/metadata/md5-cache/dev-python/pytest-import-check-0.0.3 b/metadata/md5-cache/dev-python/pytest-import-check-0.0.3
new file mode 100644
index 000000000000..a86462e3cbdb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-import-check-0.0.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/pytest-8.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=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(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) 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=pytest plugin to check whether Python modules can be imported
+EAPI=8
+HOMEPAGE=https://github.com/projg2/pytest-import-check/ https://pypi.org/project/pytest-import-check/
+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=~amd64 ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-python/pytest-8.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] 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/p/pytest-import-check/pytest_import_check-0.0.3.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=514028b67b9efcb1f45a81b3d4177d37
diff --git a/metadata/md5-cache/dev-python/pytest-lazy-fixtures-1.1.0 b/metadata/md5-cache/dev-python/pytest-lazy-fixtures-1.1.0
new file mode 100644
index 000000000000..6d849f3f8b96
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-lazy-fixtures-1.1.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=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(-)?] ) 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=Allows you to use fixtures in @pytest.mark.parametrize
+EAPI=8
+HOMEPAGE=https://github.com/dev-petrov/pytest-lazy-fixtures/ https://pypi.org/project/pytest-lazy-fixtures/
+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 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/pytest-7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] 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/p/pytest-lazy-fixtures/pytest_lazy_fixtures-1.1.0.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=8abe37d141cdc31583bb0718b4d29025
diff --git a/metadata/md5-cache/dev-python/pytools-2024.1.10 b/metadata/md5-cache/dev-python/pytools-2024.1.10
new file mode 100644
index 000000000000..873df13b740f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytools-2024.1.10
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/numpy-1.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/platformdirs-2.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/siphash24-1.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_10? ( >=dev-python/typing-extensions-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( >=dev-python/typing-extensions-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( >=dev-python/typing-extensions-4[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_13(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[sqlite] ) python_targets_python3_13? ( dev-lang/python:3.13[sqlite] ) >=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 tools missing from the Python standard library
+EAPI=8
+HOMEPAGE=https://mathema.tician.de/software/pytools/ https://github.com/inducer/pytools/ https://pypi.org/project/pytools/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm64 ~riscv
+LICENSE=MIT
+RDEPEND=>=dev-python/numpy-1.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/platformdirs-2.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/siphash24-1.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_10? ( >=dev-python/typing-extensions-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( >=dev-python/typing-extensions-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( >=dev-python/typing-extensions-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[sqlite] ) python_targets_python3_13? ( dev-lang/python:3.13[sqlite] )
+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://files.pythonhosted.org/packages/source/p/pytools/pytools-2024.1.10.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=a6c2d1c6894293ba7eddc92a97fbda9b
diff --git a/metadata/md5-cache/dev-python/sabctools-8.2.4 b/metadata/md5-cache/dev-python/sabctools-8.2.4
new file mode 100644
index 000000000000..05f9c263781b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sabctools-8.2.4
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/chardet[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/portend[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/pytest-7.4.4[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 ) >=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
+DEPEND=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 )
+DESCRIPTION=Module providing raw yEnc encoding/decoding for SABnzbd
+EAPI=8
+HOMEPAGE=https://github.com/sabnzbd/sabctools/ https://pypi.org/project/sabctools/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
+KEYWORDS=~amd64 ~x86
+LICENSE=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 )
+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/sabnzbd/sabctools/archive/v8.2.4.tar.gz -> sabctools-8.2.4.gh.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=4c0094d3634270398e96df1ba67f2d6a
diff --git a/metadata/md5-cache/dev-python/sphinx-7.4.5 b/metadata/md5-cache/dev-python/sphinx-7.4.5
new file mode 100644
index 000000000000..72e5939ac386
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-7.4.5
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( dev-python/sphinxcontrib-websupport[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] media-gfx/graphviz ) test? ( app-text/dvipng >=dev-python/cython-3.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/defusedxml-0.7.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-67.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-texlive/texlive-fontsextra dev-texlive/texlive-latexextra dev-texlive/texlive-luatex virtual/imagemagick-tools[jpeg,png,svg] ) test? ( >=dev-python/alabaster-0.7.14[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/Babel-2.13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/docutils-0.22[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/docutils-0.20[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/imagesize-1.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jinja-3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/packaging-23.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pygments-2.14[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.30.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/snowballstemmer-2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) >=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(-)?] ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) 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(+)] ) python_targets_python3_13? ( dev-lang/python:3.13[threads(+)] ) >=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=Python documentation generator
+EAPI=8
+HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinx/ https://pypi.org/project/Sphinx/
+INHERIT=distutils-r1
+IUSE=doc latex 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 ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=BSD-2
+RDEPEND=>=dev-python/alabaster-0.7.14[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/Babel-2.13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/docutils-0.22[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/docutils-0.20[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/imagesize-1.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jinja-3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/packaging-23.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pygments-2.14[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.30.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/snowballstemmer-2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) 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(+)] ) python_targets_python3_13? ( dev-lang/python:3.13[threads(+)] )
+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://github.com/sphinx-doc/sphinx/archive/v7.4.5.tar.gz -> sphinx-7.4.5.gh.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=5d48360a2e4d8f64a87a93487764538f
diff --git a/metadata/md5-cache/dev-python/sphinx-argparse-0.5.2 b/metadata/md5-cache/dev-python/sphinx-argparse-0.5.2
new file mode 100644
index 000000000000..b6455a0fbceb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-argparse-0.5.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/docutils-0.19[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sphinx-5.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/commonmark-0.5.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-7.4.4[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 ) >=dev-python/gpep517-15[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_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Sphinx extension that automatically documents argparse commands and options
+EAPI=8
+HOMEPAGE=https://github.com/sphinx-doc/sphinx-argparse/ https://pypi.org/project/sphinx-argparse/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/docutils-0.19[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sphinx-5.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/commonmark-0.5.6[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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinx-argparse/sphinx_argparse-0.5.2.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=c317077aabe222f602a864fa6aca1607
diff --git a/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-2.2.3 b/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-2.2.3
new file mode 100644
index 000000000000..51b52628edf0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-2.2.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-vcs[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] test? ( >=dev-python/sphobjinv-2.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/typing-extensions-4.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/sphinx-7.1.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-7.4.4[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 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/hatchling-1.21.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Type hints support for the Sphinx autodoc extension
+EAPI=8
+HOMEPAGE=https://github.com/tox-dev/sphinx-autodoc-typehints/ https://pypi.org/project/sphinx-autodoc-typehints/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/sphinx-7.1.2[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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinx-autodoc-typehints/sphinx_autodoc_typehints-2.2.3.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=5e0caed51a7fe42a7fbaf016fe4e3fbe
diff --git a/metadata/md5-cache/dev-python/sqlglot-25.4.1 b/metadata/md5-cache/dev-python/sqlglot-25.4.1
deleted file mode 100644
index 3e5085d75795..000000000000
--- a/metadata/md5-cache/dev-python/sqlglot-25.4.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=native-extensions? ( >=virtual/rust-1.53 dev-util/maturin[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/pytest-7.4.4[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 ) >=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 unpack
-DEPEND=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 )
-DESCRIPTION=An easily customizable SQL parser and transpiler
-EAPI=8
-HOMEPAGE=https://sqlglot.com/ https://github.com/tobymao/sqlglot/ https://pypi.org/project/sqlglot/
-INHERIT=cargo distutils-r1 pypi optfeature
-IUSE=+native-extensions test debug python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT native-extensions? ( Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016 )
-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 )
-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://files.pythonhosted.org/packages/source/s/sqlglot/sqlglot-25.4.1.tar.gz native-extensions? ( https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/indoc/2.0.4/download -> indoc-2.0.4.crate https://crates.io/api/v1/crates/libc/0.2.150/download -> libc-0.2.150.crate https://crates.io/api/v1/crates/lock_api/0.4.11/download -> lock_api-0.4.11.crate https://crates.io/api/v1/crates/memoffset/0.9.0/download -> memoffset-0.9.0.crate https://crates.io/api/v1/crates/once_cell/1.19.0/download -> once_cell-1.19.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.9/download -> parking_lot_core-0.9.9.crate https://crates.io/api/v1/crates/proc-macro2/1.0.70/download -> proc-macro2-1.0.70.crate https://crates.io/api/v1/crates/pyo3-build-config/0.20.0/download -> pyo3-build-config-0.20.0.crate https://crates.io/api/v1/crates/pyo3-ffi/0.20.0/download -> pyo3-ffi-0.20.0.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.20.0/download -> pyo3-macros-backend-0.20.0.crate https://crates.io/api/v1/crates/pyo3-macros/0.20.0/download -> pyo3-macros-0.20.0.crate https://crates.io/api/v1/crates/pyo3/0.20.0/download -> pyo3-0.20.0.crate https://crates.io/api/v1/crates/quote/1.0.33/download -> quote-1.0.33.crate https://crates.io/api/v1/crates/redox_syscall/0.4.1/download -> redox_syscall-0.4.1.crate https://crates.io/api/v1/crates/scopeguard/1.2.0/download -> scopeguard-1.2.0.crate https://crates.io/api/v1/crates/smallvec/1.11.2/download -> smallvec-1.11.2.crate https://crates.io/api/v1/crates/syn/2.0.41/download -> syn-2.0.41.crate https://crates.io/api/v1/crates/target-lexicon/0.12.12/download -> target-lexicon-0.12.12.crate https://crates.io/api/v1/crates/unicode-ident/1.0.12/download -> unicode-ident-1.0.12.crate https://crates.io/api/v1/crates/unindent/0.2.3/download -> unindent-0.2.3.crate https://crates.io/api/v1/crates/windows-targets/0.48.5/download -> windows-targets-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.5/download -> windows_aarch64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.5/download -> windows_aarch64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.5/download -> windows_i686_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.5/download -> windows_i686_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.5/download -> windows_x86_64_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.5/download -> windows_x86_64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.5/download -> windows_x86_64_msvc-0.48.5.crate )
-_eclasses_=cargo	67ea64209e3442a3a0e095f048d43a62	distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	rust-toolchain	68a6453cb41148db1da01fa2267527f0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=9012414245aaf5034ef963a7744ac54a
diff --git a/metadata/md5-cache/dev-python/sqlglot-25.5.0 b/metadata/md5-cache/dev-python/sqlglot-25.5.0
deleted file mode 100644
index b879d8878482..000000000000
--- a/metadata/md5-cache/dev-python/sqlglot-25.5.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=native-extensions? ( >=virtual/rust-1.53 dev-util/maturin[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/pytest-7.4.4[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 ) >=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 unpack
-DEPEND=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 )
-DESCRIPTION=An easily customizable SQL parser and transpiler
-EAPI=8
-HOMEPAGE=https://sqlglot.com/ https://github.com/tobymao/sqlglot/ https://pypi.org/project/sqlglot/
-INHERIT=cargo distutils-r1 pypi optfeature
-IUSE=+native-extensions test debug python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT native-extensions? ( Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016 )
-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 )
-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://files.pythonhosted.org/packages/source/s/sqlglot/sqlglot-25.5.0.tar.gz native-extensions? ( https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/indoc/2.0.4/download -> indoc-2.0.4.crate https://crates.io/api/v1/crates/libc/0.2.150/download -> libc-0.2.150.crate https://crates.io/api/v1/crates/lock_api/0.4.11/download -> lock_api-0.4.11.crate https://crates.io/api/v1/crates/memoffset/0.9.0/download -> memoffset-0.9.0.crate https://crates.io/api/v1/crates/once_cell/1.19.0/download -> once_cell-1.19.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.9/download -> parking_lot_core-0.9.9.crate https://crates.io/api/v1/crates/proc-macro2/1.0.70/download -> proc-macro2-1.0.70.crate https://crates.io/api/v1/crates/pyo3-build-config/0.20.0/download -> pyo3-build-config-0.20.0.crate https://crates.io/api/v1/crates/pyo3-ffi/0.20.0/download -> pyo3-ffi-0.20.0.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.20.0/download -> pyo3-macros-backend-0.20.0.crate https://crates.io/api/v1/crates/pyo3-macros/0.20.0/download -> pyo3-macros-0.20.0.crate https://crates.io/api/v1/crates/pyo3/0.20.0/download -> pyo3-0.20.0.crate https://crates.io/api/v1/crates/quote/1.0.33/download -> quote-1.0.33.crate https://crates.io/api/v1/crates/redox_syscall/0.4.1/download -> redox_syscall-0.4.1.crate https://crates.io/api/v1/crates/scopeguard/1.2.0/download -> scopeguard-1.2.0.crate https://crates.io/api/v1/crates/smallvec/1.11.2/download -> smallvec-1.11.2.crate https://crates.io/api/v1/crates/syn/2.0.41/download -> syn-2.0.41.crate https://crates.io/api/v1/crates/target-lexicon/0.12.12/download -> target-lexicon-0.12.12.crate https://crates.io/api/v1/crates/unicode-ident/1.0.12/download -> unicode-ident-1.0.12.crate https://crates.io/api/v1/crates/unindent/0.2.3/download -> unindent-0.2.3.crate https://crates.io/api/v1/crates/windows-targets/0.48.5/download -> windows-targets-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.5/download -> windows_aarch64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.5/download -> windows_aarch64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.5/download -> windows_i686_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.5/download -> windows_i686_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.5/download -> windows_x86_64_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.5/download -> windows_x86_64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.5/download -> windows_x86_64_msvc-0.48.5.crate )
-_eclasses_=cargo	67ea64209e3442a3a0e095f048d43a62	distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	rust-toolchain	68a6453cb41148db1da01fa2267527f0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=9012414245aaf5034ef963a7744ac54a
diff --git a/metadata/md5-cache/dev-python/sqlglot-25.4.0 b/metadata/md5-cache/dev-python/sqlglot-25.6.0
index e87dfa80cb54..0c164199600b 100644
--- a/metadata/md5-cache/dev-python/sqlglot-25.4.0
+++ b/metadata/md5-cache/dev-python/sqlglot-25.6.0
@@ -12,6 +12,6 @@ RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_pytho
 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://files.pythonhosted.org/packages/source/s/sqlglot/sqlglot-25.4.0.tar.gz native-extensions? ( https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/indoc/2.0.4/download -> indoc-2.0.4.crate https://crates.io/api/v1/crates/libc/0.2.150/download -> libc-0.2.150.crate https://crates.io/api/v1/crates/lock_api/0.4.11/download -> lock_api-0.4.11.crate https://crates.io/api/v1/crates/memoffset/0.9.0/download -> memoffset-0.9.0.crate https://crates.io/api/v1/crates/once_cell/1.19.0/download -> once_cell-1.19.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.9/download -> parking_lot_core-0.9.9.crate https://crates.io/api/v1/crates/proc-macro2/1.0.70/download -> proc-macro2-1.0.70.crate https://crates.io/api/v1/crates/pyo3-build-config/0.20.0/download -> pyo3-build-config-0.20.0.crate https://crates.io/api/v1/crates/pyo3-ffi/0.20.0/download -> pyo3-ffi-0.20.0.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.20.0/download -> pyo3-macros-backend-0.20.0.crate https://crates.io/api/v1/crates/pyo3-macros/0.20.0/download -> pyo3-macros-0.20.0.crate https://crates.io/api/v1/crates/pyo3/0.20.0/download -> pyo3-0.20.0.crate https://crates.io/api/v1/crates/quote/1.0.33/download -> quote-1.0.33.crate https://crates.io/api/v1/crates/redox_syscall/0.4.1/download -> redox_syscall-0.4.1.crate https://crates.io/api/v1/crates/scopeguard/1.2.0/download -> scopeguard-1.2.0.crate https://crates.io/api/v1/crates/smallvec/1.11.2/download -> smallvec-1.11.2.crate https://crates.io/api/v1/crates/syn/2.0.41/download -> syn-2.0.41.crate https://crates.io/api/v1/crates/target-lexicon/0.12.12/download -> target-lexicon-0.12.12.crate https://crates.io/api/v1/crates/unicode-ident/1.0.12/download -> unicode-ident-1.0.12.crate https://crates.io/api/v1/crates/unindent/0.2.3/download -> unindent-0.2.3.crate https://crates.io/api/v1/crates/windows-targets/0.48.5/download -> windows-targets-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.5/download -> windows_aarch64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.5/download -> windows_aarch64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.5/download -> windows_i686_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.5/download -> windows_i686_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.5/download -> windows_x86_64_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.5/download -> windows_x86_64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.5/download -> windows_x86_64_msvc-0.48.5.crate )
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sqlglot/sqlglot-25.6.0.tar.gz native-extensions? ( https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/indoc/2.0.4/download -> indoc-2.0.4.crate https://crates.io/api/v1/crates/libc/0.2.150/download -> libc-0.2.150.crate https://crates.io/api/v1/crates/lock_api/0.4.11/download -> lock_api-0.4.11.crate https://crates.io/api/v1/crates/memoffset/0.9.0/download -> memoffset-0.9.0.crate https://crates.io/api/v1/crates/once_cell/1.19.0/download -> once_cell-1.19.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.9/download -> parking_lot_core-0.9.9.crate https://crates.io/api/v1/crates/proc-macro2/1.0.70/download -> proc-macro2-1.0.70.crate https://crates.io/api/v1/crates/pyo3-build-config/0.20.0/download -> pyo3-build-config-0.20.0.crate https://crates.io/api/v1/crates/pyo3-ffi/0.20.0/download -> pyo3-ffi-0.20.0.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.20.0/download -> pyo3-macros-backend-0.20.0.crate https://crates.io/api/v1/crates/pyo3-macros/0.20.0/download -> pyo3-macros-0.20.0.crate https://crates.io/api/v1/crates/pyo3/0.20.0/download -> pyo3-0.20.0.crate https://crates.io/api/v1/crates/quote/1.0.33/download -> quote-1.0.33.crate https://crates.io/api/v1/crates/redox_syscall/0.4.1/download -> redox_syscall-0.4.1.crate https://crates.io/api/v1/crates/scopeguard/1.2.0/download -> scopeguard-1.2.0.crate https://crates.io/api/v1/crates/smallvec/1.11.2/download -> smallvec-1.11.2.crate https://crates.io/api/v1/crates/syn/2.0.41/download -> syn-2.0.41.crate https://crates.io/api/v1/crates/target-lexicon/0.12.12/download -> target-lexicon-0.12.12.crate https://crates.io/api/v1/crates/unicode-ident/1.0.12/download -> unicode-ident-1.0.12.crate https://crates.io/api/v1/crates/unindent/0.2.3/download -> unindent-0.2.3.crate https://crates.io/api/v1/crates/windows-targets/0.48.5/download -> windows-targets-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.5/download -> windows_aarch64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.5/download -> windows_aarch64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.5/download -> windows_i686_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.5/download -> windows_i686_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.5/download -> windows_x86_64_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.5/download -> windows_x86_64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.5/download -> windows_x86_64_msvc-0.48.5.crate )
 _eclasses_=cargo	67ea64209e3442a3a0e095f048d43a62	distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	rust-toolchain	68a6453cb41148db1da01fa2267527f0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=9012414245aaf5034ef963a7744ac54a
diff --git a/metadata/md5-cache/dev-python/structlog-24.4.0 b/metadata/md5-cache/dev-python/structlog-24.4.0
new file mode 100644
index 000000000000..b6fdd5d6d77b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/structlog-24.4.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-fancy-pypi-readme[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/hatch-vcs[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] test? ( dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pretend[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/pytest-7.4.4[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 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/hatchling-1.21.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Structured Logging for Python
+EAPI=8
+HOMEPAGE=https://github.com/hynek/structlog/ https://pypi.org/project/structlog/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=|| ( Apache-2.0 MIT )
+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 )
+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://files.pythonhosted.org/packages/source/s/structlog/structlog-24.4.0.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=9a6249fa62cf6fee91a1ab3bdcf80e0e
diff --git a/metadata/md5-cache/dev-python/textdistance-4.6.3 b/metadata/md5-cache/dev-python/textdistance-4.6.3
new file mode 100644
index 000000000000..b55385a8038b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/textdistance-4.6.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/numpy[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) 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(-)?] ) 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=Compute distance between the two texts
+EAPI=8
+HOMEPAGE=https://github.com/life4/textdistance/ https://pypi.org/project/textdistance/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+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://github.com/life4/textdistance/archive/4.6.3.tar.gz -> textdistance-4.6.3.gh.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=f32577952b32a31f7127f7a4f35de460
diff --git a/metadata/md5-cache/dev-python/uv-0.2.26 b/metadata/md5-cache/dev-python/uv-0.2.26
new file mode 100644
index 000000000000..03ba57327f7f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/uv-0.2.26
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/rust-1.77 test? ( dev-lang/python:3.8 dev-lang/python:3.9 dev-lang/python:3.10 dev-lang/python:3.11 dev-lang/python:3.12 ) >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DESCRIPTION=A Python package installer and resolver, written in Rust
+EAPI=8
+HOMEPAGE=https://github.com/astral-sh/uv/ https://pypi.org/project/uv/
+INHERIT=cargo check-reqs
+IUSE=test debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=|| ( Apache-2.0 MIT ) 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT MPL-2.0 Unicode-DFS-2016 openssl
+PROPERTIES=test_network
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/astral-sh/uv/archive/0.2.26.tar.gz -> uv-0.2.26.gh.tar.gz https://github.com/astral-sh/reqwest-middleware/archive/21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe.tar.gz -> reqwest-middleware-21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe.gh.tar.gz https://github.com/charliermarsh/rs-async-zip/archive/1dcb40cfe1bf5325a6fd4bfcf9894db40241f585.tar.gz -> rs-async-zip-1dcb40cfe1bf5325a6fd4bfcf9894db40241f585.gh.tar.gz https://github.com/astral-sh/reqwest-middleware/archive/21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe.tar.gz -> reqwest-middleware-21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe.gh.tar.gz https://github.com/astral-sh/pubgrub/archive/3f0ba760951ab0deeac874b98bb18fc90103fcf7.tar.gz -> pubgrub-3f0ba760951ab0deeac874b98bb18fc90103fcf7.gh.tar.gz https://dev.gentoo.org/~mgorny/dist/uv-0.2.25-crates.tar.xz
+_eclasses_=cargo	67ea64209e3442a3a0e095f048d43a62	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	rust-toolchain	68a6453cb41148db1da01fa2267527f0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=df2acb1e82040881a9bc62d8f711aae7
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 1eba62167a17..7302576d02af 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/acts_as_list-1.2.2 b/metadata/md5-cache/dev-ruby/acts_as_list-1.2.2
new file mode 100644
index 000000000000..99ae2e275f9f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-1.2.2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby31? ( >=dev-ruby/activerecord-6.1:*[ruby_targets_ruby31(-)] >=dev-ruby/activesupport-6.1:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/activerecord-6.1:*[ruby_targets_ruby32(-)] >=dev-ruby/activesupport-6.1:*[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( >=dev-ruby/activerecord-6.1:*[ruby_targets_ruby33(-)] >=dev-ruby/activesupport-6.1:*[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/minitest-hooks-1.5.1:1[ruby_targets_ruby31(-)] >=dev-ruby/mocha-2.1.0:2[ruby_targets_ruby31(-)] dev-ruby/test-unit:2[ruby_targets_ruby31(-)] >=dev-ruby/timecop-0.9.8[ruby_targets_ruby31(-)] dev-ruby/activerecord[ruby_targets_ruby31(-),sqlite] ) ) ruby_targets_ruby32? ( test? ( >=dev-ruby/minitest-hooks-1.5.1:1[ruby_targets_ruby32(-)] >=dev-ruby/mocha-2.1.0:2[ruby_targets_ruby32(-)] dev-ruby/test-unit:2[ruby_targets_ruby32(-)] >=dev-ruby/timecop-0.9.8[ruby_targets_ruby32(-)] dev-ruby/activerecord[ruby_targets_ruby32(-),sqlite] ) ) ruby_targets_ruby33? ( test? ( >=dev-ruby/minitest-hooks-1.5.1:1[ruby_targets_ruby33(-)] >=dev-ruby/mocha-2.1.0:2[ruby_targets_ruby33(-)] dev-ruby/test-unit:2[ruby_targets_ruby33(-)] >=dev-ruby/timecop-0.9.8[ruby_targets_ruby33(-)] dev-ruby/activerecord[ruby_targets_ruby33(-),sqlite] ) ) 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=Capabilities for sorting and reordering a number of objects in a list
+EAPI=8
+HOMEPAGE=https://github.com/brendon/acts_as_list
+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/activerecord-6.1:*[ruby_targets_ruby31(-)] >=dev-ruby/activesupport-6.1:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/activerecord-6.1:*[ruby_targets_ruby32(-)] >=dev-ruby/activesupport-6.1:*[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( >=dev-ruby/activerecord-6.1:*[ruby_targets_ruby33(-)] >=dev-ruby/activesupport-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? ( 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=3
+SRC_URI=https://github.com/brendon/acts_as_list/archive/refs/tags/v1.2.2.tar.gz -> acts_as_list-1.2.2.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=7f8b58a7214f654e261f580090c39448
diff --git a/metadata/md5-cache/dev-ruby/elastic-transport-8.2.2 b/metadata/md5-cache/dev-ruby/elastic-transport-8.2.2
deleted file mode 100644
index f3c06ee95dd8..000000000000
--- a/metadata/md5-cache/dev-ruby/elastic-transport-8.2.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby31? ( || ( dev-ruby/faraday:2[ruby_targets_ruby31(-)] dev-ruby/faraday:1[ruby_targets_ruby31(-)] ) dev-ruby/multi_json[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( || ( dev-ruby/faraday:2[ruby_targets_ruby32(-)] dev-ruby/faraday:1[ruby_targets_ruby32(-)] ) dev-ruby/multi_json[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/yard[ruby_targets_ruby31(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby31(-)] dev-ruby/hashie[ruby_targets_ruby31(-)] || ( ( dev-ruby/faraday:2[ruby_targets_ruby31(-)] dev-ruby/faraday-net_http_persistent[ruby_targets_ruby31(-)] ) dev-ruby/faraday:1[ruby_targets_ruby31(-)] ) dev-ruby/mocha:1.0[ruby_targets_ruby31(-)] dev-ruby/pry[ruby_targets_ruby31(-)] dev-ruby/rspec:3[ruby_targets_ruby31(-)] dev-ruby/shoulda-context[ruby_targets_ruby31(-)] dev-ruby/curb[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/yard[ruby_targets_ruby32(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby32(-)] dev-ruby/hashie[ruby_targets_ruby32(-)] || ( ( dev-ruby/faraday:2[ruby_targets_ruby32(-)] dev-ruby/faraday-net_http_persistent[ruby_targets_ruby32(-)] ) dev-ruby/faraday:1[ruby_targets_ruby32(-)] ) dev-ruby/mocha:1.0[ruby_targets_ruby32(-)] dev-ruby/pry[ruby_targets_ruby32(-)] dev-ruby/rspec:3[ruby_targets_ruby32(-)] dev-ruby/shoulda-context[ruby_targets_ruby32(-)] dev-ruby/curb[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=Transport classes and utilities shared among Ruby Elastic client libraries
-EAPI=8
-HOMEPAGE=https://github.com/elastic/elastic-transport-ruby
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby31? ( || ( dev-ruby/faraday:2[ruby_targets_ruby31(-)] dev-ruby/faraday:1[ruby_targets_ruby31(-)] ) dev-ruby/multi_json[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( || ( dev-ruby/faraday:2[ruby_targets_ruby32(-)] dev-ruby/faraday:1[ruby_targets_ruby32(-)] ) dev-ruby/multi_json[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=8
-SRC_URI=https://github.com/elastic/elastic-transport-ruby/archive/refs/tags/v8.2.2.tar.gz -> elastic-transport-8.2.2.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=e6e2548e702c034a44a23e8a9109f0c9
diff --git a/metadata/md5-cache/dev-ruby/elastic-transport-8.2.3 b/metadata/md5-cache/dev-ruby/elastic-transport-8.2.3
deleted file mode 100644
index 6e953ad9addb..000000000000
--- a/metadata/md5-cache/dev-ruby/elastic-transport-8.2.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby31? ( || ( dev-ruby/faraday:2[ruby_targets_ruby31(-)] dev-ruby/faraday:1[ruby_targets_ruby31(-)] ) dev-ruby/multi_json[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( || ( dev-ruby/faraday:2[ruby_targets_ruby32(-)] dev-ruby/faraday:1[ruby_targets_ruby32(-)] ) dev-ruby/multi_json[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/yard[ruby_targets_ruby31(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby31(-)] dev-ruby/hashie[ruby_targets_ruby31(-)] || ( ( dev-ruby/faraday:2[ruby_targets_ruby31(-)] dev-ruby/faraday-net_http_persistent[ruby_targets_ruby31(-)] ) dev-ruby/faraday:1[ruby_targets_ruby31(-)] ) dev-ruby/mocha:1.0[ruby_targets_ruby31(-)] dev-ruby/pry[ruby_targets_ruby31(-)] dev-ruby/rspec:3[ruby_targets_ruby31(-)] dev-ruby/shoulda-context[ruby_targets_ruby31(-)] dev-ruby/curb[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/yard[ruby_targets_ruby32(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby32(-)] dev-ruby/hashie[ruby_targets_ruby32(-)] || ( ( dev-ruby/faraday:2[ruby_targets_ruby32(-)] dev-ruby/faraday-net_http_persistent[ruby_targets_ruby32(-)] ) dev-ruby/faraday:1[ruby_targets_ruby32(-)] ) dev-ruby/mocha:1.0[ruby_targets_ruby32(-)] dev-ruby/pry[ruby_targets_ruby32(-)] dev-ruby/rspec:3[ruby_targets_ruby32(-)] dev-ruby/shoulda-context[ruby_targets_ruby32(-)] dev-ruby/curb[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=Transport classes and utilities shared among Ruby Elastic client libraries
-EAPI=8
-HOMEPAGE=https://github.com/elastic/elastic-transport-ruby
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby31? ( || ( dev-ruby/faraday:2[ruby_targets_ruby31(-)] dev-ruby/faraday:1[ruby_targets_ruby31(-)] ) dev-ruby/multi_json[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( || ( dev-ruby/faraday:2[ruby_targets_ruby32(-)] dev-ruby/faraday:1[ruby_targets_ruby32(-)] ) dev-ruby/multi_json[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=8
-SRC_URI=https://github.com/elastic/elastic-transport-ruby/archive/refs/tags/v8.2.3.tar.gz -> elastic-transport-8.2.3.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=91078a3f259c43602e76ad4cc90fa3f6
diff --git a/metadata/md5-cache/dev-ruby/elastic-transport-8.3.5 b/metadata/md5-cache/dev-ruby/elastic-transport-8.3.5
new file mode 100644
index 000000000000..10f6f7993fd9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/elastic-transport-8.3.5
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby31? ( || ( dev-ruby/faraday:2[ruby_targets_ruby31(-)] dev-ruby/faraday:1[ruby_targets_ruby31(-)] ) dev-ruby/multi_json[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( || ( dev-ruby/faraday:2[ruby_targets_ruby32(-)] dev-ruby/faraday:1[ruby_targets_ruby32(-)] ) dev-ruby/multi_json[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( || ( dev-ruby/faraday:2[ruby_targets_ruby33(-)] dev-ruby/faraday:1[ruby_targets_ruby33(-)] ) dev-ruby/multi_json[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/yard[ruby_targets_ruby31(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby31(-)] dev-ruby/hashie[ruby_targets_ruby31(-)] || ( ( dev-ruby/faraday:2[ruby_targets_ruby31(-)] dev-ruby/faraday-net_http_persistent:2[ruby_targets_ruby31(-)] ) dev-ruby/faraday:1[ruby_targets_ruby31(-)] ) dev-ruby/mocha:2[ruby_targets_ruby31(-)] dev-ruby/pry[ruby_targets_ruby31(-)] dev-ruby/rspec:3[ruby_targets_ruby31(-)] dev-ruby/shoulda-context[ruby_targets_ruby31(-)] dev-ruby/curb[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/yard[ruby_targets_ruby32(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby32(-)] dev-ruby/hashie[ruby_targets_ruby32(-)] || ( ( dev-ruby/faraday:2[ruby_targets_ruby32(-)] dev-ruby/faraday-net_http_persistent:2[ruby_targets_ruby32(-)] ) dev-ruby/faraday:1[ruby_targets_ruby32(-)] ) dev-ruby/mocha:2[ruby_targets_ruby32(-)] dev-ruby/pry[ruby_targets_ruby32(-)] dev-ruby/rspec:3[ruby_targets_ruby32(-)] dev-ruby/shoulda-context[ruby_targets_ruby32(-)] dev-ruby/curb[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/yard[ruby_targets_ruby33(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby33(-)] dev-ruby/hashie[ruby_targets_ruby33(-)] || ( ( dev-ruby/faraday:2[ruby_targets_ruby33(-)] dev-ruby/faraday-net_http_persistent:2[ruby_targets_ruby33(-)] ) dev-ruby/faraday:1[ruby_targets_ruby33(-)] ) dev-ruby/mocha:2[ruby_targets_ruby33(-)] dev-ruby/pry[ruby_targets_ruby33(-)] dev-ruby/rspec:3[ruby_targets_ruby33(-)] dev-ruby/shoulda-context[ruby_targets_ruby33(-)] dev-ruby/curb[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=Transport classes and utilities shared among Ruby Elastic client libraries
+EAPI=8
+HOMEPAGE=https://github.com/elastic/elastic-transport-ruby
+INHERIT=ruby-fakegem
+IUSE=doc test test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby31? ( || ( dev-ruby/faraday:2[ruby_targets_ruby31(-)] dev-ruby/faraday:1[ruby_targets_ruby31(-)] ) dev-ruby/multi_json[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( || ( dev-ruby/faraday:2[ruby_targets_ruby32(-)] dev-ruby/faraday:1[ruby_targets_ruby32(-)] ) dev-ruby/multi_json[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( || ( dev-ruby/faraday:2[ruby_targets_ruby33(-)] dev-ruby/faraday:1[ruby_targets_ruby33(-)] ) dev-ruby/multi_json[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=8
+SRC_URI=https://github.com/elastic/elastic-transport-ruby/archive/refs/tags/v8.3.5.tar.gz -> elastic-transport-8.3.5.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=2665120f9282bf3d3d3b41be176e20a5
diff --git a/metadata/md5-cache/dev-ruby/git-1.19.0 b/metadata/md5-cache/dev-ruby/git-1.19.0
deleted file mode 100644
index 1763684c27f9..000000000000
--- a/metadata/md5-cache/dev-ruby/git-1.19.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby31? ( >=dev-ruby/addressable-2.8:0[ruby_targets_ruby31(-)] >=dev-ruby/rchardet-1.8:1[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/addressable-2.8:0[ruby_targets_ruby32(-)] >=dev-ruby/rchardet-1.8:1[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] dev-ruby/minitar[ruby_targets_ruby31(-)] dev-ruby/test-unit:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/bundler[ruby_targets_ruby32(-)] dev-ruby/minitar[ruby_targets_ruby32(-)] 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=test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar ) 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=Library for using Git in Ruby
-EAPI=8
-HOMEPAGE=https://github.com/ruby-git/ruby-git
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-vcs/git-1.6.0.0 ruby_targets_ruby31? ( >=dev-ruby/addressable-2.8:0[ruby_targets_ruby31(-)] >=dev-ruby/rchardet-1.8:1[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/addressable-2.8:0[ruby_targets_ruby32(-)] >=dev-ruby/rchardet-1.8: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 )
-SLOT=0
-SRC_URI=https://github.com/ruby-git/ruby-git/archive/v1.19.0.tar.gz -> git-1.19.0.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=3aa6d7236af83b70f43e3823e6ea4d8a
diff --git a/metadata/md5-cache/dev-ruby/git-1.19.1 b/metadata/md5-cache/dev-ruby/git-1.19.1
index 9a0e3c8d443c..b6446284fb35 100644
--- a/metadata/md5-cache/dev-ruby/git-1.19.1
+++ b/metadata/md5-cache/dev-ruby/git-1.19.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby-git/ruby-git
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-vcs/git-1.6.0.0 ruby_targets_ruby31? ( >=dev-ruby/addressable-2.8:0[ruby_targets_ruby31(-)] >=dev-ruby/rchardet-1.8:1[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/addressable-2.8:0[ruby_targets_ruby32(-)] >=dev-ruby/rchardet-1.8:1[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( >=dev-ruby/addressable-2.8:0[ruby_targets_ruby33(-)] >=dev-ruby/rchardet-1.8: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=0
 SRC_URI=https://github.com/ruby-git/ruby-git/archive/v1.19.1.tar.gz -> git-1.19.1.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=256181e3cf7f099e1f7d1a0c62f2da61
+_md5_=2bbf34a4d948806e1e4f102784191ded
diff --git a/metadata/md5-cache/dev-ruby/git-2.1.1 b/metadata/md5-cache/dev-ruby/git-2.1.1
index fd58aaa6ec65..5e9b936defee 100644
--- a/metadata/md5-cache/dev-ruby/git-2.1.1
+++ b/metadata/md5-cache/dev-ruby/git-2.1.1
@@ -1,6 +1,6 @@
 BDEPEND=test? ( ruby_targets_ruby31? ( >=dev-ruby/activesupport-5.0:*[ruby_targets_ruby31(-)] >=dev-ruby/addressable-2.8:0[ruby_targets_ruby31(-)] >=dev-ruby/process_executer-1.1:1[ruby_targets_ruby31(-)] >=dev-ruby/rchardet-1.8:1[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/activesupport-5.0:*[ruby_targets_ruby32(-)] >=dev-ruby/addressable-2.8:0[ruby_targets_ruby32(-)] >=dev-ruby/process_executer-1.1:1[ruby_targets_ruby32(-)] >=dev-ruby/rchardet-1.8:1[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( >=dev-ruby/activesupport-5.0:*[ruby_targets_ruby33(-)] >=dev-ruby/addressable-2.8:0[ruby_targets_ruby33(-)] >=dev-ruby/process_executer-1.1:1[ruby_targets_ruby33(-)] >=dev-ruby/rchardet-1.8:1[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] dev-ruby/minitar[ruby_targets_ruby31(-)] >=dev-ruby/mocha-2.1:2[ruby_targets_ruby31(-)] dev-ruby/test-unit:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/bundler[ruby_targets_ruby32(-)] dev-ruby/minitar[ruby_targets_ruby32(-)] >=dev-ruby/mocha-2.1:2[ruby_targets_ruby32(-)] dev-ruby/test-unit:2[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/bundler[ruby_targets_ruby33(-)] dev-ruby/minitar[ruby_targets_ruby33(-)] >=dev-ruby/mocha-2.1:2[ruby_targets_ruby33(-)] dev-ruby/test-unit: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=test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar ) 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=test? ( >=dev-vcs/git-1.6.0.0 net-misc/openssh app-arch/tar ) 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=Library for using Git in Ruby
 EAPI=8
 HOMEPAGE=https://github.com/ruby-git/ruby-git
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ruby-git/ruby-git/archive/v2.1.1.tar.gz -> git-2.1.1.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=66d6e9bed99a0a9961938d3c4cab8e54
+_md5_=eb2e0640ee43f09ed753938cc3f5339f
diff --git a/metadata/md5-cache/dev-ruby/omniauth-2.1.1 b/metadata/md5-cache/dev-ruby/omniauth-2.1.1
deleted file mode 100644
index 8593e0044f3c..000000000000
--- a/metadata/md5-cache/dev-ruby/omniauth-2.1.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby31? ( >=dev-ruby/rack-2.2.3[ruby_targets_ruby31(-)] dev-ruby/rack-protection[ruby_targets_ruby31(-)] >=dev-ruby/hashie-3.4.6:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/rack-2.2.3[ruby_targets_ruby32(-)] dev-ruby/rack-protection[ruby_targets_ruby32(-)] >=dev-ruby/hashie-3.4.6:*[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/yard[ruby_targets_ruby31(-)] ) test? ( dev-ruby/rack-test[ruby_targets_ruby31(-)] dev-ruby/rack:2.2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/yard[ruby_targets_ruby32(-)] ) test? ( dev-ruby/rack-test[ruby_targets_ruby32(-)] dev-ruby/rack:2.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=A generalized Rack framework for multiple-provider authentication
-EAPI=8
-HOMEPAGE=https://github.com/omniauth/omniauth
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby31? ( >=dev-ruby/rack-2.2.3[ruby_targets_ruby31(-)] dev-ruby/rack-protection[ruby_targets_ruby31(-)] >=dev-ruby/hashie-3.4.6:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/rack-2.2.3[ruby_targets_ruby32(-)] dev-ruby/rack-protection[ruby_targets_ruby32(-)] >=dev-ruby/hashie-3.4.6:*[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=2
-SRC_URI=https://github.com/omniauth/omniauth/archive/v2.1.1.tar.gz -> omniauth-2.1.1.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=44f7e7a50837c53a84b945a864d1aede
diff --git a/metadata/md5-cache/dev-ruby/omniauth-2.1.2 b/metadata/md5-cache/dev-ruby/omniauth-2.1.2
index 2f2812081c1e..db617c3ae449 100644
--- a/metadata/md5-cache/dev-ruby/omniauth-2.1.2
+++ b/metadata/md5-cache/dev-ruby/omniauth-2.1.2
@@ -1,11 +1,11 @@
-BDEPEND=test? ( ruby_targets_ruby31? ( >=dev-ruby/rack-2.2.3[ruby_targets_ruby31(-)] dev-ruby/rack-protection[ruby_targets_ruby31(-)] >=dev-ruby/hashie-3.4.6:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/rack-2.2.3[ruby_targets_ruby32(-)] dev-ruby/rack-protection[ruby_targets_ruby32(-)] >=dev-ruby/hashie-3.4.6:*[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( >=dev-ruby/rack-2.2.3[ruby_targets_ruby33(-)] dev-ruby/rack-protection[ruby_targets_ruby33(-)] >=dev-ruby/hashie-3.4.6:*[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/yard[ruby_targets_ruby31(-)] ) test? ( dev-ruby/rack-test[ruby_targets_ruby31(-)] dev-ruby/rack:2.2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/yard[ruby_targets_ruby32(-)] ) test? ( dev-ruby/rack-test[ruby_targets_ruby32(-)] dev-ruby/rack:2.2[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/yard[ruby_targets_ruby33(-)] ) test? ( dev-ruby/rack-test[ruby_targets_ruby33(-)] dev-ruby/rack:2.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/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/rack-2.2.3[ruby_targets_ruby31(-)] dev-ruby/rack-protection[ruby_targets_ruby31(-)] >=dev-ruby/hashie-3.4.6:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/rack-2.2.3[ruby_targets_ruby32(-)] dev-ruby/rack-protection[ruby_targets_ruby32(-)] >=dev-ruby/hashie-3.4.6:*[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( >=dev-ruby/rack-2.2.3[ruby_targets_ruby33(-)] dev-ruby/rack-protection[ruby_targets_ruby33(-)] >=dev-ruby/hashie-3.4.6:*[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/yard[ruby_targets_ruby31(-)] ) test? ( dev-ruby/rack-test[ruby_targets_ruby31(-)] dev-ruby/rack:2.2[ruby_targets_ruby31(-)] dev-ruby/rack-protection:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/yard[ruby_targets_ruby32(-)] ) test? ( dev-ruby/rack-test[ruby_targets_ruby32(-)] dev-ruby/rack:2.2[ruby_targets_ruby32(-)] dev-ruby/rack-protection:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/yard[ruby_targets_ruby33(-)] ) test? ( dev-ruby/rack-test[ruby_targets_ruby33(-)] dev-ruby/rack:2.2[ruby_targets_ruby33(-)] dev-ruby/rack-protection: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=A generalized Rack framework for multiple-provider authentication
 EAPI=8
 HOMEPAGE=https://github.com/omniauth/omniauth
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
+IUSE=doc test test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby31? ( >=dev-ruby/rack-2.2.3[ruby_targets_ruby31(-)] dev-ruby/rack-protection[ruby_targets_ruby31(-)] >=dev-ruby/hashie-3.4.6:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/rack-2.2.3[ruby_targets_ruby32(-)] dev-ruby/rack-protection[ruby_targets_ruby32(-)] >=dev-ruby/hashie-3.4.6:*[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( >=dev-ruby/rack-2.2.3[ruby_targets_ruby33(-)] dev-ruby/rack-protection[ruby_targets_ruby33(-)] >=dev-ruby/hashie-3.4.6:*[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(-)] )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/omniauth/omniauth/archive/v2.1.2.tar.gz -> omniauth-2.1.2.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=b3c9a3884281204ffef27e7c0634d849
+_md5_=9f8015b56b1a9bd6ddb5a6540a32b5ab
diff --git a/metadata/md5-cache/dev-ruby/rouge-4.2.1 b/metadata/md5-cache/dev-ruby/rouge-4.2.1
index e9c3209ae639..4848344de732 100644
--- a/metadata/md5-cache/dev-ruby/rouge-4.2.1
+++ b/metadata/md5-cache/dev-ruby/rouge-4.2.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rouge-ruby/rouge
 INHERIT=ruby-fakegem
 IUSE=doc test 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=BSD-2 MIT
 RDEPEND=ruby_targets_ruby31? ( dev-ruby/redcarpet[ruby_targets_ruby31(-)] !<dev-ruby/rouge-3.30.0-r1[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/redcarpet[ruby_targets_ruby32(-)] !<dev-ruby/rouge-3.30.0-r1[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( dev-ruby/redcarpet[ruby_targets_ruby33(-)] !<dev-ruby/rouge-3.30.0-r1[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=4
 SRC_URI=https://github.com/rouge-ruby/rouge/archive/v4.2.1.tar.gz -> rouge-4.2.1.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c6c013479472486bdac2b367dc90060d
+_md5_=3c084b470a5858fc42d55897a27ebb0b
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.1.0-r1 b/metadata/md5-cache/dev-ruby/sass-rails-5.1.0-r1
index 3b7175c3a42f..f4718d31e4cc 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.1.0-r1
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby31? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby31(-)] =dev-ruby/sass-3*:*[ruby_targets_ruby31(-)] >=dev-ruby/railties-5.2.0[ruby_targets_ruby31(-)] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby31(-)] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby31(-)] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby31(-)] <dev-ruby/sprockets-4:*[ruby_targets_ruby31(-)] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby31(-)] <dev-ruby/tilt-3:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby32(-)] =dev-ruby/sass-3*:*[ruby_targets_ruby32(-)] >=dev-ruby/railties-5.2.0[ruby_targets_ruby32(-)] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby32(-)] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby32(-)] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby32(-)] <dev-ruby/sprockets-4:*[ruby_targets_ruby32(-)] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby32(-)] <dev-ruby/tilt-3:*[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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby31? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby31(-)] =dev-ruby/sass-3*:*[ruby_targets_ruby31(-)] >=dev-ruby/railties-5.2.0[ruby_targets_ruby31(-)] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby31(-)] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby31(-)] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby31(-)] <dev-ruby/sprockets-4:*[ruby_targets_ruby31(-)] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby31(-)] <dev-ruby/tilt-3:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby32(-)] =dev-ruby/sass-3*:*[ruby_targets_ruby32(-)] >=dev-ruby/railties-5.2.0[ruby_targets_ruby32(-)] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby32(-)] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby32(-)] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby32(-)] <dev-ruby/sprockets-4:*[ruby_targets_ruby32(-)] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby32(-)] <dev-ruby/tilt-3:*[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby33(-)] =dev-ruby/sass-3*:*[ruby_targets_ruby33(-)] >=dev-ruby/railties-5.2.0[ruby_targets_ruby33(-)] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby33(-)] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby33(-)] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby33(-)] <dev-ruby/sprockets-4:*[ruby_targets_ruby33(-)] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby33(-)] <dev-ruby/tilt-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/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_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=Official Ruby-on-Rails Integration with Sass
 EAPI=8
 HOMEPAGE=https://github.com/rails/sass-rails
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby31? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby31(-)] =dev-ruby/sass-3*:*[ruby_targets_ruby31(-)] >=dev-ruby/railties-5.2.0[ruby_targets_ruby31(-)] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby31(-)] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby31(-)] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby31(-)] <dev-ruby/sprockets-4:*[ruby_targets_ruby31(-)] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby31(-)] <dev-ruby/tilt-3:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby32(-)] =dev-ruby/sass-3*:*[ruby_targets_ruby32(-)] >=dev-ruby/railties-5.2.0[ruby_targets_ruby32(-)] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby32(-)] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby32(-)] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby32(-)] <dev-ruby/sprockets-4:*[ruby_targets_ruby32(-)] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby32(-)] <dev-ruby/tilt-3:*[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? ( test )
+RDEPEND=ruby_targets_ruby31? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby31(-)] =dev-ruby/sass-3*:*[ruby_targets_ruby31(-)] >=dev-ruby/railties-5.2.0[ruby_targets_ruby31(-)] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby31(-)] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby31(-)] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby31(-)] <dev-ruby/sprockets-4:*[ruby_targets_ruby31(-)] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby31(-)] <dev-ruby/tilt-3:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby32(-)] =dev-ruby/sass-3*:*[ruby_targets_ruby32(-)] >=dev-ruby/railties-5.2.0[ruby_targets_ruby32(-)] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby32(-)] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby32(-)] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby32(-)] <dev-ruby/sprockets-4:*[ruby_targets_ruby32(-)] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby32(-)] <dev-ruby/tilt-3:*[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby33(-)] =dev-ruby/sass-3*:*[ruby_targets_ruby33(-)] >=dev-ruby/railties-5.2.0[ruby_targets_ruby33(-)] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby33(-)] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby33(-)] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby33(-)] <dev-ruby/sprockets-4:*[ruby_targets_ruby33(-)] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby33(-)] <dev-ruby/tilt-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 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.1.0.tar.gz -> sass-rails-5.1.0.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=94acf58315b88fd3122e9ca5867996af
+_md5_=864af7edb2acfc6315cc00948b95f718
diff --git a/metadata/md5-cache/dev-util/0xtools-2.0.2 b/metadata/md5-cache/dev-util/0xtools-2.0.2
new file mode 100644
index 000000000000..a1d9cec86eab
--- /dev/null
+++ b/metadata/md5-cache/dev-util/0xtools-2.0.2
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) virtual/pkgconfig
+DEFINED_PHASES=compile install setup
+DESCRIPTION=Always-on profiling for production systems
+EAPI=8
+HOMEPAGE=https://0x.tools/ https://github.com/tanelpoder/0xtools/
+INHERIT=python-single-r1 systemd toolchain-funcs
+IUSE=python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=~amd64 ~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/tanelpoder/0xtools/archive/v2.0.2.tar.gz -> 0xtools-2.0.2.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=c7c503e4f4da75195f8083b061e4e948
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 132b59c6d568..f7d3c201f986 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/intel_clc-24.1.3 b/metadata/md5-cache/dev-util/intel_clc-24.1.3
index 782e70231a0c..b7093b5e143f 100644
--- a/metadata/md5-cache/dev-util/intel_clc-24.1.3
+++ b/metadata/md5-cache/dev-util/intel_clc-24.1.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://mesa3d.org/
 INHERIT=llvm-r1 meson python-any-r1
 IUSE=debug +llvm_slot_17 llvm_slot_16 llvm_slot_18
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT SGI-B-2.0
 RDEPEND=dev-libs/libclc dev-util/spirv-tools >=sys-libs/zlib-1.2.8:= x11-libs/libdrm llvm_slot_16? ( dev-util/spirv-llvm-translator:16 sys-devel/clang:16 sys-devel/llvm:16 ) llvm_slot_17? ( dev-util/spirv-llvm-translator:17 sys-devel/clang:17 sys-devel/llvm:17 ) llvm_slot_18? ( dev-util/spirv-llvm-translator:18 sys-devel/clang:18 sys-devel/llvm:18 )
 REQUIRED_USE=^^ ( llvm_slot_16 llvm_slot_17 llvm_slot_18 )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-24.1.3.tar.xz
 _eclasses_=flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	meson	99466844dd8d4fcfb07578a76f5a9922	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=4935c70e65214aaa3e5acc186b1d53d9
+_md5_=2060b7f59a38e8d75731af5c478ce3a3
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 95ab2e6d7cdf..e0d8a0361d99 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-46.0 b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-46.0
new file mode 100644
index 000000000000..6762d935dc17
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-46.0
@@ -0,0 +1,14 @@
+BDEPEND=introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DESCRIPTION=Collection of GSettings schemas for GNOME desktop
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson xdg
+IUSE=+introspection
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=LGPL-2.1+
+SLOT=0
+SRC_URI=mirror://gnome/sources/gsettings-desktop-schemas/46/gsettings-desktop-schemas-46.0.tar.xz
+_eclasses_=flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	gnome.org	e1b4f392dbfedfb8974b71b017937f08	gnome2-utils	a8cf148ec7f5ae0b1f1d33ae5f7f9e88	meson	99466844dd8d4fcfb07578a76f5a9922	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=fd1485258648fa3d13e94051a4469093
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 122931fa3fc2..d42b783e69d9 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/gnome-tweaks-46.1 b/metadata/md5-cache/gnome-extra/gnome-tweaks-46.1
new file mode 100644
index 000000000000..96b266048843
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-tweaks-46.1
@@ -0,0 +1,17 @@
+BDEPEND=>=sys-devel/gettext-0.19.8 app-arch/xz-utils >=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 ) python_single_target_python3_12? ( dev-lang/python:3.12 )
+DESCRIPTION=Customize advanced GNOME options
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-tweaks
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson python-single-r1 xdg
+IUSE=python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-3+ CC0-1.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 ) python_single_target_python3_10? ( >=dev-python/pygobject-3.46.0:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.46.0:3[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/pygobject-3.46.0:3[python_targets_python3_12(-)] ) >=gnome-base/gnome-settings-daemon-3 x11-themes/sound-theme-freedesktop >=dev-libs/glib-2.78:2 >=dev-libs/gobject-introspection-1.78.0 >=gui-libs/gtk-4.10.0:4[introspection] >=gui-libs/libadwaita-1.4.0 >=dev-libs/libgudev-238 >=gnome-base/gnome-desktop-3.30:3[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] >=gnome-base/gsettings-desktop-schemas-46.0 >=gnome-base/gnome-shell-3.24 x11-wm/mutter
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-tweaks/46/gnome-tweaks-46.1.tar.xz
+_eclasses_=flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	gnome.org	e1b4f392dbfedfb8974b71b017937f08	gnome2-utils	a8cf148ec7f5ae0b1f1d33ae5f7f9e88	meson	99466844dd8d4fcfb07578a76f5a9922	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=51d4baa6c19d52648db085cbe5c479cf
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 166a8cb7d4c7..a60454fca1d5 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/thunderbird-115.13.0 b/metadata/md5-cache/mail-client/thunderbird-115.13.0
index b842f01929ea..69137d86b8fa 100644
--- a/metadata/md5-cache/mail-client/thunderbird-115.13.0
+++ b/metadata/md5-cache/mail-client/thunderbird-115.13.0
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.thunderbird.net/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs virtualx xdg
 IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi +X +system-librnp l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=!<x11-plugins/enigmail-2.2 selinux? ( sec-policy/selinux-thunderbird ) !system-librnp? ( dev-libs/jsoncpp ) system-librnp? ( dev-util/librnp ) >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.90 >=dev-libs/nspr-4.35 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) pulseaudio? ( || ( media-libs/libpulse >=media-sound/apulse-0.1.12-r4[sdk] ) ) libproxy? ( net-libs/libproxy ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-74.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( >=media-libs/libepoxy-1.5.10-r1 x11-libs/gtk+:3[wayland] x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) X? ( virtual/opengl x11-libs/cairo[X] x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] )
 REQUIRED_USE=|| ( X wayland ) debug? ( !system-av1 ) pgo? ( lto ) wifi? ( dbus )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/source/thunderbird-115.13.0.source.tar.xz -> thunderbird-115.13.0.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-115esr-patches-11.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/af.xpi -> thunderbird-115.13.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/ar.xpi -> thunderbird-115.13.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/ast.xpi -> thunderbird-115.13.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/be.xpi -> thunderbird-115.13.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/bg.xpi -> thunderbird-115.13.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/br.xpi -> thunderbird-115.13.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/ca.xpi -> thunderbird-115.13.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/cak.xpi -> thunderbird-115.13.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/cs.xpi -> thunderbird-115.13.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/cy.xpi -> thunderbird-115.13.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/da.xpi -> thunderbird-115.13.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/de.xpi -> thunderbird-115.13.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-115.13.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/el.xpi -> thunderbird-115.13.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-115.13.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-115.13.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-115.13.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-115.13.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/es-MX.xpi -> thunderbird-115.13.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/et.xpi -> thunderbird-115.13.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/eu.xpi -> thunderbird-115.13.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/fi.xpi -> thunderbird-115.13.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/fr.xpi -> thunderbird-115.13.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-115.13.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-115.13.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/gd.xpi -> thunderbird-115.13.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/gl.xpi -> thunderbird-115.13.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/he.xpi -> thunderbird-115.13.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/hr.xpi -> thunderbird-115.13.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-115.13.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/hu.xpi -> thunderbird-115.13.0-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/id.xpi -> thunderbird-115.13.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/is.xpi -> thunderbird-115.13.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/it.xpi -> thunderbird-115.13.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/ja.xpi -> thunderbird-115.13.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/ka.xpi -> thunderbird-115.13.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/kab.xpi -> thunderbird-115.13.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/kk.xpi -> thunderbird-115.13.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/ko.xpi -> thunderbird-115.13.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/lt.xpi -> thunderbird-115.13.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/lv.xpi -> thunderbird-115.13.0-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/ms.xpi -> thunderbird-115.13.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-115.13.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/nl.xpi -> thunderbird-115.13.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-115.13.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-115.13.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/pl.xpi -> thunderbird-115.13.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-115.13.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-115.13.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/rm.xpi -> thunderbird-115.13.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/ro.xpi -> thunderbird-115.13.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/ru.xpi -> thunderbird-115.13.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/sk.xpi -> thunderbird-115.13.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/sl.xpi -> thunderbird-115.13.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/sq.xpi -> thunderbird-115.13.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/sr.xpi -> thunderbird-115.13.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-115.13.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/th.xpi -> thunderbird-115.13.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/tr.xpi -> thunderbird-115.13.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/uk.xpi -> thunderbird-115.13.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/uz.xpi -> thunderbird-115.13.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/vi.xpi -> thunderbird-115.13.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-115.13.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-115.13.0-zh-TW.xpi )
 _eclasses_=autotools	d12ccbad07b44642a75ac97a3334d8e0	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	gnome2-utils	a8cf148ec7f5ae0b1f1d33ae5f7f9e88	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=998a694707c9a152e5002122f4e922df
+_md5_=b49879cc4c95277a1e25c7398b69bd89
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index d0b6ae48e69c..370aa2c81e21 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/symbols-nerd-font-3.2.1 b/metadata/md5-cache/media-fonts/symbols-nerd-font-3.2.1
index cc3edf5fd1a0..5260c3a38cd6 100644
--- a/metadata/md5-cache/media-fonts/symbols-nerd-font-3.2.1
+++ b/metadata/md5-cache/media-fonts/symbols-nerd-font-3.2.1
@@ -9,4 +9,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/ryanoasis/nerd-fonts/releases/download/v3.2.1/NerdFontsSymbolsOnly.zip -> symbols-nerd-font-3.2.1.zip
 _eclasses_=font	aa113a3df9cd0a9693a1c1ee7c34a6eb
-_md5_=bf84a6fb743c739d7724755487c26757
+_md5_=e16eece25d4a013d5f19dcd868a9f2c7
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 6e3c197beb0a..a742fad18fa9 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/scrot-1.9 b/metadata/md5-cache/media-gfx/scrot-1.11.1
index be94d054d466..084bf20f9360 100644
--- a/metadata/md5-cache/media-gfx/scrot-1.9
+++ b/metadata/md5-cache/media-gfx/scrot-1.11.1
@@ -1,14 +1,14 @@
-BDEPEND=dev-build/autoconf-archive virtual/pkgconfig
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=install prepare
-DEPEND=media-libs/imlib2[X,filters(+),text(+)] x11-libs/libXext x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama media-libs/imlib2[png] x11-base/xorg-proto elibc_musl? ( sys-libs/queue-standalone )
+DEPEND=media-libs/imlib2[X,filters(+),text(+)] x11-libs/libXext x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama media-libs/imlib2[png] x11-base/xorg-proto
 DESCRIPTION=Screen capture utility using imlib2 library
 EAPI=8
 HOMEPAGE=https://github.com/resurrecting-open-source-projects/scrot
-INHERIT=bash-completion-r1
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86
+INHERIT=shell-completion
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=feh
 RDEPEND=media-libs/imlib2[X,filters(+),text(+)] x11-libs/libXext x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama media-libs/imlib2[png]
 SLOT=0
-SRC_URI=https://github.com/resurrecting-open-source-projects/scrot/releases/download/1.9/scrot-1.9.tar.bz2
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=b130d8b11e9b8b57c054c27e2c4f59e2
+SRC_URI=https://github.com/resurrecting-open-source-projects/scrot/releases/download/1.11.1/scrot-1.11.1.tar.bz2
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	c19072c3cd7ac5cb21de013f7e9832e0	shell-completion	bb7eb6bc232cd6c4bf8af739cdd2ee14	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=c6464feebd3263ccd99f7617d7ab2852
diff --git a/metadata/md5-cache/media-gfx/scrot-9999 b/metadata/md5-cache/media-gfx/scrot-9999
index 4d3e11af9248..5e621652f0d5 100644
--- a/metadata/md5-cache/media-gfx/scrot-9999
+++ b/metadata/md5-cache/media-gfx/scrot-9999
@@ -1,13 +1,13 @@
 BDEPEND=dev-build/autoconf-archive virtual/pkgconfig >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.17-r1:1.17 >=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 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install prepare unpack
-DEPEND=media-libs/imlib2[X,filters(+),text(+)] x11-libs/libXext x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama media-libs/imlib2[png] x11-base/xorg-proto elibc_musl? ( sys-libs/queue-standalone )
+DEPEND=media-libs/imlib2[X,filters(+),text(+)] x11-libs/libXext x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama media-libs/imlib2[png] x11-base/xorg-proto
 DESCRIPTION=Screen capture utility using imlib2 library
 EAPI=8
 HOMEPAGE=https://github.com/resurrecting-open-source-projects/scrot
-INHERIT=bash-completion-r1 autotools git-r3
+INHERIT=shell-completion autotools git-r3
 LICENSE=feh
 PROPERTIES=live
 RDEPEND=media-libs/imlib2[X,filters(+),text(+)] x11-libs/libXext x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama media-libs/imlib2[png]
 SLOT=0
-_eclasses_=autotools	d12ccbad07b44642a75ac97a3334d8e0	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	875eb471682d3e1f18da124be97dcc81	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=fcdde0d85fc3c31b83ba163d79544092
+_eclasses_=autotools	d12ccbad07b44642a75ac97a3334d8e0	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	875eb471682d3e1f18da124be97dcc81	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	shell-completion	bb7eb6bc232cd6c4bf8af739cdd2ee14	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=c6464feebd3263ccd99f7617d7ab2852
diff --git a/metadata/md5-cache/media-gfx/xv-5.2.0 b/metadata/md5-cache/media-gfx/xv-5.2.0
new file mode 100644
index 000000000000..3223070faf5f
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/xv-5.2.0
@@ -0,0 +1,15 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/libXt jpeg? ( media-libs/libjpeg-turbo:= ) tiff? ( media-libs/tiff:= ) png? ( >=media-libs/libpng-1.2:= sys-libs/zlib ) webp? ( media-libs/libwebp:= )
+DESCRIPTION=Interactive image manipulation program supporting a wide variety of formats
+EAPI=8
+HOMEPAGE=https://github.com/jasper-software/xv/
+INHERIT=cmake desktop
+IUSE=jpeg tiff png webp
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=xv
+RDEPEND=x11-libs/libXt jpeg? ( media-libs/libjpeg-turbo:= ) tiff? ( media-libs/tiff:= ) png? ( >=media-libs/libpng-1.2:= sys-libs/zlib ) webp? ( media-libs/libwebp:= )
+SLOT=0
+SRC_URI=https://github.com/jasper-software/xv/archive/refs/tags/v5.2.0.tar.gz -> xv-5.2.0.tar.gz mirror://gentoo/xv-3.10a.png.bz2
+_eclasses_=cmake	258a4691fd43b8cd5814cb1acbb3c7df	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=c20fff007ad7f67a0d8aaf5a45e38268
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 4f8db4e8c8c8..7fefba16e441 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/libshumate-1.2.2 b/metadata/md5-cache/media-libs/libshumate-1.2.2
new file mode 100644
index 000000000000..b9e5101a25fa
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libshumate-1.2.2
@@ -0,0 +1,17 @@
+BDEPEND=gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) vala? ( || ( dev-lang/vala:0.56 ) ) app-arch/xz-utils >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/glib-2.74.0:2 >=x11-libs/cairo-1.4 >=dev-db/sqlite-1.12:3 >=gui-libs/gtk-4:4 >=net-libs/libsoup-3.0:3.0 introspection? ( >=dev-libs/gobject-introspection-0.6.3:= ) >=dev-libs/json-glib-1.6.0[introspection?] dev-libs/protobuf-c sysprof? ( dev-util/sysprof-capture:4 )
+DESCRIPTION=Shumate is a GTK toolkit providing widgets for embedded maps
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/libshumate
+INHERIT=gnome.org meson vala virtualx
+IUSE=gtk-doc +introspection sysprof vala test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.74.0:2 >=x11-libs/cairo-1.4 >=dev-db/sqlite-1.12:3 >=gui-libs/gtk-4:4 >=net-libs/libsoup-3.0:3.0 introspection? ( >=dev-libs/gobject-introspection-0.6.3:= ) >=dev-libs/json-glib-1.6.0[introspection?] dev-libs/protobuf-c
+REQUIRED_USE=gtk-doc? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=1.0/1
+SRC_URI=mirror://gnome/sources/libshumate/1.2/libshumate-1.2.2.tar.xz
+_eclasses_=flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	gnome.org	e1b4f392dbfedfb8974b71b017937f08	meson	99466844dd8d4fcfb07578a76f5a9922	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	virtualx	817571665ee28575da44ee08135089e5
+_md5_=525123ef1c12e84a9ef93515d8d03203
diff --git a/metadata/md5-cache/media-libs/mesa-24.1.3 b/metadata/md5-cache/media-libs/mesa-24.1.3
index 72d0a6677e60..f893b2f04532 100644
--- a/metadata/md5-cache/media-libs/mesa-24.1.3
+++ b/metadata/md5-cache/media-libs/mesa-24.1.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
 INHERIT=flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain toolchain-funcs cargo
 IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_d3d12 video_cards_freedreno video_cards_intel video_cards_lavapipe video_cards_lima video_cards_nouveau video_cards_nvk video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware video_cards_zink cpu_flags_x86_sse2 d3d9 debug +llvm lm-sensors opencl +opengl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa +zstd +llvm_slot_17 llvm_slot_15 llvm_slot_16 llvm_slot_18 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 debug
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=MIT SGI-B-2.0
 RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( llvm_slot_15? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:15 sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_16? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:16 sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_17? ( sys-devel/llvm:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:17 sys-devel/clang:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_18? ( sys-devel/llvm:18[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:18 sys-devel/clang:18[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.119[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_amdgpu] )
 REQUIRED_USE=d3d9? ( || ( video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_panfrost video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_vmware video_cards_zink ) ) llvm? ( ^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 llvm_slot_18 ) ) vulkan-overlay? ( vulkan ) video_cards_lavapipe? ( llvm vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_zink? ( vulkan opengl ) video_cards_nvk? ( vulkan video_cards_nouveau ) vdpau? ( X ) xa? ( X )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-24.1.3.tar.xz https://crates.io/api/v1/crates/syn/2.0.39/download -> syn-2.0.39.crate https://crates.io/api/v1/crates/proc-macro2/1.0.70/download -> proc-macro2-1.0.70.crate https://crates.io/api/v1/crates/quote/1.0.33/download -> quote-1.0.33.crate https://crates.io/api/v1/crates/unicode-ident/1.0.12/download -> unicode-ident-1.0.12.crate https://crates.io/api/v1/crates/paste/1.0.14/download -> paste-1.0.14.crate
 _eclasses_=cargo	67ea64209e3442a3a0e095f048d43a62	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	meson	99466844dd8d4fcfb07578a76f5a9922	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	rust-toolchain	68a6453cb41148db1da01fa2267527f0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=b28d025412a6ce6dd301c3f89e64352a
+_md5_=a35d6d893d371c1f0ff70fdb0b457757
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index d0e9c634d7d3..a45295b0e36b 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/gnome-music-46.0 b/metadata/md5-cache/media-sound/gnome-music-46.0
new file mode 100644
index 000000000000..f996cd021c6d
--- /dev/null
+++ b/metadata/md5-cache/media-sound/gnome-music-46.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/libxml2:2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=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_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) >=dev-libs/glib-2.67.1:2 >=dev-libs/gobject-introspection-1.54:= >=gui-libs/gtk-4.10.0:4[introspection] >=gui-libs/libadwaita-1.5_beta:1=[introspection] >=media-libs/libmediaart-1.9.1:2.0[introspection] net-libs/libsoup:3.0[introspection] app-misc/tracker:3=[introspection(+)] >=x11-libs/pango-1.44:= python_single_target_python3_11? ( >=dev-python/pygobject-3.47.0:3[cairo,python_targets_python3_11(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/pygobject-3.47.0:3[cairo,python_targets_python3_12(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_12(-)] ) >=media-libs/grilo-0.3.15-r1:0.3[introspection] >=media-plugins/grilo-plugins-0.3.16:0.3[tracker]
+DESCRIPTION=Music management for Gnome
+EAPI=8
+HOMEPAGE=https://apps.gnome.org/Music/ https://gitlab.gnome.org/GNOME/gnome-music/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson python-single-r1 xdg
+IUSE=python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~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 ) >=dev-libs/glib-2.67.1:2 >=dev-libs/gobject-introspection-1.54:= >=gui-libs/gtk-4.10.0:4[introspection] >=gui-libs/libadwaita-1.5_beta:1=[introspection] >=media-libs/libmediaart-1.9.1:2.0[introspection] net-libs/libsoup:3.0[introspection] app-misc/tracker:3=[introspection(+)] >=x11-libs/pango-1.44:= python_single_target_python3_11? ( >=dev-python/pygobject-3.47.0:3[cairo,python_targets_python3_11(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/pygobject-3.47.0:3[cairo,python_targets_python3_12(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_12(-)] ) >=media-libs/grilo-0.3.15-r1:0.3[introspection] >=media-plugins/grilo-plugins-0.3.16:0.3[tracker] || ( app-misc/tracker-miners:3[gstreamer] app-misc/tracker-miners:3[ffmpeg] ) x11-libs/libnotify[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-plugins/gst-plugins-meta:1.0 media-plugins/grilo-plugins:0.3[tracker] x11-misc/xdg-user-dirs
+REQUIRED_USE=^^ ( python_single_target_python3_11 python_single_target_python3_12 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-music/46/gnome-music-46.0.tar.xz
+_eclasses_=flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	gnome.org	e1b4f392dbfedfb8974b71b017937f08	gnome2-utils	a8cf148ec7f5ae0b1f1d33ae5f7f9e88	meson	99466844dd8d4fcfb07578a76f5a9922	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=6169b127da9aa6e46d2c46a867b51cfe
diff --git a/metadata/md5-cache/media-sound/ncmpcpp-0.9.2-r3 b/metadata/md5-cache/media-sound/ncmpcpp-0.9.2-r3
deleted file mode 100644
index 510f7b96cbf3..000000000000
--- a/metadata/md5-cache/media-sound/ncmpcpp-0.9.2-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.17-r1:1.17 >=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 postinst prepare
-DEPEND=>=media-libs/libmpdclient-2.1 dev-libs/boost:=[icu,nls] dev-libs/icu:= net-misc/curl sys-libs/ncurses:=[unicode(+)] sys-libs/readline:= taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0= )
-DESCRIPTION=featureful ncurses based MPD client inspired by ncmpc
-EAPI=7
-HOMEPAGE=https://rybczak.net/ncmpcpp/ https://github.com/ncmpcpp/ncmpcpp/
-INHERIT=autotools
-IUSE=clock outputs taglib visualizer
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libmpdclient-2.1 dev-libs/boost:=[icu,nls] dev-libs/icu:= net-misc/curl sys-libs/ncurses:=[unicode(+)] sys-libs/readline:= taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0= )
-SLOT=0
-SRC_URI=https://rybczak.net/ncmpcpp/stable/ncmpcpp-0.9.2.tar.bz2
-_eclasses_=autotools	d12ccbad07b44642a75ac97a3334d8e0	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=dda54562cc17d14d3e98397b92bf589b
diff --git a/metadata/md5-cache/media-sound/ncmpcpp-0.9.2_p20221231 b/metadata/md5-cache/media-sound/ncmpcpp-0.9.2_p20221231
index 3fe70a5cdd70..af52c4e3baf0 100644
--- a/metadata/md5-cache/media-sound/ncmpcpp-0.9.2_p20221231
+++ b/metadata/md5-cache/media-sound/ncmpcpp-0.9.2_p20221231
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.17-r1:1.17 >=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 postinst prepare
-DEPEND=dev-libs/boost:=[icu,nls] dev-libs/icu:= media-libs/libmpdclient net-misc/curl sys-libs/ncurses:=[unicode(+)] sys-libs/readline:= taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0= )
+DEPEND=>=media-libs/libmpdclient-2.1 dev-libs/boost:=[icu,nls] dev-libs/icu:= net-misc/curl sys-libs/ncurses:=[unicode(+)] sys-libs/readline:= taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0= )
 DESCRIPTION=Featureful ncurses based MPD client inspired by ncmpc
 EAPI=8
-HOMEPAGE=https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp
+HOMEPAGE=https://rybczak.net/ncmpcpp/ https://github.com/ncmpcpp/ncmpcpp/
 INHERIT=autotools
 IUSE=clock outputs taglib visualizer
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/boost:=[icu,nls] dev-libs/icu:= media-libs/libmpdclient net-misc/curl sys-libs/ncurses:=[unicode(+)] sys-libs/readline:= taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0= )
+RDEPEND=>=media-libs/libmpdclient-2.1 dev-libs/boost:=[icu,nls] dev-libs/icu:= net-misc/curl sys-libs/ncurses:=[unicode(+)] sys-libs/readline:= taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0= )
 SLOT=0
 SRC_URI=https://github.com/ncmpcpp/ncmpcpp/archive/9f44edf0b1d74da7cefbd498341d59bc52f6043f.tar.gz -> ncmpcpp-0.9.2_p20221231.gh.tar.gz
 _eclasses_=autotools	d12ccbad07b44642a75ac97a3334d8e0	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=93e543f7238c2ce912866597ab00ce4d
+_md5_=31fb19e6bf55f35bd3bc12ed8ee69b5a
diff --git a/metadata/md5-cache/media-sound/ncmpcpp-9999 b/metadata/md5-cache/media-sound/ncmpcpp-9999
index a2904d816c40..4f8b60b26308 100644
--- a/metadata/md5-cache/media-sound/ncmpcpp-9999
+++ b/metadata/md5-cache/media-sound/ncmpcpp-9999
@@ -1,8 +1,8 @@
-BDEPEND=>=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.17-r1:1.17 >=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 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.17-r1:1.17 >=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 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=>=media-libs/libmpdclient-2.1 dev-libs/boost:=[icu,nls] dev-libs/icu:= net-misc/curl sys-libs/ncurses:=[unicode(+)] sys-libs/readline:= taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0= ) virtual/pkgconfig
-DESCRIPTION=featureful ncurses based MPD client inspired by ncmpc
-EAPI=7
+DEPEND=>=media-libs/libmpdclient-2.1 dev-libs/boost:=[icu,nls] dev-libs/icu:= net-misc/curl sys-libs/ncurses:=[unicode(+)] sys-libs/readline:= taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0= )
+DESCRIPTION=Featureful ncurses based MPD client inspired by ncmpc
+EAPI=8
 HOMEPAGE=https://rybczak.net/ncmpcpp/ https://github.com/ncmpcpp/ncmpcpp/
 INHERIT=autotools git-r3
 IUSE=clock outputs taglib visualizer
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=>=media-libs/libmpdclient-2.1 dev-libs/boost:=[icu,nls] dev-libs/icu:= net-misc/curl sys-libs/ncurses:=[unicode(+)] sys-libs/readline:= taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0= )
 SLOT=0
 _eclasses_=autotools	d12ccbad07b44642a75ac97a3334d8e0	git-r3	875eb471682d3e1f18da124be97dcc81	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=59377631204ed3d5d3b25cc17ad8e122
+_md5_=7eed21cdf0d0b8ecf7eb4dca5a2a36e4
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 2349fe8811ef..fce492690ca3 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/goaccess-1.6.3 b/metadata/md5-cache/net-analyzer/goaccess-1.6.3
deleted file mode 100644
index 0ab2847bc256..000000000000
--- a/metadata/md5-cache/net-analyzer/goaccess-1.6.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.17-r1:1.17 >=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 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/goaccess acct-user/goaccess sys-libs/ncurses:=[unicode(+)?] geoip? ( !geoipv2? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb:0= ) ) ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=A real-time web log analyzer and interactive viewer in a terminal
-EAPI=8
-HOMEPAGE=https://goaccess.io
-INHERIT=autotools optfeature systemd tmpfiles
-IUSE=debug geoip geoipv2 getline ssl unicode
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=acct-group/goaccess acct-user/goaccess sys-libs/ncurses:=[unicode(+)?] geoip? ( !geoipv2? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb:0= ) ) ssl? ( dev-libs/openssl:0= ) virtual/tmpfiles
-REQUIRED_USE=geoipv2? ( geoip )
-SLOT=0
-SRC_URI=https://tar.goaccess.io/goaccess-1.6.3.tar.gz
-_eclasses_=autotools	d12ccbad07b44642a75ac97a3334d8e0	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=176013903238da990436674e2ccc03d4
diff --git a/metadata/md5-cache/net-analyzer/goaccess-1.7.2 b/metadata/md5-cache/net-analyzer/goaccess-1.7.2
deleted file mode 100644
index ac61a833a7bc..000000000000
--- a/metadata/md5-cache/net-analyzer/goaccess-1.7.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.17-r1:1.17 >=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 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/goaccess acct-user/goaccess sys-libs/ncurses:=[unicode(+)?] geoip? ( !geoipv2? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb:0= ) ) ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=A real-time web log analyzer and interactive viewer in a terminal
-EAPI=8
-HOMEPAGE=https://goaccess.io
-INHERIT=autotools optfeature systemd tmpfiles
-IUSE=debug geoip geoipv2 getline ssl unicode
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=acct-group/goaccess acct-user/goaccess sys-libs/ncurses:=[unicode(+)?] geoip? ( !geoipv2? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb:0= ) ) ssl? ( dev-libs/openssl:0= ) virtual/tmpfiles
-REQUIRED_USE=geoipv2? ( geoip )
-SLOT=0
-SRC_URI=https://tar.goaccess.io/goaccess-1.7.2.tar.gz
-_eclasses_=autotools	d12ccbad07b44642a75ac97a3334d8e0	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=956d11c456f5a1a75fb65797d4c65e76
diff --git a/metadata/md5-cache/net-analyzer/goaccess-1.9.3 b/metadata/md5-cache/net-analyzer/goaccess-1.9.3
new file mode 100644
index 000000000000..5d5b2e002403
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/goaccess-1.9.3
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acct-group/goaccess acct-user/goaccess sys-libs/ncurses:=[unicode(+)?] geoip? ( !geoipv2? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb:0= ) ) ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=A real-time web log analyzer and interactive viewer in a terminal
+EAPI=8
+HOMEPAGE=https://goaccess.io
+INHERIT=optfeature systemd tmpfiles
+IUSE=debug geoip geoipv2 getline ssl unicode
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=acct-group/goaccess acct-user/goaccess sys-libs/ncurses:=[unicode(+)?] geoip? ( !geoipv2? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb:0= ) ) ssl? ( dev-libs/openssl:0= ) virtual/tmpfiles
+REQUIRED_USE=geoipv2? ( geoip )
+SLOT=0
+SRC_URI=https://tar.goaccess.io/goaccess-1.9.3.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=69893129d4e98dc7a841b9c713df2a07
diff --git a/metadata/md5-cache/net-analyzer/goaccess-9999 b/metadata/md5-cache/net-analyzer/goaccess-9999
index 67e4ab7fc987..b49eec514e93 100644
--- a/metadata/md5-cache/net-analyzer/goaccess-9999
+++ b/metadata/md5-cache/net-analyzer/goaccess-9999
@@ -12,4 +12,4 @@ RDEPEND=acct-group/goaccess acct-user/goaccess sys-libs/ncurses:=[unicode(+)?] g
 REQUIRED_USE=geoipv2? ( geoip )
 SLOT=0
 _eclasses_=autotools	d12ccbad07b44642a75ac97a3334d8e0	git-r3	875eb471682d3e1f18da124be97dcc81	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=e24c9ecef9fa735f39034fb747c24657
+_md5_=bd67c5d14961da747c701acdfae1f688
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.32 b/metadata/md5-cache/net-analyzer/zabbix-6.0.32
new file mode 100644
index 000000000000..92a2a988dfb5
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.32
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=8
+HOMEPAGE=https://www.zabbix.com/
+INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) selinux? ( sec-policy/selinux-zabbix ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) agent2? ( !gnutls ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+RESTRICT=test strip
+SLOT=0/6.0
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.32.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.32-go-deps.tar.xz )
+_eclasses_=flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	go-env	7eb56e61e641d6db098d57fb37477c44	go-module	83fd3ed1657cfc316c93d6a37018290d	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	d2bf348d35fd96d97944269dfbaf0f97	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	de2d3d345b44597c10d7104a7bcdf7b2
+_md5_=f277eb4eefbbe02afd410bc87175a211
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 903bb1afe674..71cf2233950c 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/c-ares-1.32.2 b/metadata/md5-cache/net-dns/c-ares-1.32.2
index 616fb12179e0..e080210b0592 100644
--- a/metadata/md5-cache/net-dns/c-ares-1.32.2
+++ b/metadata/md5-cache/net-dns/c-ares-1.32.2
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-cpp/gtest ) verify-sig? ( sec-keys/openpgp-keys-bradhouse ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install test unpack
+DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=C library that resolves names asynchronously
 EAPI=8
 HOMEPAGE=https://c-ares.org/
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/c-ares/c-ares/releases/download/v1.32.2/c-ares-1.32.2.tar.gz verify-sig? ( https://github.com/c-ares/c-ares/releases/download/v1.32.2/c-ares-1.32.2.tar.gz.asc )
 _eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=94dfd06d294dc1e9994ff7489fd72a50
+_md5_=4580585d2a57865d434854a743b8ea7b
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 244b4611a686..a65996da71f2 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/lldpd-1.0.16-r2 b/metadata/md5-cache/net-misc/lldpd-1.0.16-r2
deleted file mode 100644
index 8b52a226a02d..000000000000
--- a/metadata/md5-cache/net-misc/lldpd-1.0.16-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( graph? ( app-text/doxygen[dot,doc] ) !graph? ( app-text/doxygen ) ) virtual/pkgconfig >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.17-r1:1.17 >=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 prepare
-DEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.1.11:= sys-libs/readline:0= seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp:=[extensible(+)] ) xml? ( dev-libs/libxml2:= ) test? ( dev-libs/check ) valgrind? ( dev-debug/valgrind )
-DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
-EAPI=8
-HOMEPAGE=https://lldpd.github.io/
-INHERIT=systemd bash-completion-r1 autotools tmpfiles
-IUSE=cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs test readline valgrind xml
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC
-RDEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.1.11:= sys-libs/readline:0= seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp:=[extensible(+)] ) xml? ( dev-libs/libxml2:= ) virtual/tmpfiles
-REQUIRED_USE=graph? ( doc ) test? ( snmp sanitizers )
-RESTRICT=!test? ( test ) test
-SLOT=0/4.9.1
-SRC_URI=https://github.com/lldpd/lldpd/releases/download/1.0.16/lldpd-1.0.16.tar.gz
-_eclasses_=autotools	d12ccbad07b44642a75ac97a3334d8e0	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=5e30b1a7007ec88ae58f22ce9fb237d7
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.17 b/metadata/md5-cache/net-misc/lldpd-1.0.17
deleted file mode 100644
index b999c3a36985..000000000000
--- a/metadata/md5-cache/net-misc/lldpd-1.0.17
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( graph? ( app-text/doxygen[dot,doc] ) !graph? ( app-text/doxygen ) ) virtual/pkgconfig >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.17-r1:1.17 >=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 prepare
-DEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.1.11:= sys-libs/readline:0= seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp:=[extensible(+)] ) xml? ( dev-libs/libxml2:= ) test? ( dev-libs/check ) valgrind? ( dev-debug/valgrind )
-DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
-EAPI=8
-HOMEPAGE=https://lldpd.github.io/
-INHERIT=systemd bash-completion-r1 autotools tmpfiles
-IUSE=cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs test readline valgrind xml
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC
-RDEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.1.11:= sys-libs/readline:0= seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp:=[extensible(+)] ) xml? ( dev-libs/libxml2:= ) virtual/tmpfiles
-REQUIRED_USE=graph? ( doc ) test? ( snmp sanitizers )
-RESTRICT=!test? ( test ) test
-SLOT=0/4.9.1
-SRC_URI=https://github.com/lldpd/lldpd/releases/download/1.0.17/lldpd-1.0.17.tar.gz
-_eclasses_=autotools	d12ccbad07b44642a75ac97a3334d8e0	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=46a850dd474466d817e7fde2c060d0f0
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.48.4 b/metadata/md5-cache/net-misc/networkmanager-1.48.4
new file mode 100644
index 000000000000..3766b65b34e7
--- /dev/null
+++ b/metadata/md5-cache/net-misc/networkmanager-1.48.4
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.12 dev-python/pygobject:3[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pygobject:3[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.56 ) ) test? ( >=dev-libs/jansson-2.7 || ( ( dev-lang/python:3.12 dev-python/dbus-python[python_targets_python3_12(-)] dev-python/pygobject:3[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ) ) app-arch/xz-utils >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array virtual/pkgconfig virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.42:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( dev-libs/nspr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nss-3.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(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6(+)] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5:= ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) >=sys-kernel/linux-headers-3.18 net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
+DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+INHERIT=gnome.org linux-info meson-multilib flag-o-matic python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
+IUSE=audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.42:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( dev-libs/nspr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nss-3.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(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6(+)] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5:= ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
+REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nftables ) ) gtk-doc? ( introspection ) iwd? ( wifi ) test? ( tools ) vala? ( introspection ) wext? ( wifi ) ^^ ( gnutls nss ) ?? ( elogind systemd ) ?? ( dhclient dhcpcd ) ?? ( syslog systemd )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager/1.48/NetworkManager-1.48.4.tar.xz
+_eclasses_=flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	gnome.org	e1b4f392dbfedfb8974b71b017937f08	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	meson	99466844dd8d4fcfb07578a76f5a9922	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	vala	e477903dbe0105930c51f170a592dc16	virtualx	817571665ee28575da44ee08135089e5
+_md5_=71ca2d99d037ddd2529ee89bd9a594f4
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 3f686051c3c4..816d95b393ba 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/unifi-8.3.32 b/metadata/md5-cache/net-wireless/unifi-8.3.32
new file mode 100644
index 000000000000..6b861be3bab4
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-8.3.32
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst preinst prepare setup
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=8
+HOMEPAGE=https://www.ubnt.com
+INHERIT=java-pkg-2 readme.gentoo-r1 systemd
+IUSE=systemd system-mongodb
+KEYWORDS=-* ~amd64 ~arm64
+LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
+RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:17 >=dev-java/java-config-2.2.0-r3
+RESTRICT=bindist mirror
+SLOT=0/8.3
+SRC_URI=https://dl.ui.com/unifi/8.3.32/UniFi.unix.zip -> unifi-8.3.32.zip
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	d2bf348d35fd96d97944269dfbaf0f97	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=1c21bc23d733ddcdda104b7061ececb2
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 67101a40d783..f928c9834046 100644
--- a/metadata/md5-cache/sci-electronics/Manifest.gz
+++ b/metadata/md5-cache/sci-electronics/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/qelectrotech-0.80 b/metadata/md5-cache/sci-electronics/qelectrotech-0.80
index 83510de1bad4..59d657fb205e 100644
--- a/metadata/md5-cache/sci-electronics/qelectrotech-0.80
+++ b/metadata/md5-cache/sci-electronics/qelectrotech-0.80
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://qelectrotech.org/
 INHERIT=qmake-utils xdg
 IUSE=doc
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=CC-BY-3.0 GPL-2+
 RDEPEND=dev-db/sqlite:3 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kwidgetsaddons:5
 SLOT=0
 SRC_URI=https://git.tuxfamily.org/qet/qet.git/snapshot/qet-0.8.0.tar.gz -> qelectrotech-0.80.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b08730f8c0de860c6347b5a9dc0697b1
+_md5_=c70cee0c274d90c0bc7eb3eb5c47d1c5
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 48992ae93e93..9bdace91dcb8 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/gnome-maps-46.11 b/metadata/md5-cache/sci-geosciences/gnome-maps-46.11
new file mode 100644
index 000000000000..f660568e51ee
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/gnome-maps-46.11
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=>=dev-libs/glib-2.66.0:2 >=dev-libs/gjs-1.69.2 >=dev-libs/gobject-introspection-0.10.1:= gui-libs/gtk:4[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=gui-libs/libadwaita-1.4_alpha:1[introspection] >=dev-libs/libgweather-4.2.0:4=[introspection] >=sci-geosciences/geocode-glib-3.15.2:2[introspection] dev-libs/libportal:=[introspection] >=media-libs/libshumate-1.2_alpha:1.0=[introspection] dev-libs/libxml2:2 >=net-libs/rest-0.9.1:1.0[introspection] >=gnome-base/librsvg-2.0 >=dev-libs/json-glib-1.0 app-crypt/libsecret[introspection] media-libs/graphene[introspection] net-libs/libsoup:3.0[introspection] x11-libs/pango[introspection]
+DESCRIPTION=A map application for GNOME
+EAPI=8
+HOMEPAGE=https://apps.gnome.org/Maps/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson xdg
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=CC0-1.0 GPL-2+
+RDEPEND=>=dev-libs/glib-2.66.0:2 >=dev-libs/gjs-1.69.2 >=dev-libs/gobject-introspection-0.10.1:= gui-libs/gtk:4[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=gui-libs/libadwaita-1.4_alpha:1[introspection] >=dev-libs/libgweather-4.2.0:4=[introspection] >=sci-geosciences/geocode-glib-3.15.2:2[introspection] dev-libs/libportal:=[introspection] >=media-libs/libshumate-1.2_alpha:1.0=[introspection] dev-libs/libxml2:2 >=net-libs/rest-0.9.1:1.0[introspection] >=gnome-base/librsvg-2.0 >=dev-libs/json-glib-1.0 app-crypt/libsecret[introspection] media-libs/graphene[introspection] net-libs/libsoup:3.0[introspection] x11-libs/pango[introspection]
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-maps/46/gnome-maps-46.11.tar.xz
+_eclasses_=flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	gnome.org	e1b4f392dbfedfb8974b71b017937f08	gnome2-utils	a8cf148ec7f5ae0b1f1d33ae5f7f9e88	meson	99466844dd8d4fcfb07578a76f5a9922	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=f83bacf85f3a740b02c7700dede735ab
diff --git a/metadata/md5-cache/sci-geosciences/grass-8.3.2-r1 b/metadata/md5-cache/sci-geosciences/grass-8.3.2-r1
new file mode 100644
index 000000000000..56a08fec5cf8
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/grass-8.3.2-r1
@@ -0,0 +1,17 @@
+BDEPEND=app-alternatives/yacc app-alternatives/lex sys-devel/gettext virtual/pkgconfig X? ( dev-lang/swig )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=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_12? ( dev-lang/python:3.12[sqlite] ) >=app-admin/eselect-1.2 python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/ply[python_targets_python3_10(-)] dev-python/python-dateutil[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/ply[python_targets_python3_11(-)] dev-python/python-dateutil[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/numpy[python_targets_python3_12(-)] dev-python/ply[python_targets_python3_12(-)] dev-python/python-dateutil[python_targets_python3_12(-)] dev-python/six[python_targets_python3_12(-)] ) sci-libs/gdal:= sys-libs/gdbm:= sys-libs/ncurses:= sci-libs/proj:= sys-libs/zlib media-libs/libglvnd media-libs/glu blas? ( virtual/cblas[eselect-ldso(+)] virtual/blas[eselect-ldso(+)] ) bzip2? ( app-arch/bzip2:= ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos:= ) lapack? ( virtual/lapack[eselect-ldso(+)] ) las? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) pdal? ( >=sci-libs/pdal-2.0.0:= ) png? ( media-libs/libpng:= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype:2 ) X? ( python_single_target_python3_10? ( >=dev-python/matplotlib-1.2[wxwidgets,python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] >=dev-python/wxpython-4.1:4.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/matplotlib-1.2[wxwidgets,python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] >=dev-python/wxpython-4.1:4.0[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/matplotlib-1.2[wxwidgets,python_targets_python3_12(-)] dev-python/pillow[python_targets_python3_12(-)] >=dev-python/wxpython-4.1:4.0[python_targets_python3_12(-)] ) x11-libs/cairo[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt ) zstd? ( app-arch/zstd:= ) X? ( x11-base/xorg-proto )
+DESCRIPTION=A free GIS with raster and vector functionality, as well as 3D vizualization
+EAPI=8
+HOMEPAGE=https://grass.osgeo.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop flag-o-matic python-single-r1 toolchain-funcs xdg
+IUSE=blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+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_12? ( dev-lang/python:3.12[sqlite] ) >=app-admin/eselect-1.2 python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/ply[python_targets_python3_10(-)] dev-python/python-dateutil[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/ply[python_targets_python3_11(-)] dev-python/python-dateutil[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/numpy[python_targets_python3_12(-)] dev-python/ply[python_targets_python3_12(-)] dev-python/python-dateutil[python_targets_python3_12(-)] dev-python/six[python_targets_python3_12(-)] ) sci-libs/gdal:= sys-libs/gdbm:= sys-libs/ncurses:= sci-libs/proj:= sys-libs/zlib media-libs/libglvnd media-libs/glu blas? ( virtual/cblas[eselect-ldso(+)] virtual/blas[eselect-ldso(+)] ) bzip2? ( app-arch/bzip2:= ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos:= ) lapack? ( virtual/lapack[eselect-ldso(+)] ) las? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) pdal? ( >=sci-libs/pdal-2.0.0:= ) png? ( media-libs/libpng:= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype:2 ) X? ( python_single_target_python3_10? ( >=dev-python/matplotlib-1.2[wxwidgets,python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] >=dev-python/wxpython-4.1:4.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/matplotlib-1.2[wxwidgets,python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] >=dev-python/wxpython-4.1:4.0[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/matplotlib-1.2[wxwidgets,python_targets_python3_12(-)] dev-python/pillow[python_targets_python3_12(-)] >=dev-python/wxpython-4.1:4.0[python_targets_python3_12(-)] ) x11-libs/cairo[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt ) zstd? ( app-arch/zstd:= )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) opengl? ( X )
+SLOT=0/8.3
+SRC_URI=https://grass.osgeo.org/grass83/source/grass-8.3.2.tar.gz
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=a56ad53483374e21d8f1746be4ba692c
diff --git a/metadata/md5-cache/sci-geosciences/grass-8.4.0_rc1 b/metadata/md5-cache/sci-geosciences/grass-8.4.0_rc1
new file mode 100644
index 000000000000..71349328ae93
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/grass-8.4.0_rc1
@@ -0,0 +1,16 @@
+BDEPEND=app-alternatives/yacc app-alternatives/lex sys-devel/gettext virtual/pkgconfig X? ( dev-lang/swig )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=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_12? ( dev-lang/python:3.12[sqlite] ) >=app-admin/eselect-1.2 python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/ply[python_targets_python3_10(-)] dev-python/python-dateutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/ply[python_targets_python3_11(-)] dev-python/python-dateutil[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/numpy[python_targets_python3_12(-)] dev-python/ply[python_targets_python3_12(-)] dev-python/python-dateutil[python_targets_python3_12(-)] ) sci-libs/gdal:= sys-libs/gdbm:= sys-libs/ncurses:= sci-libs/proj:= sys-libs/zlib media-libs/libglvnd media-libs/glu blas? ( virtual/cblas[eselect-ldso(+)] virtual/blas[eselect-ldso(+)] ) bzip2? ( app-arch/bzip2:= ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos:= ) lapack? ( virtual/lapack[eselect-ldso(+)] ) las? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) pdal? ( >=sci-libs/pdal-2.0.0:= ) png? ( media-libs/libpng:= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:= ) sqlite? ( dev-db/sqlite:3 ) svm? ( sci-libs/libsvm:= ) tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype:2 ) X? ( python_single_target_python3_10? ( >=dev-python/matplotlib-1.2[wxwidgets,python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] >=dev-python/wxpython-4.1:4.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/matplotlib-1.2[wxwidgets,python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] >=dev-python/wxpython-4.1:4.0[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/matplotlib-1.2[wxwidgets,python_targets_python3_12(-)] dev-python/pillow[python_targets_python3_12(-)] >=dev-python/wxpython-4.1:4.0[python_targets_python3_12(-)] ) x11-libs/cairo[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt ) zstd? ( app-arch/zstd:= ) X? ( x11-base/xorg-proto )
+DESCRIPTION=A free GIS with raster and vector functionality, as well as 3D vizualization
+EAPI=8
+HOMEPAGE=https://grass.osgeo.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop flag-o-matic python-single-r1 toolchain-funcs xdg
+IUSE=blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite svm threads tiff truetype X zstd python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+LICENSE=GPL-2
+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_12? ( dev-lang/python:3.12[sqlite] ) >=app-admin/eselect-1.2 python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/ply[python_targets_python3_10(-)] dev-python/python-dateutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/ply[python_targets_python3_11(-)] dev-python/python-dateutil[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/numpy[python_targets_python3_12(-)] dev-python/ply[python_targets_python3_12(-)] dev-python/python-dateutil[python_targets_python3_12(-)] ) sci-libs/gdal:= sys-libs/gdbm:= sys-libs/ncurses:= sci-libs/proj:= sys-libs/zlib media-libs/libglvnd media-libs/glu blas? ( virtual/cblas[eselect-ldso(+)] virtual/blas[eselect-ldso(+)] ) bzip2? ( app-arch/bzip2:= ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos:= ) lapack? ( virtual/lapack[eselect-ldso(+)] ) las? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) pdal? ( >=sci-libs/pdal-2.0.0:= ) png? ( media-libs/libpng:= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:= ) sqlite? ( dev-db/sqlite:3 ) svm? ( sci-libs/libsvm:= ) tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype:2 ) X? ( python_single_target_python3_10? ( >=dev-python/matplotlib-1.2[wxwidgets,python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] >=dev-python/wxpython-4.1:4.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/matplotlib-1.2[wxwidgets,python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] >=dev-python/wxpython-4.1:4.0[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/matplotlib-1.2[wxwidgets,python_targets_python3_12(-)] dev-python/pillow[python_targets_python3_12(-)] >=dev-python/wxpython-4.1:4.0[python_targets_python3_12(-)] ) x11-libs/cairo[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt ) zstd? ( app-arch/zstd:= )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) opengl? ( X )
+SLOT=0/8.4
+SRC_URI=https://grass.osgeo.org/grass84/source/grass-8.4.0RC1.tar.gz
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=533702205538559995ba194c4dff4eda
diff --git a/metadata/md5-cache/sci-geosciences/grass-9999 b/metadata/md5-cache/sci-geosciences/grass-9999
index 8121ba9fffad..0d5fd5cfcb30 100644
--- a/metadata/md5-cache/sci-geosciences/grass-9999
+++ b/metadata/md5-cache/sci-geosciences/grass-9999
@@ -1,16 +1,16 @@
 BDEPEND=app-alternatives/yacc app-alternatives/lex sys-devel/gettext virtual/pkgconfig X? ( dev-lang/swig ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite] ) >=app-admin/eselect-1.2 python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/ply[python_targets_python3_10(-)] dev-python/python-dateutil[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/ply[python_targets_python3_11(-)] dev-python/python-dateutil[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] ) sci-libs/gdal:= sys-libs/gdbm:= sys-libs/ncurses:= sci-libs/proj:= sys-libs/zlib media-libs/libglvnd media-libs/glu blas? ( virtual/cblas[eselect-ldso(+)] virtual/blas[eselect-ldso(+)] ) bzip2? ( app-arch/bzip2:= ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos:= ) lapack? ( virtual/lapack[eselect-ldso(+)] ) las? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) pdal? ( >=sci-libs/pdal-2.0.0:= ) png? ( media-libs/libpng:= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype:2 ) X? ( python_single_target_python3_10? ( >=dev-python/matplotlib-1.2[wxwidgets,python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] >=dev-python/wxpython-4.1:4.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/matplotlib-1.2[wxwidgets,python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] >=dev-python/wxpython-4.1:4.0[python_targets_python3_11(-)] ) x11-libs/cairo[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt ) zstd? ( app-arch/zstd:= ) X? ( x11-base/xorg-proto )
+DEPEND=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_12? ( dev-lang/python:3.12[sqlite] ) >=app-admin/eselect-1.2 python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/ply[python_targets_python3_10(-)] dev-python/python-dateutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/ply[python_targets_python3_11(-)] dev-python/python-dateutil[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/numpy[python_targets_python3_12(-)] dev-python/ply[python_targets_python3_12(-)] dev-python/python-dateutil[python_targets_python3_12(-)] ) sci-libs/gdal:= sys-libs/gdbm:= sys-libs/ncurses:= sci-libs/proj:= sys-libs/zlib media-libs/libglvnd media-libs/glu blas? ( virtual/cblas[eselect-ldso(+)] virtual/blas[eselect-ldso(+)] ) bzip2? ( app-arch/bzip2:= ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos:= ) lapack? ( virtual/lapack[eselect-ldso(+)] ) las? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) pdal? ( >=sci-libs/pdal-2.0.0:= ) png? ( media-libs/libpng:= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:= ) sqlite? ( dev-db/sqlite:3 ) svm? ( sci-libs/libsvm:= ) tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype:2 ) X? ( python_single_target_python3_10? ( >=dev-python/matplotlib-1.2[wxwidgets,python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] >=dev-python/wxpython-4.1:4.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/matplotlib-1.2[wxwidgets,python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] >=dev-python/wxpython-4.1:4.0[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/matplotlib-1.2[wxwidgets,python_targets_python3_12(-)] dev-python/pillow[python_targets_python3_12(-)] >=dev-python/wxpython-4.1:4.0[python_targets_python3_12(-)] ) x11-libs/cairo[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt ) zstd? ( app-arch/zstd:= ) X? ( x11-base/xorg-proto )
 DESCRIPTION=A free GIS with raster and vector functionality, as well as 3D vizualization
 EAPI=8
 HOMEPAGE=https://grass.osgeo.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=desktop flag-o-matic python-single-r1 toolchain-funcs xdg git-r3
-IUSE=blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd python_single_target_python3_10 python_single_target_python3_11
+IUSE=blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite svm threads tiff truetype X zstd 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[sqlite] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite] ) >=app-admin/eselect-1.2 python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/ply[python_targets_python3_10(-)] dev-python/python-dateutil[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/ply[python_targets_python3_11(-)] dev-python/python-dateutil[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] ) sci-libs/gdal:= sys-libs/gdbm:= sys-libs/ncurses:= sci-libs/proj:= sys-libs/zlib media-libs/libglvnd media-libs/glu blas? ( virtual/cblas[eselect-ldso(+)] virtual/blas[eselect-ldso(+)] ) bzip2? ( app-arch/bzip2:= ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos:= ) lapack? ( virtual/lapack[eselect-ldso(+)] ) las? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) pdal? ( >=sci-libs/pdal-2.0.0:= ) png? ( media-libs/libpng:= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype:2 ) X? ( python_single_target_python3_10? ( >=dev-python/matplotlib-1.2[wxwidgets,python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] >=dev-python/wxpython-4.1:4.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/matplotlib-1.2[wxwidgets,python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] >=dev-python/wxpython-4.1:4.0[python_targets_python3_11(-)] ) x11-libs/cairo[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt ) zstd? ( app-arch/zstd:= )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) opengl? ( X )
+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_12? ( dev-lang/python:3.12[sqlite] ) >=app-admin/eselect-1.2 python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/ply[python_targets_python3_10(-)] dev-python/python-dateutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/ply[python_targets_python3_11(-)] dev-python/python-dateutil[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/numpy[python_targets_python3_12(-)] dev-python/ply[python_targets_python3_12(-)] dev-python/python-dateutil[python_targets_python3_12(-)] ) sci-libs/gdal:= sys-libs/gdbm:= sys-libs/ncurses:= sci-libs/proj:= sys-libs/zlib media-libs/libglvnd media-libs/glu blas? ( virtual/cblas[eselect-ldso(+)] virtual/blas[eselect-ldso(+)] ) bzip2? ( app-arch/bzip2:= ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos:= ) lapack? ( virtual/lapack[eselect-ldso(+)] ) las? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) pdal? ( >=sci-libs/pdal-2.0.0:= ) png? ( media-libs/libpng:= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:= ) sqlite? ( dev-db/sqlite:3 ) svm? ( sci-libs/libsvm:= ) tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype:2 ) X? ( python_single_target_python3_10? ( >=dev-python/matplotlib-1.2[wxwidgets,python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] >=dev-python/wxpython-4.1:4.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/matplotlib-1.2[wxwidgets,python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] >=dev-python/wxpython-4.1:4.0[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/matplotlib-1.2[wxwidgets,python_targets_python3_12(-)] dev-python/pillow[python_targets_python3_12(-)] >=dev-python/wxpython-4.1:4.0[python_targets_python3_12(-)] ) x11-libs/cairo[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt ) zstd? ( app-arch/zstd:= )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) opengl? ( X )
 SLOT=0/8.4
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	git-r3	875eb471682d3e1f18da124be97dcc81	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8b82503188691e9795e07e5f0008a6cb
+_md5_=d8e50a1c521488339cb838bdd703a8f0
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 7e20612294dc..5d9db4e62067 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/alt-ergo-2.4.3-r1 b/metadata/md5-cache/sci-mathematics/alt-ergo-2.4.3-r2
index a7e066b40cda..ff2c1466131c 100644
--- a/metadata/md5-cache/sci-mathematics/alt-ergo-2.4.3-r1
+++ b/metadata/md5-cache/sci-mathematics/alt-ergo-2.4.3-r2
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune-build-info dev-ml/dune-configurator dev-lang/ocaml dev-ml/dune
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt=] >=sci-mathematics/psmt2-frontend-0.4.0:= <dev-ml/zarith-1.14:= >=dev-ml/cmdliner-1.1.0:= >=dev-ml/menhir-20181006:= >=dev-ml/ocplib-simplex-0.4:= dev-ml/camlzip:= dev-ml/num:= dev-ml/stdlib-shims:= gui? ( dev-ml/lablgtk:3 dev-ml/lablgtk-sourceview:3 ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt=] >=sci-mathematics/psmt2-frontend-0.4.0:= <dev-ml/ocplib-simplex-0.5:= >=dev-ml/cmdliner-1.1.0:= >=dev-ml/menhir-20181006:= dev-ml/camlzip:= dev-ml/num:= dev-ml/stdlib-shims:= dev-ml/zarith:= gui? ( dev-ml/lablgtk:3 dev-ml/lablgtk-sourceview:3 ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Automatic theorem prover
 EAPI=8
 HOMEPAGE=https://alt-ergo.ocamlpro.com https://github.com/OCamlPro/alt-ergo/
@@ -8,9 +8,9 @@ INHERIT=dune
 IUSE=examples gui +ocamlopt
 KEYWORDS=amd64
 LICENSE=CeCILL-C
-RDEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt=] >=sci-mathematics/psmt2-frontend-0.4.0:= <dev-ml/zarith-1.14:= >=dev-ml/cmdliner-1.1.0:= >=dev-ml/menhir-20181006:= >=dev-ml/ocplib-simplex-0.4:= dev-ml/camlzip:= dev-ml/num:= dev-ml/stdlib-shims:= gui? ( dev-ml/lablgtk:3 dev-ml/lablgtk-sourceview:3 ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt=] >=sci-mathematics/psmt2-frontend-0.4.0:= <dev-ml/ocplib-simplex-0.5:= >=dev-ml/cmdliner-1.1.0:= >=dev-ml/menhir-20181006:= dev-ml/camlzip:= dev-ml/num:= dev-ml/stdlib-shims:= dev-ml/zarith:= gui? ( dev-ml/lablgtk:3 dev-ml/lablgtk-sourceview:3 ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 REQUIRED_USE=ocamlopt
 SLOT=0/2.4.3
 SRC_URI=https://github.com/OCamlPro/alt-ergo/archive/2.4.3.tar.gz -> alt-ergo-2.4.3.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=933c3cdcb10469bc54c5d1b4b5a3e81d
+_md5_=0bec659dffaac37da6b2217e99d18100
diff --git a/metadata/md5-cache/sci-mathematics/alt-ergo-9999 b/metadata/md5-cache/sci-mathematics/alt-ergo-9999
deleted file mode 100644
index 95cc5dae2136..000000000000
--- a/metadata/md5-cache/sci-mathematics/alt-ergo-9999
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-ml/dune-build-info dev-ml/dune-configurator dev-lang/ocaml dev-ml/dune >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt=] >=sci-mathematics/psmt2-frontend-0.4.0:= >=dev-ml/cmdliner-1.1.0:= >=dev-ml/menhir-20181006:= >=dev-ml/ocplib-simplex-0.4:= dev-ml/camlzip:= dev-ml/num:= dev-ml/stdlib-shims:= dev-ml/zarith:= gui? ( dev-ml/lablgtk:3 dev-ml/lablgtk-sourceview:3 ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Automatic theorem prover
-EAPI=8
-HOMEPAGE=https://alt-ergo.ocamlpro.com https://github.com/OCamlPro/alt-ergo/
-INHERIT=dune git-r3
-IUSE=examples gui +ocamlopt
-LICENSE=CeCILL-C
-PROPERTIES=live
-RDEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt=] >=sci-mathematics/psmt2-frontend-0.4.0:= >=dev-ml/cmdliner-1.1.0:= >=dev-ml/menhir-20181006:= >=dev-ml/ocplib-simplex-0.4:= dev-ml/camlzip:= dev-ml/num:= dev-ml/stdlib-shims:= dev-ml/zarith:= gui? ( dev-ml/lablgtk:3 dev-ml/lablgtk-sourceview:3 ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-REQUIRED_USE=ocamlopt
-SLOT=0/9999
-_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	git-r3	875eb471682d3e1f18da124be97dcc81	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=a7e1bf50b794c6321a719b02c83bb6b6
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index ea1f2e16dff0..3b7122391a79 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/pmix-5.0.2 b/metadata/md5-cache/sys-cluster/pmix-5.0.3
index 845144e9c4d8..e83f0552f6f9 100644
--- a/metadata/md5-cache/sys-cluster/pmix-5.0.2
+++ b/metadata/md5-cache/sys-cluster/pmix-5.0.3
@@ -10,6 +10,6 @@ KEYWORDS=~amd64 -x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=dev-libs/libevent:= sys-apps/hwloc:= sys-cluster/ucx sys-libs/zlib:= munge? ( sys-auth/munge ) pmi? ( !sys-cluster/slurm )
 SLOT=0
-SRC_URI=https://github.com/openpmix/openpmix/releases/download/v5.0.2/pmix-5.0.2.tar.bz2
+SRC_URI=https://github.com/openpmix/openpmix/releases/download/v5.0.3/pmix-5.0.3.tar.bz2
 _eclasses_=flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=212030244ac4a469eef37f1f0e4ac3b5
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 832567af66c9..de85d39b078a 100644
--- a/metadata/md5-cache/sys-firmware/Manifest.gz
+++ b/metadata/md5-cache/sys-firmware/Manifest.gz
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20240531_p20240526-r1 b/metadata/md5-cache/sys-firmware/intel-microcode-20240531_p20240526-r2
index a2db158acfe0..f4a70c7cbce5 100644
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20240531_p20240526-r1
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20240531_p20240526-r2
@@ -3,15 +3,15 @@ DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
 DESCRIPTION=Intel IA32/IA64 microcode update data
 EAPI=8
 HOMEPAGE=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files https://github.com/platomav/CPUMicrocodes http://inertiawar.com/microcode/
-IDEPEND=dist-kernel? ( initramfs? ( sys-kernel/installkernel ) )
+IDEPEND=hostonly? ( sys-apps/iucode_tool ) dist-kernel? ( initramfs? ( sys-kernel/installkernel ) )
 INHERIT=dist-kernel-utils linux-info mount-boot
 IUSE=dist-kernel hostonly +initramfs +split-ucode vanilla
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=intel-ucode
-RDEPEND=dist-kernel? ( virtual/dist-kernel ) hostonly? ( sys-apps/iucode_tool )
-REQUIRED_USE=!dist-kernel? ( || ( initramfs split-ucode ) )
+RDEPEND=dist-kernel? ( virtual/dist-kernel initramfs? ( sys-apps/iucode_tool ) )
+REQUIRED_USE=|| ( initramfs split-ucode ) dist-kernel? ( split-ucode )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20240531.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~mpagano/dist/intel-microcode/intel-microcode-collection-20240526.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-firmware/intel-microcode/intel-microcode-collection-20240526.tar.xz
 _eclasses_=dist-kernel-utils	c5204a4147b612736aef239e7cc69885	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	mount-boot	03b0280b48caf6e18472fa7272cfcda8	mount-boot-utils	69218c024651aa10db01df7e8a5b63e0	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f7789b75b9640494d80086aec49711e2
+_md5_=2c5f21e4aad881d486c3c08f6bdc0866
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 7a4befece585..f5bf3e13407b 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/bcachefs-tools-1.9.4 b/metadata/md5-cache/sys-fs/bcachefs-tools-1.9.4
new file mode 100644
index 000000000000..fa380d9bd946
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/bcachefs-tools-1.9.4
@@ -0,0 +1,17 @@
+BDEPEND=|| ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.13 dev-python/docutils[python_targets_python3_13(-)] test? ( dev-python/pytest[python_targets_python3_13(-)] dev-python/pytest-xdist[python_targets_python3_13(-)] ) ) ( dev-lang/python:3.12 dev-python/docutils[python_targets_python3_12(-)] test? ( dev-python/pytest[python_targets_python3_12(-)] dev-python/pytest-xdist[python_targets_python3_12(-)] ) ) ( dev-lang/python:3.11 dev-python/docutils[python_targets_python3_11(-)] test? ( dev-python/pytest[python_targets_python3_11(-)] dev-python/pytest-xdist[python_targets_python3_11(-)] ) ) ( dev-lang/python:3.10 dev-python/docutils[python_targets_python3_10(-)] test? ( dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ) ) llvm_slot_16? ( sys-devel/clang:16 ) llvm_slot_17? ( sys-devel/clang:17 ) llvm_slot_18? ( sys-devel/clang:18 ) virtual/pkgconfig virtual/rust >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/libaio dev-libs/libsodium:= dev-libs/userspace-rcu:= sys-apps/keyutils:= sys-apps/util-linux sys-libs/zlib virtual/udev fuse? ( >=sys-fs/fuse-3.7.0 )
+DESCRIPTION=Tools for bcachefs
+EAPI=8
+HOMEPAGE=https://bcachefs.org/
+INHERIT=cargo flag-o-matic llvm-r1 multiprocessing python-any-r1 shell-completion toolchain-funcs unpacker
+IUSE=fuse test debug +llvm_slot_17 llvm_slot_16 llvm_slot_18
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0 BSD GPL-2 MIT
+RDEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/libaio dev-libs/libsodium:= dev-libs/userspace-rcu:= sys-apps/keyutils:= sys-apps/util-linux sys-libs/zlib virtual/udev fuse? ( >=sys-fs/fuse-3.7.0 )
+REQUIRED_USE=^^ ( llvm_slot_16 llvm_slot_17 llvm_slot_18 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/koverstreet/bcachefs-tools/archive/refs/tags/v1.9.4.tar.gz -> bcachefs-tools-1.9.4.tar.gz https://crates.io/api/v1/crates/aho-corasick/1.1.2/download -> aho-corasick-1.1.2.crate https://crates.io/api/v1/crates/anstream/0.6.11/download -> anstream-0.6.11.crate https://crates.io/api/v1/crates/anstyle-parse/0.2.3/download -> anstyle-parse-0.2.3.crate https://crates.io/api/v1/crates/anstyle-query/1.0.2/download -> anstyle-query-1.0.2.crate https://crates.io/api/v1/crates/anstyle-wincon/3.0.2/download -> anstyle-wincon-3.0.2.crate https://crates.io/api/v1/crates/anstyle/1.0.6/download -> anstyle-1.0.6.crate https://crates.io/api/v1/crates/anyhow/1.0.79/download -> anyhow-1.0.79.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bindgen/0.69.4/download -> bindgen-0.69.4.crate https://crates.io/api/v1/crates/bitfield/0.14.0/download -> bitfield-0.14.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bitflags/2.4.2/download -> bitflags-2.4.2.crate https://crates.io/api/v1/crates/byteorder/1.5.0/download -> byteorder-1.5.0.crate https://crates.io/api/v1/crates/cc/1.0.83/download -> cc-1.0.83.crate https://crates.io/api/v1/crates/cexpr/0.6.0/download -> cexpr-0.6.0.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clang-sys/1.7.0/download -> clang-sys-1.7.0.crate https://crates.io/api/v1/crates/clap/4.4.18/download -> clap-4.4.18.crate https://crates.io/api/v1/crates/clap_builder/4.4.18/download -> clap_builder-4.4.18.crate https://crates.io/api/v1/crates/clap_complete/4.4.10/download -> clap_complete-4.4.10.crate https://crates.io/api/v1/crates/clap_derive/4.4.7/download -> clap_derive-4.4.7.crate https://crates.io/api/v1/crates/clap_lex/0.6.0/download -> clap_lex-0.6.0.crate https://crates.io/api/v1/crates/colorchoice/1.0.0/download -> colorchoice-1.0.0.crate https://crates.io/api/v1/crates/either/1.9.0/download -> either-1.9.0.crate https://crates.io/api/v1/crates/env_logger/0.10.2/download -> env_logger-0.10.2.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/errno/0.3.8/download -> errno-0.3.8.crate https://crates.io/api/v1/crates/glob/0.3.1/download -> glob-0.3.1.crate https://crates.io/api/v1/crates/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/hermit-abi/0.3.9/download -> hermit-abi-0.3.9.crate https://crates.io/api/v1/crates/home/0.5.9/download -> home-0.5.9.crate https://crates.io/api/v1/crates/is-terminal/0.4.12/download -> is-terminal-0.4.12.crate https://crates.io/api/v1/crates/itertools/0.12.1/download -> itertools-0.12.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.153/download -> libc-0.2.153.crate https://crates.io/api/v1/crates/libloading/0.8.1/download -> libloading-0.8.1.crate https://crates.io/api/v1/crates/libudev-sys/0.1.4/download -> libudev-sys-0.1.4.crate https://crates.io/api/v1/crates/linux-raw-sys/0.4.13/download -> linux-raw-sys-0.4.13.crate https://crates.io/api/v1/crates/log/0.4.22/download -> log-0.4.22.crate https://crates.io/api/v1/crates/memchr/2.7.1/download -> memchr-2.7.1.crate https://crates.io/api/v1/crates/memoffset/0.8.0/download -> memoffset-0.8.0.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/nom/7.1.3/download -> nom-7.1.3.crate https://crates.io/api/v1/crates/once_cell/1.19.0/download -> once_cell-1.19.0.crate https://crates.io/api/v1/crates/paste/1.0.14/download -> paste-1.0.14.crate https://crates.io/api/v1/crates/pkg-config/0.3.29/download -> pkg-config-0.3.29.crate https://crates.io/api/v1/crates/prettyplease/0.2.16/download -> prettyplease-0.2.16.crate https://crates.io/api/v1/crates/proc-macro2/1.0.78/download -> proc-macro2-1.0.78.crate https://crates.io/api/v1/crates/quote/1.0.35/download -> quote-1.0.35.crate https://crates.io/api/v1/crates/regex-automata/0.4.5/download -> regex-automata-0.4.5.crate https://crates.io/api/v1/crates/regex-syntax/0.8.2/download -> regex-syntax-0.8.2.crate https://crates.io/api/v1/crates/regex/1.10.3/download -> regex-1.10.3.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustix/0.38.34/download -> rustix-0.38.34.crate https://crates.io/api/v1/crates/rustversion/1.0.17/download -> rustversion-1.0.17.crate https://crates.io/api/v1/crates/shlex/1.3.0/download -> shlex-1.3.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/strum/0.26.2/download -> strum-0.26.2.crate https://crates.io/api/v1/crates/strum_macros/0.26.2/download -> strum_macros-0.26.2.crate https://crates.io/api/v1/crates/syn/2.0.48/download -> syn-2.0.48.crate https://crates.io/api/v1/crates/termcolor/1.4.1/download -> termcolor-1.4.1.crate https://crates.io/api/v1/crates/terminal_size/0.3.0/download -> terminal_size-0.3.0.crate https://crates.io/api/v1/crates/udev/0.7.0/download -> udev-0.7.0.crate https://crates.io/api/v1/crates/unicode-ident/1.0.12/download -> unicode-ident-1.0.12.crate https://crates.io/api/v1/crates/utf8parse/0.2.1/download -> utf8parse-0.2.1.crate https://crates.io/api/v1/crates/uuid/1.7.0/download -> uuid-1.7.0.crate https://crates.io/api/v1/crates/which/4.4.2/download -> which-4.4.2.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.8/download -> winapi-util-0.1.8.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/windows-sys/0.48.0/download -> windows-sys-0.48.0.crate https://crates.io/api/v1/crates/windows-sys/0.52.0/download -> windows-sys-0.52.0.crate https://crates.io/api/v1/crates/windows-targets/0.48.5/download -> windows-targets-0.48.5.crate https://crates.io/api/v1/crates/windows-targets/0.52.0/download -> windows-targets-0.52.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.5/download -> windows_aarch64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.52.0/download -> windows_aarch64_gnullvm-0.52.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.5/download -> windows_aarch64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.52.0/download -> windows_aarch64_msvc-0.52.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.5/download -> windows_i686_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.52.0/download -> windows_i686_gnu-0.52.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.5/download -> windows_i686_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.52.0/download -> windows_i686_msvc-0.52.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.5/download -> windows_x86_64_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.52.0/download -> windows_x86_64_gnu-0.52.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.5/download -> windows_x86_64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.52.0/download -> windows_x86_64_gnullvm-0.52.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.5/download -> windows_x86_64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.52.0/download -> windows_x86_64_msvc-0.52.0.crate https://crates.io/api/v1/crates/zeroize/1.8.1/download -> zeroize-1.8.1.crate https://crates.io/api/v1/crates/zeroize_derive/1.4.2/download -> zeroize_derive-1.4.2.crate
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	67ea64209e3442a3a0e095f048d43a62	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	rust-toolchain	68a6453cb41148db1da01fa2267527f0	shell-completion	bb7eb6bc232cd6c4bf8af739cdd2ee14	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09
+_md5_=d8f531455b54f599752de808fb8350ac
diff --git a/metadata/md5-cache/sys-fs/bcachefs-tools-9999 b/metadata/md5-cache/sys-fs/bcachefs-tools-9999
index 2e5376c3e55b..ebf0a079cb5e 100644
--- a/metadata/md5-cache/sys-fs/bcachefs-tools-9999
+++ b/metadata/md5-cache/sys-fs/bcachefs-tools-9999
@@ -1,16 +1,16 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.12 dev-python/docutils[python_targets_python3_12(-)] test? ( dev-python/pytest[python_targets_python3_12(-)] dev-python/pytest-xdist[python_targets_python3_12(-)] ) ) ( dev-lang/python:3.11 dev-python/docutils[python_targets_python3_11(-)] test? ( dev-python/pytest[python_targets_python3_11(-)] dev-python/pytest-xdist[python_targets_python3_11(-)] ) ) ( dev-lang/python:3.10 dev-python/docutils[python_targets_python3_10(-)] test? ( dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ) ) llvm_slot_16? ( sys-devel/clang:16 ) llvm_slot_17? ( sys-devel/clang:17 ) virtual/pkgconfig virtual/rust >=virtual/rust-1.53 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.13 dev-python/docutils[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 dev-python/docutils[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ) llvm_slot_16? ( sys-devel/clang:16 ) llvm_slot_17? ( sys-devel/clang:17 ) llvm_slot_18? ( sys-devel/clang:18 ) virtual/pkgconfig virtual/rust >=virtual/rust-1.53 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/libaio dev-libs/libsodium:= dev-libs/userspace-rcu:= sys-apps/keyutils:= sys-apps/util-linux sys-libs/zlib virtual/udev fuse? ( >=sys-fs/fuse-3.7.0 )
 DESCRIPTION=Tools for bcachefs
 EAPI=8
 HOMEPAGE=https://bcachefs.org/
-INHERIT=cargo flag-o-matic llvm-r1 multiprocessing python-any-r1 shell-completion toolchain-funcs unpacker git-r3
-IUSE=fuse test debug +llvm_slot_17 llvm_slot_16
+INHERIT=cargo flag-o-matic llvm-r1 python-any-r1 shell-completion toolchain-funcs unpacker git-r3
+IUSE=fuse debug +llvm_slot_17 llvm_slot_16 llvm_slot_18
 LICENSE=Apache-2.0 BSD GPL-2 MIT
 PROPERTIES=live
 RDEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/libaio dev-libs/libsodium:= dev-libs/userspace-rcu:= sys-apps/keyutils:= sys-apps/util-linux sys-libs/zlib virtual/udev fuse? ( >=sys-fs/fuse-3.7.0 )
-REQUIRED_USE=^^ ( llvm_slot_16 llvm_slot_17 )
-RESTRICT=!test? ( test )
+REQUIRED_USE=^^ ( llvm_slot_16 llvm_slot_17 llvm_slot_18 )
+RESTRICT=test
 SLOT=0
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	67ea64209e3442a3a0e095f048d43a62	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	git-r3	875eb471682d3e1f18da124be97dcc81	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	rust-toolchain	68a6453cb41148db1da01fa2267527f0	shell-completion	bb7eb6bc232cd6c4bf8af739cdd2ee14	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09
-_md5_=f6363ebfd78f10d66502bd6e354ebb78
+_md5_=156b03db14a3e04600760d3d39e30788
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 82bf35221c05..0e1360984f6c 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/asahi-sources-6.9.8_p1 b/metadata/md5-cache/sys-kernel/asahi-sources-6.9.8_p1-r1
index 1adca7cb4ded..7762f80742c8 100644
--- a/metadata/md5-cache/sys-kernel/asahi-sources-6.9.8_p1
+++ b/metadata/md5-cache/sys-kernel/asahi-sources-6.9.8_p1-r1
@@ -9,7 +9,7 @@ KEYWORDS=arm64
 LICENSE=GPL-2
 RDEPEND=!build? ( app-alternatives/cpio dev-lang/perl app-alternatives/bc dev-build/make sys-devel/bison sys-devel/flex >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=6.9.8_p1
+SLOT=6.9.8_p1-r1
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.9-9.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.9-9.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.9-9.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.9-9.extras.tar.xz https://github.com/AsahiLinux/linux/compare/v6.9.8...asahi-6.9.8-1.patch -> linux-asahi-6.9.8-1.patch
 _eclasses_=crossdev	f04338ff78f213a4a55c5c37b3c6563e	estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	0e01377cce73a7a06321d0ef97388d31	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=822502b2ddbb639b9b8bdfd8649f736f
+_md5_=30fb29309969e22e46930d7b935c6b19
diff --git a/metadata/md5-cache/sys-kernel/asahi-sources-6.9.9_p5 b/metadata/md5-cache/sys-kernel/asahi-sources-6.9.9_p5-r1
index a8789785fbcd..8d734f33a245 100644
--- a/metadata/md5-cache/sys-kernel/asahi-sources-6.9.9_p5
+++ b/metadata/md5-cache/sys-kernel/asahi-sources-6.9.9_p5-r1
@@ -9,7 +9,7 @@ KEYWORDS=~arm64
 LICENSE=GPL-2
 RDEPEND=!build? ( app-alternatives/cpio dev-lang/perl app-alternatives/bc dev-build/make sys-devel/bison sys-devel/flex >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=6.9.9_p5
+SLOT=6.9.9_p5-r1
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.9-10.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.9-10.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.9-10.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.9-10.extras.tar.xz https://github.com/AsahiLinux/linux/compare/v6.9.9...asahi-6.9.9-5.patch -> linux-asahi-6.9.9-5.patch
 _eclasses_=crossdev	f04338ff78f213a4a55c5c37b3c6563e	estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	0e01377cce73a7a06321d0ef97388d31	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=8ac98c36439d6f128f3071633169ca8b
+_md5_=9611000a1a3c17b37c617c17f9df7847
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20240709-r1 b/metadata/md5-cache/sys-kernel/linux-firmware-20240709-r1
index 721112e62cd7..2a59749de0d5 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20240709-r1
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20240709-r1
@@ -14,4 +14,4 @@ RESTRICT=binchecks strip test !bindist? ( bindist ) unknown-license? ( bindist )
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-20240709.tar.xz
 _eclasses_=dist-kernel-utils	c5204a4147b612736aef239e7cc69885	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	mount-boot	03b0280b48caf6e18472fa7272cfcda8	mount-boot-utils	69218c024651aa10db01df7e8a5b63e0	multilib	c19072c3cd7ac5cb21de013f7e9832e0	portability	225656ad6c6594fe3b0187bdd50707fb	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=d8d1ff0ff14b3c4ce71285b5bf93b38e
+_md5_=b547fe1475f302f2ab624e15f2ccc08a
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-99999999 b/metadata/md5-cache/sys-kernel/linux-firmware-99999999
index 0b68963b7a79..d8157a5ba709 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-99999999
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-99999999
@@ -13,4 +13,4 @@ REQUIRED_USE=initramfs? ( redistributable ) ?? ( compress-xz compress-zstd ) sav
 RESTRICT=binchecks strip test unknown-license? ( bindist )
 SLOT=0
 _eclasses_=dist-kernel-utils	c5204a4147b612736aef239e7cc69885	git-r3	875eb471682d3e1f18da124be97dcc81	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	mount-boot	03b0280b48caf6e18472fa7272cfcda8	mount-boot-utils	69218c024651aa10db01df7e8a5b63e0	multilib	c19072c3cd7ac5cb21de013f7e9832e0	portability	225656ad6c6594fe3b0187bdd50707fb	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=492c91e5ad6498639e9b3ed3f6df571b
+_md5_=256147732cc217e9da5d6a33a368d895
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 069880a48594..051a0b78ab5f 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/daemontools-0.76-r12 b/metadata/md5-cache/sys-process/daemontools-0.76-r12
new file mode 100644
index 000000000000..85b644528988
--- /dev/null
+++ b/metadata/md5-cache/sys-process/daemontools-0.76-r12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst
+DESCRIPTION=Collection of tools for managing UNIX services
+EAPI=8
+HOMEPAGE=https://cr.yp.to/daemontools.html
+INHERIT=flag-o-matic toolchain-funcs
+IUSE=selinux static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=public-domain GPL-2
+RDEPEND=selinux? ( sec-policy/selinux-daemontools )
+SLOT=0
+SRC_URI=https://cr.yp.to/daemontools/daemontools-0.76.tar.gz https://smarden.org/pape/djb/manpages/daemontools-0.76-man-20020131.tar.gz
+_eclasses_=flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=946fcff2865d3ee1419d799e0fb31760
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index d4fee45fb08f..52ea9d9e1605 100644
--- a/metadata/md5-cache/www-apache/Manifest.gz
+++ b/metadata/md5-cache/www-apache/Manifest.gz
diff --git a/metadata/md5-cache/www-apache/mod_wsgi-5.0.0 b/metadata/md5-cache/www-apache/mod_wsgi-5.0.0
index 39f2ceb09a12..44d0c14e6dc4 100644
--- a/metadata/md5-cache/www-apache/mod_wsgi-5.0.0
+++ b/metadata/md5-cache/www-apache/mod_wsgi-5.0.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/GrahamDumpleton/mod_wsgi
 INHERIT=apache-module python-single-r1
 IUSE=python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_single_target_python3_12? ( dev-lang/python:3.12[threads(+)] ) =www-servers/apache-2*
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/mod_wsgi/archive/5.0.0.tar.gz -> mod_wsgi-5.0.0.gh.tar.gz
 _eclasses_=apache-module	7a226dc5662c581e506e053b99bb8b31	depend.apache	1d51223a0def226481583990f380519c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=819f44457446dcb2180b879103afffc5
+_md5_=bc34647ebda5944564b94dc54774ebee
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 0ddbff7c5bb8..dce8ba3655cd 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/chromedriver-bin-126.0.6478.126 b/metadata/md5-cache/www-apps/chromedriver-bin-126.0.6478.182
index 937f33b2cc83..7cf2f5e0388d 100644
--- a/metadata/md5-cache/www-apps/chromedriver-bin-126.0.6478.126
+++ b/metadata/md5-cache/www-apps/chromedriver-bin-126.0.6478.182
@@ -8,5 +8,5 @@ LICENSE=google-chrome
 RDEPEND=sys-libs/glibc www-client/google-chrome !www-client/chromium
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=amd64? ( https://storage.googleapis.com/chrome-for-testing-public/126.0.6478.126/linux64/chromedriver-linux64.zip -> chromedriver-bin-126.0.6478.126.linux64.zip )
+SRC_URI=amd64? ( https://storage.googleapis.com/chrome-for-testing-public/126.0.6478.182/linux64/chromedriver-linux64.zip -> chromedriver-bin-126.0.6478.182.linux64.zip )
 _md5_=5e5984a0f6dd175b47af13c2c4ef519e
diff --git a/metadata/md5-cache/www-apps/sonarr-bin-4.0.8.1874 b/metadata/md5-cache/www-apps/sonarr-bin-4.0.8.1874
deleted file mode 100644
index 4348fd7b71ec..000000000000
--- a/metadata/md5-cache/www-apps/sonarr-bin-4.0.8.1874
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install prepare
-DESCRIPTION=Sonarr is a Smart PVR for newsgroup and bittorrent users
-EAPI=8
-HOMEPAGE=https://www.sonarr.tv
-INHERIT=systemd
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=acct-group/sonarr acct-user/sonarr media-video/mediainfo dev-libs/icu dev-util/lttng-ust:0 dev-db/sqlite
-RESTRICT=bindist strip test
-SLOT=0
-SRC_URI=amd64? ( elibc_glibc? ( https://github.com/Sonarr/Sonarr/releases/download/v4.0.8.1874/Sonarr.main.4.0.8.1874.linux-x64.tar.gz ) elibc_musl? ( https://github.com/Sonarr/Sonarr/releases/download/v4.0.8.1874/Sonarr.main.4.0.8.1874.linux-musl-x64.tar.gz ) ) arm? ( elibc_glibc? ( https://github.com/Sonarr/Sonarr/releases/download/v4.0.8.1874/Sonarr.main.4.0.8.1874.linux-arm.tar.gz ) ) arm64? ( elibc_glibc? ( https://github.com/Sonarr/Sonarr/releases/download/v4.0.8.1874/Sonarr.main.4.0.8.1874.linux-arm64.tar.gz ) elibc_musl? ( https://github.com/Sonarr/Sonarr/releases/download/v4.0.8.1874/Sonarr.main.4.0.8.1874.linux-musl-arm64.tar.gz ) )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=5905ccb8201d487b4e86fa2601731978
diff --git a/metadata/md5-cache/www-apps/sonarr-bin-4.0.8.1893 b/metadata/md5-cache/www-apps/sonarr-bin-4.0.8.1893
new file mode 100644
index 000000000000..988374dc50af
--- /dev/null
+++ b/metadata/md5-cache/www-apps/sonarr-bin-4.0.8.1893
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install prepare
+DESCRIPTION=Sonarr is a Smart PVR for newsgroup and bittorrent users
+EAPI=8
+HOMEPAGE=https://www.sonarr.tv
+INHERIT=systemd
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=acct-group/sonarr acct-user/sonarr media-video/mediainfo dev-libs/icu dev-util/lttng-ust:0 dev-db/sqlite
+RESTRICT=bindist strip test
+SLOT=0
+SRC_URI=amd64? ( elibc_glibc? ( https://github.com/Sonarr/Sonarr/releases/download/v4.0.8.1893/Sonarr.develop.4.0.8.1893.linux-x64.tar.gz ) elibc_musl? ( https://github.com/Sonarr/Sonarr/releases/download/v4.0.8.1893/Sonarr.develop.4.0.8.1893.linux-musl-x64.tar.gz ) ) arm? ( elibc_glibc? ( https://github.com/Sonarr/Sonarr/releases/download/v4.0.8.1893/Sonarr.develop.4.0.8.1893.linux-arm.tar.gz ) ) arm64? ( elibc_glibc? ( https://github.com/Sonarr/Sonarr/releases/download/v4.0.8.1893/Sonarr.develop.4.0.8.1893.linux-arm64.tar.gz ) elibc_musl? ( https://github.com/Sonarr/Sonarr/releases/download/v4.0.8.1893/Sonarr.develop.4.0.8.1893.linux-musl-arm64.tar.gz ) )
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=d2434edc294d6dfc5195155c8c3d1bd8
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 9d0401a8bd26..36592a60806a 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/chromium-127.0.6533.26 b/metadata/md5-cache/www-client/chromium-126.0.6478.182
index 9bfc4f852bb8..0d42a96a70f7 100644
--- a/metadata/md5-cache/www-client/chromium-127.0.6533.26
+++ b/metadata/md5-cache/www-client/chromium-126.0.6478.182
@@ -1,17 +1,17 @@
-BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.12.4:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) system-zstd? ( >=app-arch/zstd-1.5.5:= ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-libs/libpulse:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) || ( dev-lang/python:3.13[xml(+)] dev-lang/python:3.12[xml(+)] dev-lang/python:3.11[xml(+)] ) || ( ( dev-lang/python:3.13[xml(+)] dev-python/setuptools[python_targets_python3_13(-)] ) ( dev-lang/python:3.12[xml(+)] dev-python/setuptools[python_targets_python3_12(-)] ) ( dev-lang/python:3.11[xml(+)] dev-python/setuptools[python_targets_python3_11(-)] ) ) >=app-arch/gzip-1.7 !headless? ( qt5? ( dev-qt/qtcore:5 ) qt6? ( dev-qt/qtbase:6 ) ) system-toolchain? ( llvm_slot_17? ( sys-devel/clang:17 sys-devel/llvm:17 sys-devel/lld:17 virtual/rust:0/llvm-17[profiler(-)] pgo? ( sys-libs/compiler-rt-sanitizers:17[profile] ) ) llvm_slot_18? ( sys-devel/clang:18 sys-devel/llvm:18 sys-devel/lld:18 virtual/rust:0/llvm-18[profiler(-)] pgo? ( sys-libs/compiler-rt-sanitizers:18[profile] ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 ) dev-util/bindgen ) >=dev-build/gn-0.2165 dev-build/ninja dev-lang/perl >=dev-util/gperf-3.0.3 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig virtual/pkgconfig pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup unpack
-DEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.12.4:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) system-zstd? ( >=app-arch/zstd-1.5.5:= ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-libs/libpulse:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) ) !headless? ( gtk4? ( gui-libs/gtk:4[X?,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) )
+BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.12.4:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) system-zstd? ( >=app-arch/zstd-1.5.5:= ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-libs/libpulse:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) || ( dev-lang/python:3.13[xml(+)] dev-lang/python:3.12[xml(+)] dev-lang/python:3.11[xml(+)] ) || ( ( dev-lang/python:3.13[xml(+)] dev-python/setuptools[python_targets_python3_13(-)] ) ( dev-lang/python:3.12[xml(+)] dev-python/setuptools[python_targets_python3_12(-)] ) ( dev-lang/python:3.11[xml(+)] dev-python/setuptools[python_targets_python3_11(-)] ) ) >=app-arch/gzip-1.7 !headless? ( qt5? ( dev-qt/qtcore:5 ) qt6? ( dev-qt/qtbase:6 ) ) system-toolchain? ( libcxx? ( >=sys-devel/clang-17 ) lto? ( || ( ( sys-devel/clang:17 sys-devel/llvm:17 =sys-devel/lld-17* ) ( sys-devel/clang:18 sys-devel/llvm:18 =sys-devel/lld-18* ) ( sys-devel/clang:19 sys-devel/llvm:19 =sys-devel/lld-19* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:17 sys-devel/llvm:17 =sys-devel/lld-17* ) ( sys-devel/clang:18 sys-devel/llvm:18 =sys-devel/lld-18* ) ( sys-devel/clang:19 sys-devel/llvm:19 =sys-devel/lld-19* ) ) ) >=virtual/rust-1.72.0[profiler(-)] ) >=dev-build/gn-0.2165 dev-build/ninja dev-lang/perl >=dev-util/gperf-3.0.3 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig system-toolchain? ( >=sys-devel/clang-17 ) system-toolchain? ( >=sys-devel/lld-17 ) virtual/pkgconfig pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.12.4:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) system-zstd? ( >=app-arch/zstd-1.5.5:= ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-libs/libpulse:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) ) !headless? ( gtk4? ( gui-libs/gtk:4[X?,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) ) !!sys-devel/llvm:0
 DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=8
 HOMEPAGE=https://www.chromium.org/
-INHERIT=check-reqs chromium-2 desktop flag-o-matic llvm-r1 ninja-utils pax-utils python-any-r1 qmake-utils readme.gentoo-r1 systemd toolchain-funcs virtualx xdg-utils
-IUSE=+X +system-harfbuzz +system-icu +system-png +system-zstd bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +lto +official pax-kernel pgo +proprietary-codecs pulseaudio qt5 qt6 +screencast selinux +system-toolchain +vaapi +wayland +widevine custom-cflags +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW +llvm_slot_17 llvm_slot_18 pgo
-KEYWORDS=~amd64 ~arm64
+INHERIT=check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 qmake-utils readme.gentoo-r1 systemd toolchain-funcs virtualx xdg-utils
+IUSE=+X +system-harfbuzz +system-icu +system-png +system-zstd bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos libcxx +lto +official pax-kernel pgo +proprietary-codecs pulseaudio qt5 qt6 +screencast selinux +system-toolchain +vaapi +wayland +widevine custom-cflags +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW pgo
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=BSD
-RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.12.4:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) system-zstd? ( >=app-arch/zstd-1.5.5:= ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-libs/libpulse:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) qt5? ( dev-qt/qtgui:5[X?,wayland?] ) qt6? ( dev-qt/qtbase:6[X?,wayland?] ) ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) bindist? ( !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) ffmpeg-chromium? ( media-video/ffmpeg-chromium:127 ) )
-REQUIRED_USE=!headless? ( || ( X wayland ) ) official? ( lto ) pgo? ( X !wayland ) qt6? ( qt5 ) screencast? ( wayland ) ffmpeg-chromium? ( bindist proprietary-codecs ) ^^ ( llvm_slot_17 llvm_slot_18 )
+RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.12.4:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) system-zstd? ( >=app-arch/zstd-1.5.5:= ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-libs/libpulse:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) qt5? ( dev-qt/qtgui:5[X?,wayland?] ) qt6? ( dev-qt/qtbase:6[X?,wayland?] ) ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) bindist? ( !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) ffmpeg-chromium? ( media-video/ffmpeg-chromium:126 ) )
+REQUIRED_USE=!headless? ( || ( X wayland ) ) pgo? ( X !wayland ) qt6? ( qt5 ) screencast? ( wayland ) !system-toolchain? ( libcxx ) ffmpeg-chromium? ( bindist proprietary-codecs )
 RESTRICT=!bindist? ( bindist )
-SLOT=0/beta
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-127.0.6533.26.tar.xz system-toolchain? ( https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/127/chromium-patches-127.tar.bz2 ) !system-toolchain? ( https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/clang-llvmorg-19-init-10646-g084e2b53-57.tar.xz -> chromium-127-clang.tar.xz https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/rust-toolchain-32dd3795bce8b347fda786529cf5e42a813e0b7d-2-llvmorg-19-init-10646-g084e2b53.tar.xz -> chromium-127-rust.tar.xz ) ppc64? ( https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_124.0.6367.207-1raptor0~deb12u1.debian.tar.xz https://deps.gentoo.zip/chromium-ppc64le-gentoo-patches-1.tar.xz ) pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=556ddb7c486214ed91be4d603c25e2b3
+SLOT=0/stable
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-126.0.6478.182.tar.xz system-toolchain? ( https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/126/chromium-patches-126.tar.bz2 ) !system-toolchain? ( https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/clang-llvmorg-19-init-9433-g76ea5feb-1.tar.xz -> chromium-126-clang.tar.xz https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/rust-toolchain-31e6e8c6c5b6ce62656c922c7384d3376018c980-2-llvmorg-19-init-9433-g76ea5feb.tar.xz -> chromium-126-rust.tar.xz ) ppc64? ( https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_126.0.6478.126-1raptor0~deb12u1.debian.tar.xz https://deps.gentoo.zip/chromium-ppc64le-gentoo-patches-1.tar.xz ) pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	e503ea5acc20410237ba33ec3f7c857d	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=4561e14bdbc904e51478663c7ea6cd3f
diff --git a/metadata/md5-cache/www-client/google-chrome-126.0.6478.126 b/metadata/md5-cache/www-client/google-chrome-126.0.6478.182
index 60e08283eb9a..0b2cd8f6c6be 100644
--- a/metadata/md5-cache/www-client/google-chrome-126.0.6478.126
+++ b/metadata/md5-cache/www-client/google-chrome-126.0.6478.182
@@ -10,6 +10,6 @@ LICENSE=google-chrome
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_126.0.6478.126-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_126.0.6478.182-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=bfd7fbed5da8b0a45c8a72b4a253e8dd
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-127.0.6533.43 b/metadata/md5-cache/www-client/google-chrome-beta-127.0.6533.57
index f2a0e0c35298..643819bc8106 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-127.0.6533.43
+++ b/metadata/md5-cache/www-client/google-chrome-beta-127.0.6533.57
@@ -10,6 +10,6 @@ LICENSE=google-chrome
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_127.0.6533.43-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_127.0.6533.57-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=830a7134f8131d55b1df4f5860ec558f
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-128.0.6559.0 b/metadata/md5-cache/www-client/google-chrome-unstable-128.0.6585.0
index 5dcfeea24cf2..2760f2d295a5 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-128.0.6559.0
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-128.0.6585.0
@@ -10,6 +10,6 @@ LICENSE=google-chrome
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_128.0.6559.0-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_128.0.6585.0-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=830a7134f8131d55b1df4f5860ec558f
diff --git a/metadata/md5-cache/www-client/microsoft-edge-126.0.2592.87 b/metadata/md5-cache/www-client/microsoft-edge-126.0.2592.102
index e1fc1f654969..b6b712c68c8f 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-126.0.2592.87
+++ b/metadata/md5-cache/www-client/microsoft-edge-126.0.2592.102
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_126.0.2592.87-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_126.0.2592.102-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=85c7975e84e5c480a26236aa6c35483f
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-127.0.2651.15 b/metadata/md5-cache/www-client/microsoft-edge-beta-127.0.2651.49
index 5bf7aa5de13e..f1d6a69415b0 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-127.0.2651.15
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-127.0.2651.49
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_127.0.2651.15-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_127.0.2651.49-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5763d77203fbca8cef77df6c97b9381d
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-127.0.2651.8 b/metadata/md5-cache/www-client/microsoft-edge-dev-128.0.2708.0
index 91e4f0bf2a5a..7424e38715d7 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-127.0.2651.8
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-128.0.2708.0
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_127.0.2651.8-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_128.0.2708.0-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5763d77203fbca8cef77df6c97b9381d
diff --git a/metadata/md5-cache/www-client/opera-111.0.5168.61 b/metadata/md5-cache/www-client/opera-112.0.5197.25
index 4da223b05d13..cffc644bef29 100644
--- a/metadata/md5-cache/www-client/opera-111.0.5168.61
+++ b/metadata/md5-cache/www-client/opera-112.0.5197.25
@@ -7,9 +7,9 @@ INHERIT=chromium-2 pax-utils xdg unpacker
 IUSE=+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6 +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* amd64
 LICENSE=OPERA-2018
-RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango proprietary-codecs? ( !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) ffmpeg-chromium? ( media-video/ffmpeg-chromium:125 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] )
+RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango 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[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera/desktop/111.0.5168.61/linux/opera-stable_111.0.5168.61_amd64.deb https://download2.operacdn.com/pub/opera/desktop/111.0.5168.61/linux/opera-stable_111.0.5168.61_amd64.deb https://download3.operacdn.com/pub/opera/desktop/111.0.5168.61/linux/opera-stable_111.0.5168.61_amd64.deb https://download4.operacdn.com/pub/opera/desktop/111.0.5168.61/linux/opera-stable_111.0.5168.61_amd64.deb
+SRC_URI=https://download1.operacdn.com/pub/opera/desktop/112.0.5197.25/linux/opera-stable_112.0.5197.25_amd64.deb https://download2.operacdn.com/pub/opera/desktop/112.0.5197.25/linux/opera-stable_112.0.5197.25_amd64.deb https://download3.operacdn.com/pub/opera/desktop/112.0.5197.25/linux/opera-stable_112.0.5197.25_amd64.deb https://download4.operacdn.com/pub/opera/desktop/112.0.5197.25/linux/opera-stable_112.0.5197.25_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b703ec022eb735cbccd5f1fff9759668
+_md5_=d71f0faa38826620280b2a8bc08816f8
diff --git a/metadata/md5-cache/www-client/opera-beta-112.0.5197.10 b/metadata/md5-cache/www-client/opera-beta-112.0.5197.10
index b265bd1fc7c1..c37616b18430 100644
--- a/metadata/md5-cache/www-client/opera-beta-112.0.5197.10
+++ b/metadata/md5-cache/www-client/opera-beta-112.0.5197.10
@@ -7,9 +7,9 @@ INHERIT=chromium-2 pax-utils xdg unpacker
 IUSE=+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6 +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* ~amd64
 LICENSE=OPERA-2018
-RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango proprietary-codecs? ( !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) ffmpeg-chromium? ( media-video/ffmpeg-chromium:125 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] )
+RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango 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[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] )
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera-beta/112.0.5197.10/linux/opera-beta_112.0.5197.10_amd64.deb https://download2.operacdn.com/pub/opera-beta/112.0.5197.10/linux/opera-beta_112.0.5197.10_amd64.deb https://download3.operacdn.com/pub/opera-beta/112.0.5197.10/linux/opera-beta_112.0.5197.10_amd64.deb https://download4.operacdn.com/pub/opera-beta/112.0.5197.10/linux/opera-beta_112.0.5197.10_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6832d3ec1792871a5ade3f8d10a8f1e8
+_md5_=0080db1610e885deb8ab4b7f614daffe
diff --git a/metadata/md5-cache/www-client/opera-beta-112.0.5197.5 b/metadata/md5-cache/www-client/opera-beta-112.0.5197.5
index 90fb4cabca72..dc696f72ce1e 100644
--- a/metadata/md5-cache/www-client/opera-beta-112.0.5197.5
+++ b/metadata/md5-cache/www-client/opera-beta-112.0.5197.5
@@ -7,9 +7,9 @@ INHERIT=chromium-2 pax-utils xdg unpacker
 IUSE=+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6 +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* ~amd64
 LICENSE=OPERA-2018
-RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango proprietary-codecs? ( !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) ffmpeg-chromium? ( media-video/ffmpeg-chromium:125 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] )
+RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango 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[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] )
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera-beta/112.0.5197.5/linux/opera-beta_112.0.5197.5_amd64.deb https://download2.operacdn.com/pub/opera-beta/112.0.5197.5/linux/opera-beta_112.0.5197.5_amd64.deb https://download3.operacdn.com/pub/opera-beta/112.0.5197.5/linux/opera-beta_112.0.5197.5_amd64.deb https://download4.operacdn.com/pub/opera-beta/112.0.5197.5/linux/opera-beta_112.0.5197.5_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6832d3ec1792871a5ade3f8d10a8f1e8
+_md5_=0080db1610e885deb8ab4b7f614daffe
diff --git a/metadata/md5-cache/www-client/opera-developer-113.0.5215.0 b/metadata/md5-cache/www-client/opera-developer-113.0.5215.0
index 1931449aca6b..7c6368ded9fb 100644
--- a/metadata/md5-cache/www-client/opera-developer-113.0.5215.0
+++ b/metadata/md5-cache/www-client/opera-developer-113.0.5215.0
@@ -7,9 +7,9 @@ INHERIT=chromium-2 pax-utils xdg unpacker
 IUSE=+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6 +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* ~amd64
 LICENSE=OPERA-2018
-RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango proprietary-codecs? ( !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) ffmpeg-chromium? ( media-video/ffmpeg-chromium:125 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] )
+RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango 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[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] )
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera-developer/113.0.5215.0/linux/opera-developer_113.0.5215.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/113.0.5215.0/linux/opera-developer_113.0.5215.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/113.0.5215.0/linux/opera-developer_113.0.5215.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/113.0.5215.0/linux/opera-developer_113.0.5215.0_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6832d3ec1792871a5ade3f8d10a8f1e8
+_md5_=0080db1610e885deb8ab4b7f614daffe
diff --git a/metadata/md5-cache/www-client/opera-developer-113.0.5222.0 b/metadata/md5-cache/www-client/opera-developer-113.0.5222.0
index c65d02a8793a..4d4b6bebeba1 100644
--- a/metadata/md5-cache/www-client/opera-developer-113.0.5222.0
+++ b/metadata/md5-cache/www-client/opera-developer-113.0.5222.0
@@ -7,9 +7,9 @@ INHERIT=chromium-2 pax-utils xdg unpacker
 IUSE=+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6 +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* ~amd64
 LICENSE=OPERA-2018
-RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango proprietary-codecs? ( !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) ffmpeg-chromium? ( media-video/ffmpeg-chromium:125 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] )
+RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango 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[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] )
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera-developer/113.0.5222.0/linux/opera-developer_113.0.5222.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/113.0.5222.0/linux/opera-developer_113.0.5222.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/113.0.5222.0/linux/opera-developer_113.0.5222.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/113.0.5222.0/linux/opera-developer_113.0.5222.0_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6832d3ec1792871a5ade3f8d10a8f1e8
+_md5_=0080db1610e885deb8ab4b7f614daffe
diff --git a/metadata/md5-cache/www-client/opera-developer-113.0.5210.0 b/metadata/md5-cache/www-client/opera-developer-113.0.5227.0
index 3f2340cab2f3..748d455992a3 100644
--- a/metadata/md5-cache/www-client/opera-developer-113.0.5210.0
+++ b/metadata/md5-cache/www-client/opera-developer-113.0.5227.0
@@ -7,9 +7,9 @@ INHERIT=chromium-2 pax-utils xdg unpacker
 IUSE=+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6 +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* ~amd64
 LICENSE=OPERA-2018
-RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango proprietary-codecs? ( !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) ffmpeg-chromium? ( media-video/ffmpeg-chromium:125 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] )
+RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango 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[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-developer/113.0.5210.0/linux/opera-developer_113.0.5210.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/113.0.5210.0/linux/opera-developer_113.0.5210.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/113.0.5210.0/linux/opera-developer_113.0.5210.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/113.0.5210.0/linux/opera-developer_113.0.5210.0_amd64.deb
+SRC_URI=https://download1.operacdn.com/pub/opera-developer/113.0.5227.0/linux/opera-developer_113.0.5227.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/113.0.5227.0/linux/opera-developer_113.0.5227.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/113.0.5227.0/linux/opera-developer_113.0.5227.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/113.0.5227.0/linux/opera-developer_113.0.5227.0_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6832d3ec1792871a5ade3f8d10a8f1e8
+_md5_=0080db1610e885deb8ab4b7f614daffe
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 21ec957f6518..165788ea167b 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-126.0.6478.126 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-126.0.6478.182
index 184082e34db1..5af592b6cd6e 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-126.0.6478.126
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-126.0.6478.182
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=stable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_126.0.6478.126-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_126.0.6478.182-1_amd64.deb
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09
 _md5_=fa2f06833cd9f9f645a48582e0cfafc8
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-127.0.6533.43_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-127.0.6533.57_beta
index 1ded9105c429..bb65642be7b2 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-127.0.6533.43_beta
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-127.0.6533.57_beta
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_127.0.6533.43-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_127.0.6533.57-1_amd64.deb
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09
 _md5_=5b19787a2bf752fe71a01f6e6da560aa
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-128.0.6559.0_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-128.0.6585.0_alpha
index 160acea05760..5e3465355fcf 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-128.0.6559.0_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-128.0.6585.0_alpha
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_128.0.6559.0-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_128.0.6585.0-1_amd64.deb
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09
 _md5_=5b19787a2bf752fe71a01f6e6da560aa
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 9d3cc3df1174..27520c9f8236 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/spectrwm-3.5.1 b/metadata/md5-cache/x11-wm/spectrwm-3.5.1
index 783c413783a7..999c88abb060 100644
--- a/metadata/md5-cache/x11-wm/spectrwm-3.5.1
+++ b/metadata/md5-cache/x11-wm/spectrwm-3.5.1
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
-DEPEND=elibc_musl? ( sys-libs/queue-standalone ) x11-libs/libxcb x11-libs/libX11 x11-libs/libXcursor x11-libs/libXft x11-libs/libXrandr x11-libs/xcb-util x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm
+DEPEND=elibc_musl? ( sys-libs/queue-standalone ) x11-libs/libxcb x11-libs/libX11 x11-libs/libXcursor x11-libs/libXft x11-libs/libXrandr x11-libs/libXt x11-libs/xcb-util x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm
 DESCRIPTION=Small dynamic tiling window manager for X11
 EAPI=8
 HOMEPAGE=https://github.com/conformal/spectrwm
 INHERIT=toolchain-funcs
 KEYWORDS=amd64 x86
 LICENSE=ISC
-RDEPEND=elibc_musl? ( sys-libs/queue-standalone ) x11-libs/libxcb x11-libs/libX11 x11-libs/libXcursor x11-libs/libXft x11-libs/libXrandr x11-libs/xcb-util x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-misc/dmenu
+RDEPEND=elibc_musl? ( sys-libs/queue-standalone ) x11-libs/libxcb x11-libs/libX11 x11-libs/libXcursor x11-libs/libXft x11-libs/libXrandr x11-libs/libXt x11-libs/xcb-util x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-misc/dmenu
 SLOT=0
 SRC_URI=https://github.com/conformal/spectrwm/archive/SPECTRWM_3_5_1.tar.gz -> spectrwm-3.5.1.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=d551b9118154ffee8b5e55f5247b52fc
+_md5_=644e270a7b196d83414a556b574d7d17
diff --git a/metadata/md5-cache/x11-wm/spectrwm-3.6.0 b/metadata/md5-cache/x11-wm/spectrwm-3.6.0
new file mode 100644
index 000000000000..be7cac5c4767
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/spectrwm-3.6.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=elibc_musl? ( sys-libs/queue-standalone ) dev-libs/libbsd x11-libs/libxcb x11-libs/libX11 x11-libs/libXcursor x11-libs/libXft x11-libs/libXrandr x11-libs/libXt x11-libs/xcb-util x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm
+DESCRIPTION=Small dynamic tiling window manager for X11
+EAPI=8
+HOMEPAGE=https://github.com/conformal/spectrwm
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=elibc_musl? ( sys-libs/queue-standalone ) dev-libs/libbsd x11-libs/libxcb x11-libs/libX11 x11-libs/libXcursor x11-libs/libXft x11-libs/libXrandr x11-libs/libXt x11-libs/xcb-util x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-misc/dmenu
+SLOT=0
+SRC_URI=https://github.com/conformal/spectrwm/archive/SPECTRWM_3_6_0.tar.gz -> spectrwm-3.6.0.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=15ca045daaf68575642e60124acdd5b6
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index e57b63ffa798..e6832cd2b130 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 18196 BLAKE2B 1b43af09e61e2865c024c72285ed218159c7ec13fb8eed308744d07d77ca67bd464e4e1e0953b84b2feefea8c3c0df17f2e9ca49f7df8516e5e9d8f85c1e97d2 SHA512 1cfd10f587a7c1b83e57769d372f8b0b4748d237837b5136194fd0cb51e57e068480b7753d62a86072d8760a29fb1eea4fda11ead23ce37ef285381acb9e8ce9
-TIMESTAMP 2024-07-17T10:40:45Z
+TIMESTAMP 2024-07-18T10:10:51Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmaXn61fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmaY6itfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBm4xAAnTtwSmU3DzqJC6VJxdI896seoluTxOSpucZ5U/Esl3M+nMCZy/mOlaSI
-Csr3Vae7NXXwWgT+peKWYQxehlTSEj5uBR71tapqfk+upoe4WUed2mFyYF1fPjL0
-YdTnWud4kdpSZu09VHkSnJC7catrFjmHiltnCDiC9Md9Tgc8FE3xTVXi4Sj5tSVV
-Z6PCqgah8lrquHrVPFQG/CTYe3Ws0IkaA7ryTU1YWLi/8aYWoroK3NsqBB4XK7t3
-hdq3mrxzK6+BbCanrDxyAjRM2qxtCgTEsKVs06VQdRkHayJE/s5RuAYt3RwHg01c
-s/hxj+u2gM0lGBoyc2YolmnfS7fhMyjhn/T0DGkZGzcC9GEcbirEBbCkYmWFTerw
-HhRn3ipkLH72pwZPbLUmezzdK5g5tZowCiih3HEgu/K0CzsFVlCxvaCB1Y/xQDEK
-ARW0wCCYIr9l932ygGxN4FQMZ/QbIxehGIvPlloTyva0a2u2wKTpKglsZLHWQDm0
-T60dviL/a6pPNyZykP+OSsnW6IpEVLEpxCqFF574SVa+atzhwqJ61YdlxfiQvbuB
-PHhUGwnEw0mTdZvlHG/h+AG5B5TrgbVrbovUcN0fb5Nyur5oTQDpvqla+YWRl5wA
-zGgzf5IqJ4MrpVnQxFyFXqdsaxGvOWebvKWjcVZnB6yYy5CA5mM=
-=1Hsz
+klCn4A//alD7pBoLiz4xa7JUA7nXy1AI53w2b3AuRRP8M2Evtc4dQyKCCoxJpcJ8
+ivPVlnixgjpfzVh0czQtMZ/N8sBNrDR1fxT1LtaSUjCl2PVuK8OAEwYTjuUJRBUz
+63XDh2uYbkGCE5NodTKB3k8BOXguwblV1bTWZ5qcrw49Vys5JFl/hBCOlTV67++7
+DbDGul66HEdc/0IxzwYyt1/1P9wiOHXAvksmvD1mgWbvRNOwic/6QSfPhFyaS1AZ
+biAk/b1KyZcE/w8xW2jl/2m4BQKzs1uFBRHrxxAvqWNupF7KArPL+na74ifHBbl8
+5MujuuY4Q4XvxjZ+FmK1SEY4Xe3un0VGrgXqbs3siEFxOw9vdrbhGECDBgvl35LZ
+EKATXRVWjXDo+ooqKB4TCFye4tBaKCbm0OFYiSmlwKtgvqju3BZY5G1IC9PjLjxs
+Ngy4SkVqsiAjL2DoXXZJpnpi3PJfCG1XcFzZ5yzZonIIwWRQwXwyeOxawKsS3bxp
+C0dUriXOcKyqR//qLCBhakSNmABVxDt1TujJSSixat0A7Bw05XextDun+E5IhS5J
+fzbMBVfTrOQdHn4RSHTa7DOGkMuuA+RPod7xjeA8ZE2kH8sbRAQRv7S3mQ65zjDE
+HZvahGYpdpMqlvks0I3iUmOV4nAhVwM1Ds5q+EZIqUp2AqiK+AE=
+=MchJ
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 6c0086e1296d..84c046be2def 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 17 Jul 2024 10:40:41 +0000
+Thu, 18 Jul 2024 10:10:48 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 4e1a3d327866..56ff8c9bf141 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Jul 17 10:40:41 AM UTC 2024
+Thu Jul 18 10:10:47 AM UTC 2024
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d268275182f3..0627fd11b1cf 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 17 Jul 2024 10:45:00 +0000
+Thu, 18 Jul 2024 11:00:00 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 7e1c65e5a877..fa09db63bd7e 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-5b11e7a4e007d997a5a2fe416aad90cc9cbb273d 1721212230 2024-07-17T10:30:30Z
+a122c7637dcecd0509bf933888bcd9fb18cedc8c 1721297028 2024-07-18T10:03:48Z
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index a9402c639cc6..5ed7b1a043ae 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1721212800 Wed 17 Jul 2024 10:40:00 AM UTC
+1721297400 Thu 18 Jul 2024 10:10:00 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 6c0086e1296d..7dbbe5ff0bda 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 17 Jul 2024 10:40:41 +0000
+Thu, 18 Jul 2024 10:10:47 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 1f4f369f3c55..085e87e358ca 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index 102eadedb703..5a6159fdac85 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -1,12 +1,10 @@
 AUX goaccess.confd 306 BLAKE2B 27f5a4a26fdcc4aff21bd2bb2a462e4875462c5b9a6f452b1d1acf0e1673eb95e429c8ff3ba258343905252e7428008c71fd8fbfc5f6abb7e4847471db4cf32d SHA512 fd77d490b3f08c38c01c34dfd050624bc3770ab0bf3d32b4cb226c152889ea8693b78af41a9ced4437d8961f621291ac7a0317a9f246f06b28ae79f25d4d5e4e
-AUX goaccess.initd 372 BLAKE2B 8a232845fc9ba7f6e5e0481cad50fa04e58dd4113ceaad1612dff16ffe1e76db4e9f438e7a72debd531943e8fe54f311fb54e16513d31443a6f7446b546c476a SHA512 685843cbb7749cebdec22871f5a5db263040491c25c9c41986e31935d7e0c15887d0d456195228d5b89abc060af46ab0f52c27eecfe6db0e374fa32bfbd78b8f
+AUX goaccess.initd 414 BLAKE2B 976843bc5fb3d2c75958dccab7f7d06ff49b97445fb7b02490d06f58164b50dde2d893e8b554017c86f23461023360a3127dd9f0f348aa0be945dd022cb33112 SHA512 d8c04e2fad46dfec673a4bf44560720cfbd31e7c7ab5c1658f4e3571e5fc17c01237a92b14c3bca59ced8aaad7a9af8dd52ca74782eac97fef4ce487e9e23a88
 AUX goaccess.service 381 BLAKE2B ab4a4e2a35846f8bf7ed80539a7be38f2507ee25ecac63900a88dd625a0fd3a44dfcd6e7f60fb45186cc40063cd9cae95dd8a5ff366356209a2039cee2b2cd34 SHA512 3d5482bdf13c31116f53f0ba9af4aa282aba01f7e2b8916eb88067500be616ed6b3d107fdf2e079a0c78f75c8a894dd25e8866edcb02ff6e5bd268b802b46e7b
 AUX goaccess.tmpfile 40 BLAKE2B dd3595d9f1cca0c652a62fd19032d138aeeeb21523db4d05d2adff28ea8b65c16cca32c2e73b285ba15911470248868c200ce62307597e7e452ae8a9bc6e645a SHA512 47f95152cf575d74336340af898551a10c6ff9dcf197ca06ac799be77cc7fb69957c3277976f30cf0f10eee6c278abb1a823b9867f14aba9b6cb36d6a9b43700
-DIST goaccess-1.6.3.tar.gz 658827 BLAKE2B 48378235a75c11e7392bcaca98c64689032e74377696cf6fd3e0e230dd35a2e0f78e5f4283da2c4693ec072942ae6be4d3dc27f91f23d8390f81a330d9955c93 SHA512 7890fc35700db9ce1d3c720607cce6008a3140a14d143fcdd02f11a79f5344a26c648c9b7e6316a21d3ff07f588815bcdfb33072b5e0a18c429e9bfdb8bf99f4
-DIST goaccess-1.7.2.tar.gz 679321 BLAKE2B a423553fcbac76eb1358bffda9ec413da48241f9702d01872cede4999fa2baef60758f48ad621986789ddf2f514ca77ac72a4d367469ec493d792dea01c3f957 SHA512 0e057c9d49d5a9189af0b8f12e867d4402326ca0d2f562771b4d2c73fcfc2e5d79a826465ee56e03e036fbcddb7c6171005cd06ba28a2c25fc1683fe37bd59a7
 DIST goaccess-1.8.1.tar.gz 740177 BLAKE2B cc1f17c72adeeaf50d3b6c7bef47a044a3bbf06fb44d73da9b1ae68ea71d8e276dbe02c6a89cf0a72f3327e817e8d59235f788d29aeb7c7c889bacf81b64292a SHA512 96f0b73f13cfb77ad57748bce7d8791f8486bfd5ce47420d1c0016826a4deb9ab2d2742f4afd5d8b0eed003f9b596aae51f232fa71bf47f823b6ff8119f91354
-EBUILD goaccess-1.6.3.ebuild 1708 BLAKE2B a99b4f5c179b78506836cef7a601f17aceb839d9fcfd97c07acc687a01c44d1cc2ac176b5cd78b33b8245b493bcf91505b4f3e0e359b2324e9e8a848bca46803 SHA512 da9f649abd865f3b9db71cc2f29cd0292e731ffd60646258eddad03d8479495e7880c078cffbe134df819be9dc7c71265f21ea23334ddee30b727fd3aef47f90
-EBUILD goaccess-1.7.2.ebuild 1720 BLAKE2B f26124290f2d3fa96cfc2d728437c1e806cb5a201c0ae5c894d8e88d7c15f850322f3855878daa08687ef18fcf87004b07ede550536dac1f7f43c575c9aa9c7b SHA512 062088ffffb615ddb7799015bd0ba9af1469758181f701b1f44609f94a1aa94486f745c6003a4c1d5ec2c5490ba96a35c2d0b089066f32ba7b1a0c2e6deca8a0
+DIST goaccess-1.9.3.tar.gz 821878 BLAKE2B 99a3a0f9b73a24bb871df2eb16be44dfefbe8fdcd9f10aec66beca98bae65a8b98085c58168c35407f53cf599cf33bc930247f7f7241742ca7750ef68236992e SHA512 6f838d006bec65819d42115b9ce6edb3d839c1bbb609353163960361684ae67c5ecb859e5c9e19eb3233aac4e97c18bdd4d19e1919b05695b3dfef3ca5e7a192
 EBUILD goaccess-1.8.1.ebuild 1720 BLAKE2B f26124290f2d3fa96cfc2d728437c1e806cb5a201c0ae5c894d8e88d7c15f850322f3855878daa08687ef18fcf87004b07ede550536dac1f7f43c575c9aa9c7b SHA512 062088ffffb615ddb7799015bd0ba9af1469758181f701b1f44609f94a1aa94486f745c6003a4c1d5ec2c5490ba96a35c2d0b089066f32ba7b1a0c2e6deca8a0
-EBUILD goaccess-9999.ebuild 1736 BLAKE2B b2ee7fdeba32f061bac8d49d833c91800babdb0f608ed9e459e6d9f4d3eb9a2355a08fca59a5f7056303c4287c06a49e2490936ffa57933ffb3e9ab8dba8e95d SHA512 a559c2a02c18122318f85573c7e41125ea8b59dc9240cee42a033ac8e0df7b36eefb53f5f79c387232ef4aadeb9ae4612071362ed5d69e00c3e43817c306c51b
+EBUILD goaccess-1.9.3.ebuild 1696 BLAKE2B 77aece7c7e30fe297057a93fa497ff934801e686524a5e36365c97fa38bae5f67bee8d63f479b1d47b4a5486606fb38ca5c6c4bd320fd6e55bd73be8948c1884 SHA512 3af141fa5831f37ade9362b1a7bca0195d8aacf2d2af9902b87b5b2b3e4a9e5d3d0584b8745a70ff94b85c77b75e4b6f355738cfb3df9c6d74ba630b56f6f129
+EBUILD goaccess-9999.ebuild 1713 BLAKE2B 9115fd6dcf2cb4d16e4813c26dc888d74ef67c77d9270c67eeb40da329ef7b2a36d96e18800c88658c291e125c3e3394bc6583000d3e822a2a822fbca10fe326 SHA512 0269660e6dd72efbfbad8bf71697c2adf9bc2fdb6802ed32046bc966aba0f541a97a4adb57c1f0e8f024c22d025b27de1fc0eae4ac4f99777a1a66b459c56336
 MISC metadata.xml 968 BLAKE2B 9b84cc00a75dd00ea5563ef605475fdb6c4fae9ee303fe06d8a8f74a2c3db58794b468866fa0dc06080bcb1a20298969378c6ccfa16da5f9f0cf1582ca8272b8 SHA512 a2f894feb012129a86a85fe3a5c386b6f0fdbc6acc0fd76d53b5b0df90ce528f9ac438d4081ca54f0c05fa79796015d4e0b3429e5a68639b764d0a3f17dd1f05
diff --git a/net-analyzer/goaccess/files/goaccess.initd b/net-analyzer/goaccess/files/goaccess.initd
index be0059588396..bd782952cfb4 100644
--- a/net-analyzer/goaccess/files/goaccess.initd
+++ b/net-analyzer/goaccess/files/goaccess.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 command="/usr/bin/goaccess"
@@ -7,6 +7,7 @@ name="GoAccess"
 description="Real-time web log analyzer"
 config="${CONFIG:-/etc/goaccess/goaccess.conf}"
 command_args="--real-time-html --daemonize -p $config ${OPTS}"
+pidfile="/run/goaccess/${RC_SVCNAME}.pid"
 start_stop_daemon_args="-q"
 
 depend() {
diff --git a/net-analyzer/goaccess/goaccess-1.6.3.ebuild b/net-analyzer/goaccess/goaccess-1.6.3.ebuild
deleted file mode 100644
index 52788637826a..000000000000
--- a/net-analyzer/goaccess/goaccess-1.6.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools optfeature systemd tmpfiles
-
-DESCRIPTION="A real-time web log analyzer and interactive viewer in a terminal"
-HOMEPAGE="https://goaccess.io"
-SRC_URI="https://tar.goaccess.io/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug geoip geoipv2 getline ssl unicode"
-REQUIRED_USE="geoipv2? ( geoip )"
-
-RDEPEND="acct-group/goaccess
-	acct-user/goaccess
-	sys-libs/ncurses:=[unicode(+)?]
-	geoip? (
-		!geoipv2? ( dev-libs/geoip )
-		geoipv2? ( dev-libs/libmaxminddb:0= )
-	)
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# Enable log-format, define log file and db path,
-	# change path to GeoIP bases in config
-	sed -i  -e '/log-format COMBINED/s/#//' \
-		-e '/log-file/s/#//' \
-		-e '/db-path/s|tmp|var/lib/goaccess|' \
-		-e '/geoip-database/s|local/||' config/goaccess.conf \
-		|| die "sed failed for goaccess.conf"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=()
-	readarray -t myeconfargs < <(
-		use_enable debug
-		use_enable geoip geoip "$(usex geoipv2 mmdb legacy)"
-		use_enable unicode utf8
-		use_with getline
-		use_with ssl openssl
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/goaccess.initd goaccess
-	newconfd "${FILESDIR}"/goaccess.confd goaccess
-	systemd_dounit "${FILESDIR}"/goaccess.service
-	newtmpfiles "${FILESDIR}"/goaccess.tmpfile goaccess.conf
-
-	diropts -o goaccess -g goaccess -m 0700
-	keepdir /var/lib/goaccess/db /var/log/goaccess
-}
-
-pkg_postinst() {
-	optfeature "update GeoIP databases" net-misc/geoipupdate
-	tmpfiles_process goaccess.conf
-}
diff --git a/net-analyzer/goaccess/goaccess-1.7.2.ebuild b/net-analyzer/goaccess/goaccess-1.9.3.ebuild
index 483e675fa316..cd8029868ed2 100644
--- a/net-analyzer/goaccess/goaccess-1.7.2.ebuild
+++ b/net-analyzer/goaccess/goaccess-1.9.3.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
 
 # shellcheck disable=SC2207
 
 EAPI=8
 
-inherit autotools optfeature systemd tmpfiles
+inherit optfeature systemd tmpfiles
 
 DESCRIPTION="A real-time web log analyzer and interactive viewer in a terminal"
 HOMEPAGE="https://goaccess.io"
@@ -38,8 +38,6 @@ src_prepare() {
 		-e '/db-path/s|tmp|var/lib/goaccess|' \
 		-e '/geoip-database/s|local/||' config/goaccess.conf \
 		|| die "sed failed for goaccess.conf"
-
-	eautoreconf
 }
 
 src_configure() {
diff --git a/net-analyzer/goaccess/goaccess-9999.ebuild b/net-analyzer/goaccess/goaccess-9999.ebuild
index f865c1c79c2b..58691f5c27b8 100644
--- a/net-analyzer/goaccess/goaccess-9999.ebuild
+++ b/net-analyzer/goaccess/goaccess-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
 
 # shellcheck disable=SC2207
@@ -11,11 +11,9 @@ inherit autotools git-r3 optfeature systemd tmpfiles
 
 DESCRIPTION="A real-time web log analyzer and interactive viewer in a terminal"
 HOMEPAGE="https://goaccess.io"
-SRC_URI=""
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
 IUSE="debug geoip geoipv2 getline ssl unicode"
 REQUIRED_USE="geoipv2? ( geoip )"
 
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 3ac8d4c4b616..b5c85c9a0328 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -24,6 +24,8 @@ DIST zabbix-6.0.30-go-deps.tar.xz 30833644 BLAKE2B 0b15f210c16dd8ab6bef0fbcb1926
 DIST zabbix-6.0.30.tar.gz 45039653 BLAKE2B 5446a15c5fa3400d78eef47cced6cbd0bc884b6b1f14e267321f562b5891e21de41179bb615a733b49ee0ae334aadede32d931db400b9148ec9bc6636ac71e5a SHA512 8e49b53a30d4c9450ea00600144542cc1c709b2a11f3716462eefedee4d47b59c99334002bfd6644c6c49afaba0a268c86f9824ac7d45305c95b55681fd82eee
 DIST zabbix-6.0.31-go-deps.tar.xz 31203888 BLAKE2B e4b2a8a0f505f01b58dc0dd6baf5ea243cbba0fe996aa022a64248a1b698f8919aead95540e05dad71c7b3610cc86ba40dcb685960a0f234d1dc04739ed69f38 SHA512 ef6813f7e29aaf5b2361952fe5373fdbbb2b9a9c39a2314cd3daf8e4f8233f8ded31f29c3efe1f8a9fecb79c4872d5fb7ffdc846c7dd6bbdfb95f683f936e48a
 DIST zabbix-6.0.31.tar.gz 45176869 BLAKE2B d00a02d764f3f8800a87ef5763fff3cd27b5e6c8ed57bd07b23da809e9b4dd61a1b575c7717ff39311b16bba4906256a48ab01e8f2b4b594bcfde25ae003ed73 SHA512 75488e47ac32758f41ebe76d2e6a0e7f165e3921e04b9ac8304dc72a97718739aef06c42baa3d474066bd6f10c944547131c25ef4d553df9cbd13b797ea3d586
+DIST zabbix-6.0.32-go-deps.tar.xz 31197844 BLAKE2B 91d99f94ed189c0e8f08d01c5b88835588c7797d33c54b0c60d593afe8d6f14aa481a6036db840ca7b2782ac4440dcaf757306a52ef11fce1408714c8face139 SHA512 63d9804563c12aac7fed4de28b6c1726f1bdfe338170a5d6c82413736920b082287dbb1fd7d64b7db84d013403dde2f5518783135495ff7e2563e927e6e213f9
+DIST zabbix-6.0.32.tar.gz 45340574 BLAKE2B 7b6b7db112184691e9584a7017776c14023ee94f6228c21b9b2c4a1e6e822454e8c1847d51ba4ac71b984e40d4d80e64b77155c64ea2fe45f00c2b02dcc6a215 SHA512 f19fe303b5377fbdc78c63016e7af1395a07e96b1ae394afe73fc9c7669b6eccb599942e9aebe7e173d827bc3c48284c918e9867dded00f4f0da74cb60653221
 DIST zabbix-6.4.15-go-deps.tar.xz 33572368 BLAKE2B 2065ede50e7682b180387e08b2b2e9893fde4dd5316d2087aa7931a0e08b100558a47b49e9e5204f60ad9e0ce480dce9787e7a43d3841a67b9ea96db80fd1703 SHA512 347b51492147e203a2d7966fd8fe8f2b044fecd45948a767fcf4f79c96cebe8774643a1d0940a76103d25eecf852770a3a7c156d371a3de2cfef2121de5c076a
 DIST zabbix-6.4.15.tar.gz 46631895 BLAKE2B 3f9c23db6e8d0895b1fb5566b2cd9877d1e219c17ebea7dc5057621313c9b6f7ecd5cf1bedd3f759dfa4a429a87b50b06b97bb663d756817027c2f04ce3a625a SHA512 2fb032a02e3c507807dde140fdb17ad453ba199c724f3eb7e0e053d64df3c4f57bbc63b794eedfb3b5000f23bcabb5d6aa89039fa6f1a118c70f5cd44fd5ff02
 DIST zabbix-6.4.16-go-deps.tar.xz 33766756 BLAKE2B 24ce0f3febbdeaf16f54eb351861ba8adbd59e9a54ab898882eab80741f34b7f255d226f4a61df2f8b5c4ac9e36160fa14ce872ab0c55c811eb4f5529c5213db SHA512 925344d69da4cadf9ea4fd27a1f991c14a6b77d0c58f3884e4c4e0b29f5ab2427507d2cce3d81085feafc88b87e6c1c1885813cd97543af28b0c0cf4246b5988
@@ -35,6 +37,7 @@ DIST zabbix-7.0.0.tar.gz 47919968 BLAKE2B dc6736a1e433b5f0d742ec9e908b47a0094da7
 EBUILD zabbix-5.0.42-r1.ebuild 9819 BLAKE2B 7be0b02fa0842b250033f883c48f41963d6a0998054fa443ef26c910ffb77c1c1e40e54628fd90de8a8a24c20f45783d7570408a40e6eef727a1fd0ecaabfc3b SHA512 793e988e130abde40652ef3e9d594c46918332aa11da855b68196f23ffd206d237a21d031b21a836ab2ec19b1bdd860b21f8733631f9b2874b51787dc9b681d3
 EBUILD zabbix-6.0.30.ebuild 9934 BLAKE2B 82ced7b4693f61272cd933c319188ee41934b7be0494c1ff81312e1426f54180bd32dd267fd8073cd10f054b17dbb4204924f379c9b3b5a77eb82a8109002895 SHA512 fb1cebac60d5f86d5073f09ca85b48de0e42639eb622a49e8be4774edc4d6f25c7c4150c98611945eebff92a09dd5058329a7506386a178cc8e3d905ff2bf9cf
 EBUILD zabbix-6.0.31.ebuild 9935 BLAKE2B 709f063488c60e870ca41ae8e4fad65d56745d0cf0434ee63015b52508910f98c4eed268ca59c4a5cf0ec00591ebe74e1653f0ff0491c0b5421719a9a2945ad2 SHA512 fadde9d5c32db0c9d7ac9102542093b7168e1b4b2bd1f5ce4515f5186b3cf94de244cf5f54066308a25f6836dc5b3ed4c00c89c3a7528c5e937e3fc1c95d2662
+EBUILD zabbix-6.0.32.ebuild 9935 BLAKE2B 709f063488c60e870ca41ae8e4fad65d56745d0cf0434ee63015b52508910f98c4eed268ca59c4a5cf0ec00591ebe74e1653f0ff0491c0b5421719a9a2945ad2 SHA512 fadde9d5c32db0c9d7ac9102542093b7168e1b4b2bd1f5ce4515f5186b3cf94de244cf5f54066308a25f6836dc5b3ed4c00c89c3a7528c5e937e3fc1c95d2662
 EBUILD zabbix-6.4.15.ebuild 10086 BLAKE2B 4d6704bafa8c9370856f7980be82929fdc45906af1b66b4f51934abc88c635847728a5a8680e6db88cf38883dedbcd64e28f4b70eb2b82e7f58fdbd75e6edaaa SHA512 dc9a6c4d50b64a9298889f1acedeba11c4e3a5d4292d8e796d17643deb79c860fe30b927a760adf14b447537875a02e5c8e9532a8470430625a367e0e0043773
 EBUILD zabbix-6.4.16.ebuild 10087 BLAKE2B 3de8cedfa2081795d888bd0d922457bb35decbdd4fbae7b276e3f16208893405e9449b66ae6fc3a12b99eb00ed21b6add86b6f4229402d88db3ef75d3c207343 SHA512 5148088dca96b51e8fc2ab86d129dbb3d3d76f0b898aa53d43be1be2e5cb859bd435c31f538d6cd81c56b30ed65c02beae0824ac1b0a5d4f4d71f085abbecf93
 EBUILD zabbix-6.4.17.ebuild 10036 BLAKE2B c38223752b0afba1c5398215a842bec17ec8c96b0dbb5c60542578a71ad76d60a9b788b706577aa1915ed4a6569a33ca4c3f11619db141a1d9a0fd6f934c81a8 SHA512 e587a9af5800306ede457d139860ccbbe38214ed26007fbc60d2fe7cbfb288f562a225c04dca05655c1f3ccbf1c3f97b1347e86cd4a4e32269ef950f0a51a772
diff --git a/net-analyzer/zabbix/zabbix-6.0.32.ebuild b/net-analyzer/zabbix/zabbix-6.0.32.ebuild
new file mode 100644
index 000000000000..44884d9f45ff
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.0.32.ebuild
@@ -0,0 +1,389 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# To create the go modules tarball:
+#   cd src/go
+#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+#   tar -acf $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	agent2? ( !gnutls )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? (
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	selinux? ( sec-policy/selinux-zabbix )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
+)
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	local econf_args=(
+		--with-libpcre2
+		"$(use_enable agent)"
+		"$(use_enable agent2)"
+		"$(use_enable ipv6)"
+		"$(use_enable java)"
+		"$(use_enable proxy)"
+		"$(use_enable server)"
+		"$(use_enable static)"
+		"$(use_with curl libcurl)"
+		"$(use_with gnutls)"
+		"$(use_with ldap)"
+		"$(use_with libxml2)"
+		"$(use_with mysql)"
+		"$(use_with odbc unixodbc)"
+		"$(use_with openipmi openipmi)"
+		"$(use_with openssl)"
+		"$(use_with oracle)"
+		"$(use_with postgres postgresql)"
+		"$(use_with snmp net-snmp)"
+		"$(use_with sqlite sqlite3)"
+		"$(use_with ssh ssh2)"
+	)
+
+	econf ${econf_args[@]}
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	if use oracle; then
+		ewarn
+		ewarn "Support for Oracle database has been dropped from PHP"
+		ewarn "so to make the web frontend work, you need to install"
+		ewarn "PECL extension for Oracle database."
+		ewarn "For details see https://bugs.gentoo.org/928386"
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 1a1d29bca3d6..c3f709260f8b 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest
index a54985e9be0a..c8ff7131a611 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -15,5 +15,5 @@ EBUILD c-ares-1.29.0.ebuild 2470 BLAKE2B b53ca35edc43d7d4662086f742f0497ce9179df
 EBUILD c-ares-1.31.0.ebuild 2499 BLAKE2B a596da04d3c74feb78f2ebbbc82bd8b46668592931b0fa74de8f54e6a9fb093203aa5794d8d9761b2183e2bfdb2046abca927f3f3c2b4a468bf8746c771edafb SHA512 509712dbfdb6ce96e5fdafb73cc8b7d75c0f78b5d6383461230a4555545ad20708dc4c7636d1cacf141b99d3a79d77394a2680960b07bcf261c7b75a43922df1
 EBUILD c-ares-1.32.0.ebuild 2499 BLAKE2B a596da04d3c74feb78f2ebbbc82bd8b46668592931b0fa74de8f54e6a9fb093203aa5794d8d9761b2183e2bfdb2046abca927f3f3c2b4a468bf8746c771edafb SHA512 509712dbfdb6ce96e5fdafb73cc8b7d75c0f78b5d6383461230a4555545ad20708dc4c7636d1cacf141b99d3a79d77394a2680960b07bcf261c7b75a43922df1
 EBUILD c-ares-1.32.1.ebuild 2499 BLAKE2B a596da04d3c74feb78f2ebbbc82bd8b46668592931b0fa74de8f54e6a9fb093203aa5794d8d9761b2183e2bfdb2046abca927f3f3c2b4a468bf8746c771edafb SHA512 509712dbfdb6ce96e5fdafb73cc8b7d75c0f78b5d6383461230a4555545ad20708dc4c7636d1cacf141b99d3a79d77394a2680960b07bcf261c7b75a43922df1
-EBUILD c-ares-1.32.2.ebuild 2499 BLAKE2B a596da04d3c74feb78f2ebbbc82bd8b46668592931b0fa74de8f54e6a9fb093203aa5794d8d9761b2183e2bfdb2046abca927f3f3c2b4a468bf8746c771edafb SHA512 509712dbfdb6ce96e5fdafb73cc8b7d75c0f78b5d6383461230a4555545ad20708dc4c7636d1cacf141b99d3a79d77394a2680960b07bcf261c7b75a43922df1
+EBUILD c-ares-1.32.2.ebuild 2949 BLAKE2B db5b13f76c774636bfe55378262d08789fc9159843f37d05860d8d7ab67ac12c21d58fc46aa37ef5c5ea1ee4b36c861a5185e15a3e1bc55df19c32c459298e27 SHA512 6d76b4b4b2c0f71f25ade743563420a05b8cc4974123ecaebed77e098c6e5414a6583b2c8c51ee3dd30537733b47999b27814396e2c30ad563741b407c2afb13
 MISC metadata.xml 402 BLAKE2B ab03bca92ec4073f5a877993558552136f0ae673f98619aa1f30eb94b6d8f2103b1cf77d23a9f2b3d56ee33af23d626ee230e480a3e3e0bc174df879082466bd SHA512 e02d13db5d10b1aaaae5680247a6b47610dda28a13b7754d2b97f08a760ce732957c96fb6e88ce7fd2076bfec275e72bfbb3dec802940f0159122364ab21acda
diff --git a/net-dns/c-ares/c-ares-1.32.2.ebuild b/net-dns/c-ares/c-ares-1.32.2.ebuild
index d6ad901bd330..64e6e1c4f5b7 100644
--- a/net-dns/c-ares/c-ares-1.32.2.ebuild
+++ b/net-dns/c-ares/c-ares-1.32.2.ebuild
@@ -48,6 +48,20 @@ A__QA_CONFIG_IMPL_DECL_SKIP=(
 	ConvertInterfaceLuidToNameA
 )
 
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# warnings are default, but enable -std=c90 which doesn't define
+		# 'bool' which is a type used/assumed in macOS system headers
+		sed -i -e 's/-std=c90/& -Dbool=int/' configure{.ac,} || die
+		# sysconfig integration requires deep framework compatibility
+		# and is not really desired in Prefix
+		sed -i -e 's/__APPLE__/__DISABLED__/' \
+			src/lib/ares_sysconfig_mac.c || die
+	fi
+}
+
 multilib_src_configure() {
 	local myeconfargs=(
 		--enable-symbol-hiding
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index c187bce842f9..2dcb02657ab7 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 8447e8378be6..2776fda130dd 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1,13 +1,8 @@
-AUX lldpd-1.0.16-configure-clang16.patch 937 BLAKE2B c7e20f68879f8038f2ab30c924294982d7b7106a7475b97a99935c08b0132d4af649c0d9c549e55d8101b44a58cf3f8057567fafb12287c5e79272bc93adf084 SHA512 c018aaa198d27de630d04929d82c95789952ed8625e9c605b4c25ba7d2a103174fd1e34e56ddfc137d365129acf8d1bec917a18a5a71bbd189a27d357045af2f
 AUX lldpd-confd-1 142 BLAKE2B 38b3709d5cfcfdcfdf91ad4bd47902db779d035f825a7c875cbbfa55b35f085c04cc387599526465a0f12a0686d6550e7d3750b077f04993b55893cba2bbe362 SHA512 a2a4c85068a6b8b80c92fe56af7799a8b8cb2516e5a65b3ae4cb28f278e5acc72402da2a35f0c48a6048fd4a8536061142cafaa49a4bae8e52ca0a5d9ed38b4c
 AUX lldpd-initd-5 410 BLAKE2B d42853ecf3e70fbef8e29a13c390c71df737d2c2e23f1fd7e127a861d259c00410c44223177a3b08cf87465a024120b089f5794957f287479c65542610205303 SHA512 ec0157dff35cb2c370b81bff827c22d2f6c5fb0e139c1a82fabe7c6f259da4f50525a90acb5e26b4e39e0d41495b050ff9c4cf38726d3a8c4c4cea19cdb925d9
 AUX lldpd.conf 49 BLAKE2B e0d6b2a386bc2ac794df1de27061c58a193a3d141beac3cb0d893cc7437aa236fac9449d4890989f10618146b1da11795c637f29f2849c89af04b5156f6d9b1d SHA512 171cfb435405aae67b2b3917754b8ba1c1e62526c264692b14c8a27b3c08f29c903fe151e257626849f323e65d2d93dd1a246d15a1682bad645a08fd436fd7f0
 AUX lldpd.service 205 BLAKE2B 787e9d19def1d4d3cfe207e928b994d46b4fda5d2431ab147d24c4fa2b5b72426af5ee5ac57d40cfb2d1bc3ea6c1b253e1daaa341d998d66889bbc94c83d2438 SHA512 5b5aead569c842c2850fb0180b67beb87b4f0301e9e591d957089f5c659a30ef464fadd44a01f9b5476ff999368c3494c7dc7013db473d518721e5fab41cd054
 AUX tmpfilesd 32 BLAKE2B ad674d771fa90bde09e231ef21358928de2f3eccdbe0e9b3e2a0c0438a55899e858c98dc3d49714ee07cec4c921d15d955fd0c34f6dfaa4f3667bc4c0e9dfcde SHA512 58b11cc9241c4da25bf53da31b1ed64a489a7bd0998bc8a395659d77975607fd6ab035ffc830ddbfe2e5be244ff7c308900358452aee728fd56a4a7d4e80ffde
-DIST lldpd-1.0.16.tar.gz 1967182 BLAKE2B 3a359ec6539087ab1ffa5e1f83b90cc375b047b6e404df21067621bac9c9e5bab4b04209e9111d72fc2486046fb1d4b6744c093342c908f9a6475cd0b5a33328 SHA512 4abd25d1d7325f0a963518d916139f39b9250c37dfd918819019cabaafcdbedbfa03c78da80d36a09a0f4b1d79d4ee5e8aee1d10596bcd5710cd0c1181ba27c1
-DIST lldpd-1.0.17.tar.gz 1983689 BLAKE2B e74a1cdd965b26e9bad509fefb66bddfd74028a7d5122e561aed51eeb1b42c26497ce07169218133e4b99f12f4e0951065280c4ea8e47d54ecb6a8e697104106 SHA512 8f6d6ea6a32cc0f238158a2d1f08224224bca250cf61f80e4d8b633c0471e4ff9a17a7a7d7f313f10d557a256c7419f54cbb3b78903b7bba3619f9c5b6c114c8
 DIST lldpd-1.0.18.tar.gz 1988691 BLAKE2B 37ee156013ab9ceaee06d10025fe0b76e26ebafef7a8254866347db8e6b316805a49d0f9f2ba330bb5f863336e95983214c9c9fb453e2290e9be0c47808504c7 SHA512 c8734221767cd879c98ea3ee6fa80e1dce2f8470a97b0f757cfe7ef8fe2adaf878fdedcda896cf65e1af980634f2ab312588658fb85f89c6d5b6cc9d2da52045
-EBUILD lldpd-1.0.16-r2.ebuild 2535 BLAKE2B f85a6367ef5a81b3b0a2c9515a72ed1de6ffab09e84a579562b30976ba987d1d0fe2c88c40703fb2e40069cfdc2cdd40bcf751c6a1138a2ddbb36ae22d0072c2 SHA512 3c8c8c189066f911fdc2ca734e591a5e4a9fe2c05b351f13860212a786b6498b5ea0f46c3d8f61ec46ac2482d88314ac74166d60dd805d0742db1c029deadd1f
-EBUILD lldpd-1.0.17.ebuild 2507 BLAKE2B c9af8d9468a21c20b1656226e1953926149cf54638bfa8bd4217b6761141d629abe3f1554988c74aca927745e34038b4744726cbd7e088fb7fe3f350bf34a2dc SHA512 535206b76e30119b9cf07c9057edb3edfce61ba469eac037522d2d768f76ca57a0b4c3eeae03b8b3f9c59bd8f47d07047be51a490f358f40feb96eb8321fadf1
 EBUILD lldpd-1.0.18.ebuild 2507 BLAKE2B c9af8d9468a21c20b1656226e1953926149cf54638bfa8bd4217b6761141d629abe3f1554988c74aca927745e34038b4744726cbd7e088fb7fe3f350bf34a2dc SHA512 535206b76e30119b9cf07c9057edb3edfce61ba469eac037522d2d768f76ca57a0b4c3eeae03b8b3f9c59bd8f47d07047be51a490f358f40feb96eb8321fadf1
 MISC metadata.xml 2908 BLAKE2B 22dbdc0f603fd34be78e8a3c648d942f01c7a6095496ff81f1644522e3ea14feb12494795efd1bf843965114aea177a969bb0238eb9759b2722ccd2ecd59f391 SHA512 6e8e88e96ec02896d9cad4f7895a578cf06639e4113f96ecefed313f77a8a0a757d9cfeb080bf10ad3387963c5b78ea21c257145442c9b0716115cc2da44903c
diff --git a/net-misc/lldpd/files/lldpd-1.0.16-configure-clang16.patch b/net-misc/lldpd/files/lldpd-1.0.16-configure-clang16.patch
deleted file mode 100644
index bd03399e1b36..000000000000
--- a/net-misc/lldpd/files/lldpd-1.0.16-configure-clang16.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/900286
-https://github.com/lldpd/lldpd/commit/01aee0f3601c60e570aeb9040c036c83d053cc5a
-
-From 01aee0f3601c60e570aeb9040c036c83d053cc5a Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Thu, 8 Dec 2022 13:01:07 +0100
-Subject: [PATCH] m4/progname.m4: Include <stdio.h> for printf in
- lldp_CHECK___PROGNAME
-
-Otherwise the checks always fails with a compiler that does not
-support implict function declarations.
---- a/m4/progname.m4
-+++ b/m4/progname.m4
-@@ -4,7 +4,7 @@
- AC_DEFUN([lldp_CHECK___PROGNAME],[
-   AC_CACHE_CHECK([whether libc defines __progname], lldp_cv_check___progname, [
-     AC_LINK_IFELSE([AC_LANG_PROGRAM(
--                     [[]],
-+                     [[#include<stdio.h>]],
-                      [[ extern char *__progname; printf("%s", __progname); ]])],
-                      [ lldp_cv_check___progname="yes" ],
-                      [ lldp_cv_check___progname="no" ])
-
diff --git a/net-misc/lldpd/lldpd-1.0.16-r2.ebuild b/net-misc/lldpd/lldpd-1.0.16-r2.ebuild
deleted file mode 100644
index 996694fae22a..000000000000
--- a/net-misc/lldpd/lldpd-1.0.16-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd bash-completion-r1 autotools tmpfiles
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://lldpd.github.io/"
-SRC_URI="https://github.com/lldpd/lldpd/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/4.9.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
-	seccomp sonmp snmp static-libs test readline valgrind xml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-group/lldpd
-	acct-user/lldpd
-	dev-libs/libbsd
-	>=dev-libs/libevent-2.1.11:=
-	sys-libs/readline:0=
-	seccomp? ( sys-libs/libseccomp:= )
-	snmp? ( net-analyzer/net-snmp:=[extensible(+)] )
-	xml? ( dev-libs/libxml2:= )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )
-	valgrind? ( dev-debug/valgrind )
-"
-BDEPEND="virtual/pkgconfig
-	doc? (
-		graph? ( app-text/doxygen[dot,doc] )
-		!graph? ( app-text/doxygen )
-	)
-"
-
-REQUIRED_USE="
-	graph? ( doc )
-	test? ( snmp sanitizers )
-"
-
-# tests need root
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.16-configure-clang16.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
-
-	econf \
-		--without-embedded-libevent \
-		--with-privsep-user=${PN} \
-		--with-privsep-group=${PN} \
-		--with-privsep-chroot=/run/${PN} \
-		--with-lldpd-ctl-socket=/run/${PN}.socket \
-		--with-lldpd-pid-file=/run/${PN}.pid \
-		$(use_enable cdp) \
-		$(use_enable doc doxygen-doc) \
-		$(use_enable doc doxygen-man) \
-		$(use_enable doc doxygen-pdf) \
-		$(use_enable doc doxygen-html) \
-		$(use_enable dot1) \
-		$(use_enable dot3) \
-		$(use_enable edp) \
-		$(use_enable fdp) \
-		$(use_enable graph doxygen-dot) \
-		$(use_enable lldpmed) \
-		$(use_enable old-kernel oldies) \
-		$(use_enable sonmp) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		$(use_enable sanitizers) \
-		$(use_with seccomp) \
-		$(use_with snmp) \
-		$(use_with xml)
-}
-
-src_compile() {
-	emake
-	use doc && emake doxygen-doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die
-
-	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
-	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
-	newbashcomp src/client/completion/lldpcli lldpcli
-
-	use doc && dodoc -r doxygen/html
-
-	insinto /etc
-	doins "${FILESDIR}/lldpd.conf"
-	keepdir /etc/${PN}.d
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-}
diff --git a/net-misc/lldpd/lldpd-1.0.17.ebuild b/net-misc/lldpd/lldpd-1.0.17.ebuild
deleted file mode 100644
index 92848bf22b45..000000000000
--- a/net-misc/lldpd/lldpd-1.0.17.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd bash-completion-r1 autotools tmpfiles
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://lldpd.github.io/"
-SRC_URI="https://github.com/lldpd/lldpd/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/4.9.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
-	seccomp sonmp snmp static-libs test readline valgrind xml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-group/lldpd
-	acct-user/lldpd
-	dev-libs/libbsd
-	>=dev-libs/libevent-2.1.11:=
-	sys-libs/readline:0=
-	seccomp? ( sys-libs/libseccomp:= )
-	snmp? ( net-analyzer/net-snmp:=[extensible(+)] )
-	xml? ( dev-libs/libxml2:= )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )
-	valgrind? ( dev-debug/valgrind )
-"
-BDEPEND="virtual/pkgconfig
-	doc? (
-		graph? ( app-text/doxygen[dot,doc] )
-		!graph? ( app-text/doxygen )
-	)
-"
-
-REQUIRED_USE="
-	graph? ( doc )
-	test? ( snmp sanitizers )
-"
-
-# tests need root
-RESTRICT+=" test"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
-
-	econf \
-		--cache-file="${S}"/config.cache \
-		--without-embedded-libevent \
-		--with-privsep-user=${PN} \
-		--with-privsep-group=${PN} \
-		--with-privsep-chroot=/run/${PN} \
-		--with-lldpd-ctl-socket=/run/${PN}.socket \
-		--with-lldpd-pid-file=/run/${PN}.pid \
-		$(use_enable cdp) \
-		$(use_enable doc doxygen-doc) \
-		$(use_enable doc doxygen-man) \
-		$(use_enable doc doxygen-pdf) \
-		$(use_enable doc doxygen-html) \
-		$(use_enable dot1) \
-		$(use_enable dot3) \
-		$(use_enable edp) \
-		$(use_enable fdp) \
-		$(use_enable graph doxygen-dot) \
-		$(use_enable lldpmed) \
-		$(use_enable old-kernel oldies) \
-		$(use_enable sonmp) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		$(use_enable sanitizers) \
-		$(use_with seccomp) \
-		$(use_with snmp) \
-		$(use_with xml)
-}
-
-src_compile() {
-	emake
-	use doc && emake doxygen-doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die
-
-	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
-	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
-	newbashcomp src/client/completion/lldpcli lldpcli
-
-	use doc && dodoc -r doxygen/html
-
-	insinto /etc
-	doins "${FILESDIR}/lldpd.conf"
-	keepdir /etc/${PN}.d
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 584b77496041..0bc874747c14 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -2,6 +2,10 @@ AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 BLAKE2B 0
 AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90356c94bca15c45a4d66c5e3e0870a17cda6531a98adee4ec92ca886f9be298765f1afbca864786abb495e SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec
 AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a
 AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31ee645c7b15ed73914397e02266e1b72a32af1d9f8007ae81119e9223b3e41184aa58b9fa328ed72e0ebec91acd8 SHA512 f06e7e6b6ebeb991471cf6e71c44687210a115fd008505ebe01de1b52a059952c2b191789d217412ae30daaaecf8bc028c89daf536af793eac23cfcd62ba9ad4
+AUX init.d.NetworkManager-r3 1877 BLAKE2B 2d081b102c306fce8ce5db57e23f8a35334eb4fd7bad74c71a6e140016b8b64c532331d4646b35285597aaeb2e5d86ec28e2234f84b8fe8477524d61590145e5 SHA512 bc4173017bb43e2473a4300725c79eb6699e90a86ed0734268af6d5326ff44e1872d5abe920d422ad04210c0536a671614a0cf3c60ea8f443adf266b81b24034
+AUX networkmanager-1.48.4-fix-libsystemdless-build.patch 2475 BLAKE2B 3a754ae614f50d966ae859225defa0d9da12b6e22f84508b281b171c60446478f875b6b8eac34ebf53ac1527341f0edb6fa07f3923ec2893939fc352a9a499e3 SHA512 cf60ffd183edc42856b58d5c9072307aa7320c2fd65411041dca4f2b5f4fd3befd2e20bf48841dcb4697f3897219d8ace8eb536a0aa5ac310c0bad42cb7e34e5
 DIST NetworkManager-1.46.0.tar.xz 7033296 BLAKE2B db190876105d83c8d2ef7e827fa653ab14f9687ab18392600e04d20020d1dc797d3857c9fb05111fcafd18fe477b93947566100ea7113758703842cded71ed40 SHA512 27f234ad5b715ad0ae9d6adcdc91a4499b76fe78d3a5644aced8976588f0e82f2d03daec47589f1313b9802207c784ade67e921d4d2fa3c813cbf727558ad407
+DIST NetworkManager-1.48.4.tar.xz 6080980 BLAKE2B b5d216e064043e688ce8fc582e4bfae859a3e746fce2bc13f43a871a6886270c75b77cb1c73f4b9c89e89619683a8cdce698cfe1bd249bd68108f02b982dea04 SHA512 73c9399d528b78fe1393ad2015f641d9dcfe8a1134b65a65e051aa08eece6574f44a340d140d1de525000b365370bc2615da0e682b16c2da28dc597961e6410d
 EBUILD networkmanager-1.46.0-r1.ebuild 11867 BLAKE2B dbd3f555e674c097b05f2be625c14142a6e42d1f5ac48372fc7dd7374811aef280eba65d22cd0a974a6468c650081d4f9ee280d82ae9a06bcc7777d81a410f87 SHA512 ae2d6cebef5a44df0e262c230e94cbcb55b44c4933e660982d4387cd607add408f8d9068aa306e8d27982de4275066eb20ae5cd0a26b68484dfeb5ee280643da
+EBUILD networkmanager-1.48.4.ebuild 11958 BLAKE2B 96daaf6359748fdb028bc5e044669bbd634650da27006edabfd46dd2d8f3124df9bcce266f160b41bf6507de1392c2739a1d5ab47555d1790114d7630aa08bf7 SHA512 6adb9c3be7060a8e23f36a8ffeb2f5f071f554888551ee0afa3bfa7241abeea767f9c8ad57ff6402268a7b7e4a14dcd9d1cc30ca4bb8c84cc8c861ffd1447b71
 MISC metadata.xml 2360 BLAKE2B 0d95733c3909e35ef555ad32c44e706d48347e6b8a5f7f915831edf7a43376e973fa32c7704325818704b59082fbbb2e4610e075848f09ac7c818d8fdbb94830 SHA512 c4478c41989eca2b777bb59767ce7660d70b261f61bc42673bc61e7e4db528c45f921c384de5454e7f901f4cfdb3cf1303e183397671606ed43c1fdaa59762c7
diff --git a/net-misc/networkmanager/files/init.d.NetworkManager-r3 b/net-misc/networkmanager/files/init.d.NetworkManager-r3
new file mode 100644
index 000000000000..b2d240fc76ad
--- /dev/null
+++ b/net-misc/networkmanager/files/init.d.NetworkManager-r3
@@ -0,0 +1,62 @@
+#!/sbin/openrc-run
+# Copyright (c) 2008 Saleem Abdulrasool <compnerd@compnerd.org>
+# Copyright 2013-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="NetworkManager daemon. The service is marked as started only \
+when a network connection is established."
+
+depend() {
+	need dbus
+	use elogind
+	provide net
+}
+
+start_pre() {
+	checkpath -q -d -m 0755 /run/NetworkManager
+}
+
+start() {
+	# If we are re-called by a dispatcher event, we want to mark the service
+	# as started without starting the daemon again
+	yesno "${IN_BACKGROUND}" && return 0
+
+	[ -z "${INACTIVE_TIMEOUT}" ] && INACTIVE_TIMEOUT="1"
+
+	ebegin "Starting NetworkManager"
+	start-stop-daemon --start --quiet --pidfile /run/NetworkManager/NetworkManager.pid \
+		--exec /usr/sbin/NetworkManager -- --pid-file /run/NetworkManager/NetworkManager.pid
+	local _retval=$?
+	eend "${_retval}"
+	if [ "x${_retval}" = 'x0' ] && ! nm-online -t "${INACTIVE_TIMEOUT}"; then
+		einfo "Marking NetworkManager as inactive. It will automatically be marked"
+		einfo "as started after a network connection has been established."
+		mark_service_inactive
+	fi
+	return "${_retval}"
+}
+
+stop() {
+	# If we are re-called by a dispatcher event, we want to mark the service
+	# as inactive without stopping the daemon
+	if yesno "${IN_BACKGROUND}"; then
+		mark_service_inactive "${SVCNAME}"
+		return 0
+	fi
+
+	ebegin "Stopping NetworkManager"
+	local pidfile=/run/NetworkManager/NetworkManager.pid
+	if [ ! -e "${pidfile}" ] && [ -e /var/run/NetworkManager.pid ]; then
+		# Try stopping the pid file used by <0.9.7
+		pidfile=/var/run/NetworkManager.pid
+		start-stop-daemon --stop --quiet --pidfile "${pidfile}"
+		ret=$?
+		[ ${ret} = 0 ] && [ -e "${pidfile}" ] && rm "${pidfile}"
+		eend ${ret}
+	else
+		start-stop-daemon --stop --quiet --pidfile "${pidfile}"
+		eend $?
+	fi
+}
+
+# vim: set ft=gentoo-init-d ts=4 :
diff --git a/net-misc/networkmanager/files/networkmanager-1.48.4-fix-libsystemdless-build.patch b/net-misc/networkmanager/files/networkmanager-1.48.4-fix-libsystemdless-build.patch
new file mode 100644
index 000000000000..046d73adcb3e
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-1.48.4-fix-libsystemdless-build.patch
@@ -0,0 +1,62 @@
+https://bugs.gentoo.org/936223
+https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/1559
+https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1966
+
+From 70d1c34b94baadc3305745cf159ea55f312beacc Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 7 Jun 2024 14:03:15 -0700
+Subject: [PATCH] libnm-systemd-core: Disable sd_dhcp6_client_set_duid_uuid
+ function
+
+When building on musl systems ( with out systemd ), and using LLD linker
+from LLVM project we fail to link with undefined symbols.
+
+This symbol is in sd_id128.c but its disabled, so let disable the functions
+which need this function.
+
+| x86_64-yoe-linux-musl-ld.lld: error: undefined symbol: sd_id128_get_machine_app_specific
+| >>> referenced by sd-dhcp-duid.c:202 (/usr/src/debug/networkmanager/1.48.0/../NetworkManager-1.48.0/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c:202)
+| >>>               libnm-systemd-core.a.p/src_libsystemd-network_sd-dhcp-duid.c.o:(sd_dhcp_duid_set_uuid) in archive src/libnm-systemd-core/libnm-systemd-core.a
+| x86_64-yoe-linux-musl-clang: error: linker command failed with exit code 1 (use -v to see invocation)
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c
++++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c
+@@ -193,6 +193,7 @@ int sd_dhcp_duid_set_en(sd_dhcp_duid *duid) {
+         return 0;
+ }
+ 
++#if 0
+ int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) {
+         sd_id128_t machine_id;
+         int r;
+@@ -209,6 +210,7 @@ int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) {
+         duid->size = offsetof(struct duid, uuid.uuid) + sizeof(machine_id);
+         return 0;
+ }
++#endif
+ 
+ int dhcp_duid_to_string_internal(uint16_t type, const void *data, size_t data_size, char **ret) {
+         _cleanup_free_ char *p = NULL, *x = NULL;
+--- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c
++++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c
+@@ -244,6 +244,7 @@ int sd_dhcp6_client_set_duid_en(sd_dhcp6_client *client) {
+         return 0;
+ }
+ 
++#if 0
+ int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) {
+         int r;
+ 
+@@ -256,7 +257,7 @@ int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) {
+ 
+         return 0;
+ }
+-
++#endif
+ int sd_dhcp6_client_set_duid_raw(sd_dhcp6_client *client, uint16_t duid_type, const uint8_t *duid, size_t duid_len) {
+         int r;
+ 
+-- 
+GitLab
+
diff --git a/net-misc/networkmanager/networkmanager-1.48.4.ebuild b/net-misc/networkmanager/networkmanager-1.48.4.ebuild
new file mode 100644
index 000000000000..110098ab67bb
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.48.4.ebuild
@@ -0,0 +1,398 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME_ORG_MODULE="NetworkManager"
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit gnome.org linux-info meson-multilib flag-o-matic python-any-r1 \
+		readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	bluetooth? ( modemmanager )
+	connection-sharing? ( || ( iptables nftables ) )
+	gtk-doc? ( introspection )
+	iwd? ( wifi )
+	test? ( tools )
+	vala? ( introspection )
+	wext? ( wifi )
+	^^ ( gnutls nss )
+	?? ( elogind systemd )
+	?? ( dhclient dhcpcd )
+	?? ( syslog systemd )
+"
+
+COMMON_DEPEND="
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	elogind? ( >=sys-auth/elogind-219 )
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	net-libs/libndp
+	systemd? ( >=sys-apps/systemd-209:0= )
+	>=dev-libs/glib-2.42:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	selinux? (
+		sec-policy/selinux-networkmanager
+		sys-libs/libselinux
+	)
+	audit? ( sys-process/audit )
+	teamd? (
+		>=dev-libs/jansson-2.7:=
+		>=net-misc/libteam-1.9
+	)
+	policykit? ( >=sys-auth/polkit-0.106 )
+	nss? (
+		dev-libs/nspr[${MULTILIB_USEDEP}]
+		>=dev-libs/nss-3.11[${MULTILIB_USEDEP}]
+	)
+	gnutls? (
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}]
+	)
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6(+)] )
+	modemmanager? (
+		net-misc/mobile-broadband-provider-info
+		>=net-misc/modemmanager-0.7.991:0=
+	)
+	bluetooth? ( >=net-wireless/bluez-5:= )
+	ofono? ( net-misc/ofono )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
+	ovs? ( >=dev-libs/jansson-2.7:= )
+	resolvconf? ( virtual/resolvconf )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		iptables? ( net-firewall/iptables )
+		nftables? ( net-firewall/nftables )
+	)
+	psl? ( net-libs/libpsl )
+	concheck? ( net-misc/curl )
+	tools? (
+		>=dev-libs/newt-0.52.15
+		libedit? ( dev-libs/libedit )
+		!libedit? ( sys-libs/readline:= )
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/plugdev
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.18
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		>=dev-libs/jansson-2.7
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/networkmanager-1.48.4-fix-libsystemdless-build.patch
+)
+
+python_check_deps() {
+	if use introspection; then
+		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	default
+	use vala && vala_setup
+
+	sed -i \
+		-e 's#/usr/bin/sed#/bin/sed#' \
+		data/84-nm-drivers.rules \
+		|| die
+}
+
+meson_nm_program() {
+	usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
+}
+
+meson_nm_native_program() {
+	multilib_native_usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
+}
+
+multilib_src_configure() {
+	# Workaround for LLD 17 (bug #915819)
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+	# Build system requires -flto-partition=none support for LTO
+	tc-is-clang && filter-lto
+
+	local emesonargs=(
+		--localstatedir="${EPREFIX}/var"
+
+		-Dsystemdsystemunitdir=$(systemd_get_systemunitdir)
+		-Dsystem_ca_path=/etc/ssl/certs
+		-Dudev_dir=$(get_udevdir)
+		-Ddbus_conf_dir=/usr/share/dbus-1/system.d
+		-Dkernel_firmware_dir=/lib/firmware
+		-Diptables=/sbin/iptables
+		-Dnft=/sbin/nft
+		-Ddnsmasq=/usr/sbin/dnsmasq
+
+		-Ddist_version=${PVR}
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool policykit config_auth_polkit_default)
+		-Dmodify_system=true
+		-Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool systemd systemd_journal)
+		-Dhostname_persist=gentoo
+		-Dlibaudit=$(multilib_native_usex audit)
+
+		$(meson_native_use_bool wext)
+		$(meson_native_use_bool wifi)
+		$(meson_native_use_bool iwd)
+		$(meson_native_use_bool ppp)
+		-Dpppd=/usr/sbin/pppd
+		$(meson_native_use_bool modemmanager modem_manager)
+		$(meson_native_use_bool ofono)
+		$(meson_native_use_bool concheck)
+		$(meson_native_use_bool teamd teamdctl)
+		$(meson_native_use_bool ovs)
+		$(meson_native_use_bool tools nmcli)
+		$(meson_native_use_bool tools nmtui)
+		$(meson_native_use_bool tools nm_cloud_setup)
+		$(meson_native_use_bool bluetooth bluez5_dun)
+		# ebpf is problematic in at least v1.46.0, bug #926943
+		-Debpf=false
+
+		-Dconfig_wifi_backend_default=$(multilib_native_usex iwd iwd default)
+		-Dconfig_plugins_default=keyfile
+		-Difcfg_rh=false
+		-Difupdown=false
+		-Dconfig_migrate_ifcfg_rh_default=false
+
+		$(meson_nm_native_program resolvconf "" /sbin/resolvconf)
+		-Dnetconfig=no
+		-Dconfig_dns_rc_manager_default=auto
+
+		$(meson_nm_program dhclient "" /sbin/dhclient)
+		-Ddhcpcanon=no
+		$(meson_nm_program dhcpcd "" /sbin/dhcpcd)
+
+		$(meson_native_use_bool introspection)
+		$(meson_native_use_bool vala vapi)
+		$(meson_native_use_bool gtk-doc docs)
+		-Dtests=$(multilib_native_usex test)
+		$(meson_native_true firewalld_zone)
+		-Dmore_asserts=0
+		$(meson_use debug more_logging)
+		-Dvalgrind=no
+		-Dvalgrind_suppressions=
+		-Dld_gc=false
+		$(meson_native_use_bool psl libpsl)
+		-Dqt=false
+	)
+
+	if multilib_is_native_abi && use systemd; then
+		emesonargs+=( -Dsession_tracking_consolekit=false )
+		emesonargs+=( -Dsession_tracking=systemd )
+		emesonargs+=( -Dsuspend_resume=systemd )
+	elif multilib_is_native_abi && use elogind; then
+		emesonargs+=( -Dsession_tracking_consolekit=false )
+		emesonargs+=( -Dsession_tracking=elogind )
+		emesonargs+=( -Dsuspend_resume=elogind )
+	else
+		emesonargs+=( -Dsession_tracking_consolekit=false )
+		emesonargs+=( -Dsession_tracking=no )
+		emesonargs+=( -Dsuspend_resume=auto )
+	fi
+
+	if multilib_is_native_abi && use syslog; then
+		emesonargs+=( -Dconfig_logging_backend_default=syslog )
+	elif multilib_is_native_abi && use systemd; then
+		emesonargs+=( -Dconfig_logging_backend_default=journal )
+	else
+		emesonargs+=( -Dconfig_logging_backend_default=default )
+	fi
+
+	if multilib_is_native_abi && use dhclient; then
+		emesonargs+=( -Dconfig_dhcp_default=dhclient )
+	elif multilib_is_native_abi && use dhcpcd; then
+		emesonargs+=( -Dconfig_dhcp_default=dhcpcd )
+	else
+		emesonargs+=( -Dconfig_dhcp_default=internal )
+	fi
+
+	if use nss; then
+		emesonargs+=( -Dcrypto=nss )
+	else
+		emesonargs+=( -Dcrypto=gnutls )
+	fi
+
+	if use tools ; then
+		emesonargs+=( -Dreadline=$(usex libedit libedit libreadline) )
+	else
+		emesonargs+=( -Dreadline=none )
+	fi
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx meson_src_test
+	fi
+}
+
+multilib_src_install() {
+	meson_src_install
+	if ! multilib_is_native_abi; then
+		rm -r "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var} || die
+	fi
+}
+
+multilib_src_install_all() {
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r3" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}"/01-org.freedesktop.NetworkManager.settings.modify.system.rules
+
+	insinto /usr/lib/NetworkManager/conf.d #702476
+	doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf || die
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die
+	rmdir "${ED}"/usr/share/doc/NetworkManager || die
+
+	# Empty
+	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	udev_reload
+
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+
+	if use dhclient || use dhcpcd; then
+		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
+		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
+		ewarn "works for you, and you're happy with, the alternative USE flags can be"
+		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
+		ewarn "the main.dhcp configuration option to use one of them instead of internal."
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 8605312001ae..1fc30e887174 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index e3a9ac24f003..84e857678b03 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -8,8 +8,10 @@ DIST unifi-6.5.55.zip 157805689 BLAKE2B 09a7b69143478d0b81dd6f7be1746b1a35cd00ee
 DIST unifi-7.5.187.zip 172434106 BLAKE2B db54079f30c9f61989ceb70474ea68559189804876000534c2a0165a9ef2324f92d19e7b055eaa31cd77e7bd90db0c29aa9f20953dc17a5c54cc646a5c862990 SHA512 703e29273412c497a5bea74210e8c409c629b81fee2badd3f116bbb31a2ca82942ff0281303c0da57757a85e44f4457ba3730deaba0a1f4cc2adc1eb5ace3276
 DIST unifi-8.1.127.zip 165920812 BLAKE2B 553273139c7f8e38c04ce3823b4478e6e366ff3a139f22d692fb6f9c39284e6fbe12191bc4991e832d124e08893121018931c74c921a2186c849cb97016f8310 SHA512 45b9fe1d7d73b3544c2158062cc4f3fcea515a21ed31ed9be408995949cf4cc5f504a4b10934b400bbf309d38cf52ac72cdda87cde14217c360aa736071dffff
 DIST unifi-8.2.93.zip 168248927 BLAKE2B 2a120d5b63fe7be97e9fe6d4092293a26cac2eef55489d36fe23402c72a15315522a335015f8aa00cb6b61c372b7e28c978906ce21361e4d2dc4f4d21c960f2f SHA512 30d747256c5ae1403ca8a01f31e80723a1f14c328368f43cee2d867158a079e441c456405ae676fe3c5d6e8ae039af3cd24f1fd36b05660ad79cfe6fdb8d6acf
+DIST unifi-8.3.32.zip 169676863 BLAKE2B 337d095e4ea434d22af78c93de1a14ac8ad6800286505242498ad513d424230208cf0e38c5df5185ad6480ff83d695837e8915067aa6026dc3faea49d245571e SHA512 f8ae2712c40957d308cc713b7f75cd9682da0b34f773293428ef6e8931629e5d365c8af4bc5503f96d0b751f4d996a1b8492cc443dc9a043c40105f38d9995c6
 EBUILD unifi-6.5.55-r2.ebuild 2535 BLAKE2B 2cfa249e33c6e13be327dd416862070f087e7998ef7219b2903a397c1419676b854576d059396276c03767b90a196fda451826df401525aba19014a54fa919df SHA512 2c15b0ff1eded12d1f2b99891f274d71d6dd9527d23440f8aacef8d76ccf66f6063b2ee136b503bd7b200258c812f648661fc40e54e958fe338ff0730cd2e0e3
 EBUILD unifi-7.5.187.ebuild 2673 BLAKE2B 4248580218eb10fc588ec60fea1c41344a84be3d9e464b9b85572afe9b3bc4326a9a13cded7fc20ae6043ab11d9d5b942226b39da9688898c84a323cc43a1a09 SHA512 445193da23f62a5420205c9988baca93ff3bb4e86b4b215b98fe911365fd6a602e606dab3ed1c1e5bffe3f1dde6b2442711b7ef1b5a0e62312ecefb0d90c7404
 EBUILD unifi-8.1.127.ebuild 2665 BLAKE2B 3b1815c1286abc5d874eeec60d586b56d574f090ae33f8c67ac03d14cb3c6c92a1fcdbee00e90b8883b6c9eaf816294f236a47d6c907923139b0c919f7538752 SHA512 8742007a954a4f531e3d01ce9a75c8b649547ad10430be416204185d7db24b59590299ae98f70765d85c3533ba1dee4b5d96a29d9c9bd75fdcc89800cc2d6e0d
 EBUILD unifi-8.2.93.ebuild 2666 BLAKE2B 20c2e21008e49fd27c8f7ed0e26ccdf2127a9ec1b1783db350b228bf2df88112531f06d815145f4c5c79117846639f3ff0ed16a059295191992a051e383897bc SHA512 549582cffb9b5d8de9238babf45cdcdbebea04a26bf8b02d7311eb8b9603919c795837c53ff3097858ebc2bdb8122a3ef23ea8b9e6018cdaa4bb179843b1e414
+EBUILD unifi-8.3.32.ebuild 2666 BLAKE2B 20c2e21008e49fd27c8f7ed0e26ccdf2127a9ec1b1783db350b228bf2df88112531f06d815145f4c5c79117846639f3ff0ed16a059295191992a051e383897bc SHA512 549582cffb9b5d8de9238babf45cdcdbebea04a26bf8b02d7311eb8b9603919c795837c53ff3097858ebc2bdb8122a3ef23ea8b9e6018cdaa4bb179843b1e414
 MISC metadata.xml 706 BLAKE2B c089f7ad4712f8ad5ef71f8127686dd13a7d3ead5f31dff6c939b100c18920680d648c4d27af479dc14624b5365fc038998f478ae82222fc2f2d073bbb7b58cb SHA512 8866e9107a41456a238b21316a1b174167b4343a55bcca2964b05e44fcc2d157df113a7867496726fcdc0eabf3e244e14567e03b53e3e1df2b11a2d932fa761c
diff --git a/net-wireless/unifi/unifi-8.3.32.ebuild b/net-wireless/unifi/unifi-8.3.32.ebuild
new file mode 100644
index 000000000000..ed01ef5545ac
--- /dev/null
+++ b/net-wireless/unifi/unifi-8.3.32.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Set this var for any releases except stable
+# RC_SUFFIX="-"
+
+inherit java-pkg-2 readme.gentoo-r1 systemd
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+S="${WORKDIR}/UniFi"
+
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="-* ~amd64 ~arm64"
+IUSE="systemd system-mongodb"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	acct-group/unifi
+	acct-user/unifi
+	dev-db/mongodb
+	virtual/jre:17
+"
+
+BDEPEND="app-arch/unzip"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="
+	usr/lib/unifi/lib/native/Linux/aarch64/*.so
+	usr/lib/unifi/lib/native/Linux/x86_64/*.so
+"
+
+src_prepare() {
+	if [[ ${CHOST} != aarch64* ]]; then
+		rm -r lib/native/Linux/aarch64 || die
+	fi
+	if [[ ${CHOST} != x86_64* ]]; then
+		rm -r lib/native/Linux/x86_64 || die
+	fi
+
+	if [[ ${CHOST} == aarch64* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+	if [[ ${CHOST} == x86_64* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+
+	default
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	insinto /usr/lib/unifi
+	doins -r dl lib webapps
+	! use system-mongodb && doins -r bin
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	java-pkg_regjar "${D}"/usr/lib/unifi/lib/*.jar
+	java-pkg_dolauncher \
+		unifi \
+		--java_args '-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp \
+			-Djava.library.path= \
+			--add-opens java.base/java.lang=ALL-UNNAMED \
+			--add-opens java.base/java.time=ALL-UNNAMED \
+			--add-opens java.base/sun.security.util=ALL-UNNAMED \
+			--add-opens java.base/java.io=ALL-UNNAMED \
+			--add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED' \
+		--jar ace.jar \
+		--pwd '/usr/lib/unifi'
+
+	if use system-mongodb; then
+		systemd_newunit "${FILESDIR}"/unifi-mongodb.service unifi.service
+		newinitd "${FILESDIR}"/unifi-mongodb.initd unifi
+	else
+		systemd_newunit "${FILESDIR}"/unifi.service-r2 unifi.service
+		newinitd "${FILESDIR}"/unifi.initd-r2 unifi
+	fi
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 2ec8ab6a5dc4..03a1a7643e58 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index cd23f6c3efe3..189a7719549c 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Matt Turner <mattst88@gentoo.org> (2024-07-17)
+# We only want to support spirv-llvm-translator >= 17 on x86, which is a
+# dependency of mesa.
+>=media-libs/mesa-24.1 llvm_slot_15 llvm_slot_16
+>=dev-util/intel_clc-24.1 llvm_slot_15 llvm_slot_16
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-07-12)
 # Need as-yet-unkeyworded KF6-based counterparts (bug #934361)
 kde-apps/libkcddb kf6compat
diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask
index 962e14e44ebc..709360d865d4 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -1,10 +1,6 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (2024-05-28)
-# Fails to compile on any macOS, bug #932809, pending investigation
-=net-dns/c-ares-1.29.0
-
 # Benda Xu <heroxbd@gentoo.org> (2023-08-20)
 # Does not play well with linkers under macOS.
 # Undefined symbols for architecture x86_64:
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index bfee38af0e7e..bde3355e81cd 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -7196,6 +7196,7 @@ sci-geosciences/gpsd:sockets - export gpsd over unix sockets
 sci-geosciences/grass:geos - Use sci-libs/geos for v.buffer and adds extended options to the v.select module
 sci-geosciences/grass:las - Include support for LAS and LAZ encoded LiDAR files through sci-geosciences/liblas
 sci-geosciences/grass:pdal - Enable support for PDAL for point clouds via sci-libs/pdal
+sci-geosciences/grass:svm - Enable support for the Support Vector Machine library sci-libs/libsvm
 sci-geosciences/gshhs:data - Add earth data with sci-geosciences/gshhs-data
 sci-geosciences/liblas:gdal - Add support for the sci-libs/gdal geospatial raster library
 sci-geosciences/mapserver:apache - Enable mapserver to run under apache
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 9218b89030c1..c5e68a6f2cb4 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/qelectrotech/Manifest b/sci-electronics/qelectrotech/Manifest
index f3b80fa88a77..d733da4d6464 100644
--- a/sci-electronics/qelectrotech/Manifest
+++ b/sci-electronics/qelectrotech/Manifest
@@ -1,6 +1,6 @@
 AUX qelectrotech-0.80-fix-paths.patch 2412 BLAKE2B 66ec413d1f69f1621dc9776afa91f78b7fa0d17aece0ea0a122616503319ec98df653b166f81196b8d891f327e024a8e19207e3c9ef8567038d186b1440babb2 SHA512 828d0677b1d5a0ef4049d3fc7c9fbc47dfa810252c881a5f1c7e2841f9676710b69ce1a001cd6b44e28980445782affd948cd8626e43e37f020a2247ac31f3e5
 AUX qelectrotech-0.80-nomancompress.patch 436 BLAKE2B 9f8d5491c4076e8cf1fea993180cddaf7a1f6d34556a75131c2a4799bd54228ce5936145c30f0edf33626c90eb9fcb3134ccde0685ce6091706617ccd408dd99 SHA512 6de49a59a605bff6f9eb3d375f698adbb15deec77a3d2283ba53fe63e73ec23098baa6dc5530f0f2c9f92de8f400d66e71c6024d7929f1b2a343720afe54597a
 DIST qelectrotech-0.80.tar.gz 13835653 BLAKE2B 1efb22c9683c01c3cc449a3c1deef1990825b16f11dc15d93e2d7c0afd026486ee9772e0d8637efcb576fb20a8dc79235cdcabc94d293b9bf8c2028818645734 SHA512 732101130e77849ed0a56bcc7b519a1ca032e8f203951a50e1dd5fd488e96f1ab69ed0854176604f1947636b3d8fda1ac8aebbcfe01e63dfa263d8f646224f53
-EBUILD qelectrotech-0.80.ebuild 1425 BLAKE2B 0c5418cb9db83a15eb1ba742f1daa1641280233b19ec66cbe1e821017e3c1a389cef68a40924de38e5e85f0fd047c96cd52abe849d6f769a66d937e801042a44 SHA512 626c5382d945c354d7bb3bb746dda2df4c26fa079b161d851fa0cb42e927155dbe3af4260cc7324052959a4e236d046c1b317ed80d2428c67cd619aed34e0929
+EBUILD qelectrotech-0.80.ebuild 1432 BLAKE2B eaee4a81ad34830b443aa78512597c60ff48c73fed034082d199e551ec518e59a0a94e554219b292005cd7854f39508a4d4acfb5e5408d7d209c75229f7fc735 SHA512 28b4af00631d85aaad5d440edc84784ee0cc4cbae4242ae3ccae5bcc895f114fb47f44ff75993e73e4470f4174df808b5f648f8260b37db6d56c90490ba0889e
 EBUILD qelectrotech-9999.ebuild 1438 BLAKE2B b2af6cef1a0e55cf6393a220e163d0c13bbc7876cc15c97b57877cf8e3a6ad939b0db6121c2263eeb1bc2a01b0b1aced8b00df7e13a91b9c24238d878bf07355 SHA512 dad38c9c85f906a44ef4f17631ad0b19243e8dbd1cdea5934647d78babd5fcc2f57866ff856e78f4243ca18db135c8657afc9f8f1ee6f0b5622fd3ba005af1c8
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sci-electronics/qelectrotech/qelectrotech-0.80.ebuild b/sci-electronics/qelectrotech/qelectrotech-0.80.ebuild
index 2776c5129585..9f04e6f2ee33 100644
--- a/sci-electronics/qelectrotech/qelectrotech-0.80.ebuild
+++ b/sci-electronics/qelectrotech/qelectrotech-0.80.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	MY_P=qet-${PV/%0/.0}
 	SRC_URI="https://git.tuxfamily.org/qet/qet.git/snapshot/${MY_P}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 	S="${WORKDIR}"/${MY_P}
 fi
 
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 16770f7dbeb7..39c065e4a00e 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index 1487ee82b26d..fb424eb4b5e9 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-maps-45.5.tar.xz 3141872 BLAKE2B 3064a7ba2e96eaca7c5ad3a66874eb05bde1e675076003f3470ab5bb3bab04525e83e09a2239524247e1963af768d3e36512cbe3bc4dfe05dd951570b4488567 SHA512 cfcf616c331b8feebd79e31585a7f6f0aa05d3cf48713930635585a7d069996ec8c739b6bc1528b649d01c59307a39402d46a27c5e773d1e6b9b6a46362af35b
+DIST gnome-maps-46.11.tar.xz 3195792 BLAKE2B 6942a3801e738e981c7b462f23363c92e164c7cea55b650b9ef65fdc623e8bf279c11ef459af2ba91bc077288dff86d54fef9f3bfb1e00832bdffdc2f076f783 SHA512 c34f4535af6db93eca7ed7b7be0778bbfdae53aba1a32ec4882a84d82eeff6d82a365ef4ac18b3f55a829e044d680869827c5b897ddeb12b16a17d08f50f9ba1
 EBUILD gnome-maps-45.5.ebuild 1261 BLAKE2B 55ac07cd882f454a6d66038215b8f397a3e0ee346c3fa077328c70d504b003afed0dc96ed70b1c3ce00a163b6194e36a9b8aa1f5652e2f7b073a5138791af199 SHA512 3fd9dd29d285b0be51564310786a8c8d4663d46963f9c029588cfc72bfcdad51e68b3338e2448c4bfc954b812f5a0cd88d37df7df3dd87173d0dfbfae9220dea
+EBUILD gnome-maps-46.11.ebuild 1284 BLAKE2B fbd0324966c4f59ac41608e0df171eb21f38fe7b3a1ffeb8db228060e1944f2a6389e052338a6d7fa43d4dea6600c45d802fce3d4619cc41b779500abeb82aae SHA512 b268bc6b786a6aa0903f737085c919785c6a363e83b835ae0df68a871a2becfc2922c3e69e3c1edfa686933ab46f7e4b5f1c1e1a5767305d90f085ddda951ccb
 MISC metadata.xml 351 BLAKE2B 720552be0df0a6687b1c65211e4532bcdf2f76a1dbc2cfedf801876006bdef781b6e7a3caab9f61a6d5a17fcb73caaa194bb54d356fd903c6ba3d8849c1e8ae5 SHA512 cb4a26c3d4dbcdc7e6ba7cd7136cddf8633002eab39741c4fe5d033bd3154d17d002d475c8f5370aae652ba1b34f952ce1401ea8d71d22ad4ea4aae364fe9645
diff --git a/sci-geosciences/gnome-maps/gnome-maps-46.11.ebuild b/sci-geosciences/gnome-maps/gnome-maps-46.11.ebuild
new file mode 100644
index 000000000000..3ce5ef68e79e
--- /dev/null
+++ b/sci-geosciences/gnome-maps/gnome-maps-46.11.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="A map application for GNOME"
+HOMEPAGE="https://apps.gnome.org/Maps/"
+
+LICENSE="CC0-1.0 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Pure introspection dependencies found by grepping imports in ${S}
+RDEPEND="
+	>=dev-libs/glib-2.66.0:2
+	>=dev-libs/gjs-1.69.2
+	>=dev-libs/gobject-introspection-0.10.1:=
+	gui-libs/gtk:4[introspection]
+	>=app-misc/geoclue-0.12.99:2.0[introspection]
+	>=gui-libs/libadwaita-1.4_alpha:1[introspection]
+	>=dev-libs/libgweather-4.2.0:4=[introspection]
+	>=sci-geosciences/geocode-glib-3.15.2:2[introspection]
+	dev-libs/libportal:=[introspection]
+	>=media-libs/libshumate-1.2_alpha:1.0=[introspection]
+	dev-libs/libxml2:2
+	>=net-libs/rest-0.9.1:1.0[introspection]
+	>=gnome-base/librsvg-2.0
+	>=dev-libs/json-glib-1.0
+
+	app-crypt/libsecret[introspection]
+	media-libs/graphene[introspection]
+	net-libs/libsoup:3.0[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 00af61a15b9d..98ab4aa43f2e 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,7 +1,10 @@
 AUX grass-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a19bf2d4dc695de3a06bffc4df42eedca76977d552a26578238ffb10fb1b2b5242c4b6ffda83eaba7c41764 SHA512 36d8408f553ebfeb5cdc97c43ffae3ce6f77b713069d0d30d734748fb812800d4dafc76921d95fa8455c4ec4a55311703499f4aec97ad13b97b9549ab463cb3c
 DIST grass-8.3.1.tar.gz 68491177 BLAKE2B 58513c8c273b55831bca764c9e61e54b92c075ea2f4ff3c2f059ebcce98f25694ee03a25bef7a3e1c443165dd9493d3ce469233be3b65596dc28da166c12d174 SHA512 416a1b3eccb71f63576b36b963b7ddd8063ae73cefb8aa94431ade0ad74d699beb28635de8ba3a73cbd28304e5049dde2e75fb0f4c2747c81cb62c86b25c3793
 DIST grass-8.3.2.tar.gz 68662576 BLAKE2B 214bc6aea6904e88339e7f2d80f5dbc1c549928eed08ae0734789165af9e4cd7d8a882c67607c2670f2fdd4584615eac95c1ada9e5312abc6b59e0cb48124615 SHA512 6523e2c0eae183fddeaa015e63283febfbae4953e809ff41bcc4ab95aa1055162b08c65365f973124608ff7b01aa907a1a0ec96c9f31884c657f236e56c0eab0
+DIST grass-8.4.0RC1.tar.gz 70272599 BLAKE2B a292336e8eb657fadc4a54b6045b529df883fe4d49d784551d5e5d948e74a69f48a0508a862d9df47cd60172b20d97a4603a377afec2faceb98b35e8023d377c SHA512 c64576305476e60d8525418f973512dd71d2586ac7712f36560d9fe31a10bd1532b91351d3dc81bfd7c32073ddc1631a8e922d56e0e27159f59e37a1399e4c21
 EBUILD grass-8.3.1.ebuild 7070 BLAKE2B 24db4f7bc33845d9123e30a2dabd537097efd47066942322454de31b0b99c390524b408079c718a1e686b93d4d43f0426bff334c9e77cfd81222eff172b3656d SHA512 d68bdeb3add17d3f09809ec5c3c3c8e6d5701280a96181e57891db01bcddf188dc961eb8411bd674f6f6e7d7edd315e6c19a26b757bca6b3e60cb4ecb94147c5
+EBUILD grass-8.3.2-r1.ebuild 7071 BLAKE2B 8c7ef62b87d73b8c78afa658e1d171c3f4c28f6b4a0187f04457bee978185623b53d80eb26784c413ac98b8b46b1d5645bcf8b8518f31f6df8b865bb138ad853 SHA512 04d669e5f2a4a0c89be5dca40233010a20db30bfd709719525217ee4661953aed20573d27920af8e7a69e23830d2086bf3f694f4698fb653ffddf9e9a79f63c5
 EBUILD grass-8.3.2.ebuild 7070 BLAKE2B 24db4f7bc33845d9123e30a2dabd537097efd47066942322454de31b0b99c390524b408079c718a1e686b93d4d43f0426bff334c9e77cfd81222eff172b3656d SHA512 d68bdeb3add17d3f09809ec5c3c3c8e6d5701280a96181e57891db01bcddf188dc961eb8411bd674f6f6e7d7edd315e6c19a26b757bca6b3e60cb4ecb94147c5
-EBUILD grass-9999.ebuild 7011 BLAKE2B 9d9ae0535426d4d9c9e41e513e0427069bb859861871a305161d2df8c4c4abfbbdf6ec8c0db32000960b867b0edb5a0139785e202b5a786b753f4d51e60f8825 SHA512 3d4c5fa1b50269fee75b96856309daa66adce2c14ff9eb2feda8d09383312d3c00745b307247c52de0934c5f64c3448af5afaf465bf8fa3c58f9118ffbbe47ad
-MISC metadata.xml 1209 BLAKE2B d3b487c34e4282b9b60b3ff92eca7d609abca4950793877a17e4f48ac6363e84fea831ed0902206986b0abd601a5bdeaaf7db19db079b32b85641750e3f36442 SHA512 6a65b8141b2ad880368915bf2676e5fa5d42e6fcb710fa8e9b2098613ed6dac356302ac1635ad139d7ea560ec25d83f79d94833e53365f26063cd6ffee3debbc
+EBUILD grass-8.4.0_rc1.ebuild 7093 BLAKE2B 9f8603ec17ef8575cd0ca648e1ef4d6ccd7f37b24159f3eda08bc846e75c497043f384f6864d72f16b9a0ada95ce8911edd4596de6089b554746d7980e853abc SHA512 8c34fa9dacca31960eadb51f8898cb33f12cb1021d90c93aa9febadbf980abc1d41abf3aef88a6da4357a65080c2544e0d0bd4a80796054d4a2a9e3dec4e2679
+EBUILD grass-9999.ebuild 7033 BLAKE2B 0e43fd7b28dc213204bfaec6ba5a7692431402703c1f9243ae845660c1331fafea77a76261171dc9b7e170868b803fb016638139ca3a1f6be1d0c448ceafa3e9 SHA512 b26f8fcc1b828b58807fc0e24aaa60d2699fd0d1bc1d1484d9fe6b8c919a2774d05540c9fbd5f787724671fb30f9b0760b3f71d73f927ff73c5638615022d8a1
+MISC metadata.xml 1316 BLAKE2B 508c5fdf769d6563bb585ccd0a7072675f2725fa0702ca9e3f9b3963bd5379312dda36e37ba2fc58c7a85e03c035484abbe95a2e6651d51ea7fa97e013897355 SHA512 1f58db0827750b585c64c8321d47b4277a8472b1073f0216f06cf211aeea6ad53065634b4003269560282b22679b90d34b077d447f8ae07c16a4dbe905cf9b79
diff --git a/sci-geosciences/grass/grass-8.3.2-r1.ebuild b/sci-geosciences/grass/grass-8.3.2-r1.ebuild
new file mode 100644
index 000000000000..1d2d329b7e3c
--- /dev/null
+++ b/sci-geosciences/grass/grass-8.3.2-r1.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite"  # bug 572440
+
+inherit desktop flag-o-matic python-single-r1 toolchain-funcs xdg
+
+DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
+HOMEPAGE="https://grass.osgeo.org/"
+
+LICENSE="GPL-2"
+
+if [[ ${PV} =~ "9999" ]]; then
+	SLOT="0/8.3"
+else
+	SLOT="0/$(ver_cut 1-2 ${PV})"
+fi
+
+GVERSION=${SLOT#*/}
+MY_PM="${PN}${GVERSION}"
+MY_PM="${MY_PM/.}"
+
+if [[ ${PV} =~ "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
+else
+	MY_P="${P/_rc/RC}"
+	SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~ppc ~x86"
+	fi
+
+	S="${WORKDIR}/${MY_P}"
+fi
+
+IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	opengl? ( X )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=app-admin/eselect-1.2
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/ply[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	')
+	sci-libs/gdal:=
+	sys-libs/gdbm:=
+	sys-libs/ncurses:=
+	sci-libs/proj:=
+	sys-libs/zlib
+	media-libs/libglvnd
+	media-libs/glu
+	blas? (
+		virtual/cblas[eselect-ldso(+)]
+		virtual/blas[eselect-ldso(+)]
+	)
+	bzip2? ( app-arch/bzip2:= )
+	fftw? ( sci-libs/fftw:3.0= )
+	geos? ( sci-libs/geos:= )
+	lapack? ( virtual/lapack[eselect-ldso(+)] )
+	las? ( sci-geosciences/liblas )
+	mysql? ( dev-db/mysql-connector-c:= )
+	netcdf? ( sci-libs/netcdf:= )
+	odbc? ( dev-db/unixODBC )
+	opencl? ( virtual/opencl )
+	opengl? ( virtual/opengl )
+	pdal? ( >=sci-libs/pdal-2.0.0:= )
+	png? ( media-libs/libpng:= )
+	postgres? ( >=dev-db/postgresql-8.4:= )
+	readline? ( sys-libs/readline:= )
+	sqlite? ( dev-db/sqlite:3 )
+	tiff? ( media-libs/tiff:= )
+	truetype? ( media-libs/freetype:2 )
+	X? (
+		$(python_gen_cond_dep '
+			>=dev-python/matplotlib-1.2[wxwidgets,${PYTHON_USEDEP}]
+			dev-python/pillow[${PYTHON_USEDEP}]
+			>=dev-python/wxpython-4.1:4.0[${PYTHON_USEDEP}]
+		')
+		x11-libs/cairo[X]
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXt
+	)
+	zstd? ( app-arch/zstd:= )"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	app-alternatives/yacc
+	app-alternatives/lex
+	sys-devel/gettext
+	virtual/pkgconfig
+	X? ( dev-lang/swig )"
+
+PATCHES=(
+	# bug 746590
+	"${FILESDIR}/${PN}-flock.patch"
+)
+
+pkg_setup() {
+	if use lapack; then
+		local mylapack=$(eselect lapack show)
+		if [[ -z "${mylapack/.*reference.*/}" ]] && \
+			[[ -z "${mylapack/.*atlas.*/}" ]]; then
+			ewarn "You need to set lapack to atlas or reference. Do:"
+			ewarn "   eselect lapack set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+	fi
+
+	if use blas; then
+		local myblas=$(eselect blas show)
+		if [[ -z "${myblas/.*reference.*/}" ]] && \
+			[[ -z "${myblas/.*atlas.*/}" ]]; then
+			ewarn "You need to set blas to atlas or reference. Do:"
+			ewarn "   eselect blas set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+	fi
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Fix unversioned python calls
+	sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die
+	sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die
+
+	default
+
+	# When patching the build system, avoid running autoheader here. The file
+	# config.in.h is maintained manually upstream. Changes to it may lead to
+	# undefined behavior. See bug #866554.
+	# AT_NOEAUTOHEADER=1 eautoreconf
+
+	ebegin "Fixing python shebangs"
+	python_fix_shebang -q "${S}"
+	eend $?
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	shopt -s nullglob
+	local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/862579
+	# https://github.com/OSGeo/grass/issues/3506
+	#
+	# Do not trust it with LTO either
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	addwrite /dev/dri/renderD128
+
+	local myeconfargs=(
+		--enable-shared
+		--disable-w11
+		--without-opendwg
+		--with-regex
+		--with-gdal="${EPREFIX}"/usr/bin/gdal-config
+		--with-proj-includes="${EPREFIX}"/usr/include/proj
+		--with-proj-libs="${EPREFIX}"/usr/$(get_libdir)
+		--with-proj-share="${EPREFIX}"/usr/share/proj/
+		$(use_with cxx)
+		$(use_with tiff)
+		$(use_with png libpng "${EPREFIX}"/usr/bin/libpng-config)
+		$(use_with postgres)
+		$(use_with mysql)
+		$(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql)
+		$(use_with sqlite)
+		$(use_with opengl)
+		$(use_with odbc)
+		$(use_with fftw)
+		$(use_with blas)
+		$(use_with lapack)
+		$(use_with X cairo)
+		$(use_with truetype freetype)
+		$(use_with truetype freetype-includes "${EPREFIX}"/usr/include/freetype2)
+		$(use_with nls)
+		$(use_with readline)
+		$(use_with threads pthread)
+		$(use_with openmp)
+		$(use_with opencl)
+		$(use_with bzip2 bzlib)
+		$(use_with pdal pdal "${EPREFIX}"/usr/bin/pdal-config)
+		$(use_with las liblas "${EPREFIX}"/usr/bin/liblas-config)
+		$(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config)
+		$(use_with geos geos "${EPREFIX}"/usr/bin/geos-config)
+		$(use_with X x)
+		$(use_with zstd)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# we don't want to link against embedded mysql lib
+	emake CC="$(tc-getCC)" MYSQLDLIB=""
+}
+
+src_install() {
+	emake DESTDIR="${ED}" \
+		INST_DIR=/usr/$(get_libdir)/${MY_PM} \
+		prefix=/usr/ BINDIR=/usr/bin \
+		install
+
+	pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die
+
+	local HTML_DOCS=( docs/html/. )
+	einstalldocs
+
+	# translations
+	if use nls; then
+		insinto /usr/share/locale
+		doins -r locale/.
+	fi
+
+	popd >/dev/null || die
+
+	# link libraries in the ~standard~ place
+	local f file
+	for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do
+		file="${f##*/}"
+		dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file}
+	done
+
+	# link headers in the ~standard~ place
+	dodir /usr/include/
+	dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass
+
+	# set proper python interpreter
+	sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\
+os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
+		-i "${ED}"/usr/bin/grass || die
+
+	if use X; then
+		local GUI="--gui"
+		make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
+		doicon -s 48 gui/icons/${PN}-48x48.png
+	fi
+
+	# install .pc file so other apps know where to look for grass
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins grass.pc
+
+	# fix weird +x on tcl scripts
+	find "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die
+}
+
+pkg_postinst() {
+	use X && xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	use X && xdg_pkg_postrm
+}
diff --git a/sci-geosciences/grass/grass-8.4.0_rc1.ebuild b/sci-geosciences/grass/grass-8.4.0_rc1.ebuild
new file mode 100644
index 000000000000..bd3d41da509b
--- /dev/null
+++ b/sci-geosciences/grass/grass-8.4.0_rc1.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite"  # bug 572440
+
+inherit desktop flag-o-matic python-single-r1 toolchain-funcs xdg
+
+DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
+HOMEPAGE="https://grass.osgeo.org/"
+
+LICENSE="GPL-2"
+
+if [[ ${PV} =~ "9999" ]]; then
+	SLOT="0/8.4"
+else
+	SLOT="0/$(ver_cut 1-2 ${PV})"
+fi
+
+GVERSION=${SLOT#*/}
+MY_PM="${PN}${GVERSION}"
+MY_PM="${MY_PM/.}"
+
+if [[ ${PV} =~ "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
+else
+	MY_P="${P/_rc/RC}"
+	SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~ppc ~x86"
+	fi
+
+	S="${WORKDIR}/${MY_P}"
+fi
+
+IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite svm threads tiff truetype X zstd"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	opengl? ( X )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=app-admin/eselect-1.2
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/ply[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	')
+	sci-libs/gdal:=
+	sys-libs/gdbm:=
+	sys-libs/ncurses:=
+	sci-libs/proj:=
+	sys-libs/zlib
+	media-libs/libglvnd
+	media-libs/glu
+	blas? (
+		virtual/cblas[eselect-ldso(+)]
+		virtual/blas[eselect-ldso(+)]
+	)
+	bzip2? ( app-arch/bzip2:= )
+	fftw? ( sci-libs/fftw:3.0= )
+	geos? ( sci-libs/geos:= )
+	lapack? ( virtual/lapack[eselect-ldso(+)] )
+	las? ( sci-geosciences/liblas )
+	mysql? ( dev-db/mysql-connector-c:= )
+	netcdf? ( sci-libs/netcdf:= )
+	odbc? ( dev-db/unixODBC )
+	opencl? ( virtual/opencl )
+	opengl? ( virtual/opengl )
+	pdal? ( >=sci-libs/pdal-2.0.0:= )
+	png? ( media-libs/libpng:= )
+	postgres? ( >=dev-db/postgresql-8.4:= )
+	readline? ( sys-libs/readline:= )
+	sqlite? ( dev-db/sqlite:3 )
+	svm? ( sci-libs/libsvm:= )
+	tiff? ( media-libs/tiff:= )
+	truetype? ( media-libs/freetype:2 )
+	X? (
+		$(python_gen_cond_dep '
+			>=dev-python/matplotlib-1.2[wxwidgets,${PYTHON_USEDEP}]
+			dev-python/pillow[${PYTHON_USEDEP}]
+			>=dev-python/wxpython-4.1:4.0[${PYTHON_USEDEP}]
+		')
+		x11-libs/cairo[X]
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXt
+	)
+	zstd? ( app-arch/zstd:= )"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	app-alternatives/yacc
+	app-alternatives/lex
+	sys-devel/gettext
+	virtual/pkgconfig
+	X? ( dev-lang/swig )"
+
+PATCHES=(
+	# bug 746590
+	"${FILESDIR}/${PN}-flock.patch"
+)
+
+pkg_setup() {
+	if use lapack; then
+		local mylapack=$(eselect lapack show)
+		if [[ -z "${mylapack/.*reference.*/}" ]] && \
+			[[ -z "${mylapack/.*atlas.*/}" ]]; then
+			ewarn "You need to set lapack to atlas or reference. Do:"
+			ewarn "   eselect lapack set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+	fi
+
+	if use blas; then
+		local myblas=$(eselect blas show)
+		if [[ -z "${myblas/.*reference.*/}" ]] && \
+			[[ -z "${myblas/.*atlas.*/}" ]]; then
+			ewarn "You need to set blas to atlas or reference. Do:"
+			ewarn "   eselect blas set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+	fi
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Fix unversioned python calls
+	sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die
+	sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die
+
+	default
+
+	# When patching the build system, avoid running autoheader here. The file
+	# config.in.h is maintained manually upstream. Changes to it may lead to
+	# undefined behavior. See bug #866554.
+	# AT_NOEAUTOHEADER=1 eautoreconf
+
+	ebegin "Fixing python shebangs"
+	python_fix_shebang -q "${S}"
+	eend $?
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	shopt -s nullglob
+	local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/862579
+	# https://github.com/OSGeo/grass/issues/3506
+	#
+	# Do not trust it with LTO either
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	addwrite /dev/dri/renderD128
+
+	local myeconfargs=(
+		--enable-shared
+		--disable-w11
+		--without-opendwg
+		--with-regex
+		--with-gdal="${EPREFIX}"/usr/bin/gdal-config
+		--with-proj-includes="${EPREFIX}"/usr/include/proj
+		--with-proj-libs="${EPREFIX}"/usr/$(get_libdir)
+		--with-proj-share="${EPREFIX}"/usr/share/proj/
+		$(use_with cxx)
+		$(use_with tiff)
+		$(use_with png libpng "${EPREFIX}"/usr/bin/libpng-config)
+		$(use_with postgres)
+		$(use_with mysql)
+		$(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql)
+		$(use_with sqlite)
+		$(use_with opengl)
+		$(use_with odbc)
+		$(use_with fftw)
+		$(use_with blas)
+		$(use_with lapack)
+		$(use_with X cairo)
+		$(use_with truetype freetype)
+		$(use_with truetype freetype-includes "${EPREFIX}"/usr/include/freetype2)
+		$(use_with nls)
+		$(use_with readline)
+		$(use_with threads pthread)
+		$(use_with openmp)
+		$(use_with opencl)
+		$(use_with bzip2 bzlib)
+		$(use_with pdal pdal "${EPREFIX}"/usr/bin/pdal-config)
+		$(use_with las liblas "${EPREFIX}"/usr/bin/liblas-config)
+		$(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config)
+		$(use_with geos geos "${EPREFIX}"/usr/bin/geos-config)
+		$(use_with svm libsvm)
+		$(use_with X x)
+		$(use_with zstd)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# we don't want to link against embedded mysql lib
+	emake CC="$(tc-getCC)" MYSQLDLIB=""
+}
+
+src_install() {
+	emake DESTDIR="${ED}" \
+		INST_DIR=/usr/$(get_libdir)/${MY_PM} \
+		prefix=/usr/ BINDIR=/usr/bin \
+		install
+
+	pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die
+
+	local HTML_DOCS=( docs/html/. )
+	einstalldocs
+
+	# translations
+	if use nls; then
+		insinto /usr/share/locale
+		doins -r locale/.
+	fi
+
+	popd >/dev/null || die
+
+	# link libraries in the ~standard~ place
+	local f file
+	for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do
+		file="${f##*/}"
+		dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file}
+	done
+
+	# link headers in the ~standard~ place
+	dodir /usr/include/
+	dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass
+
+	# set proper python interpreter
+	sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\
+os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
+		-i "${ED}"/usr/bin/grass || die
+
+	if use X; then
+		local GUI="--gui"
+		make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
+		doicon -s 48 gui/icons/${PN}-48x48.png
+	fi
+
+	# install .pc file so other apps know where to look for grass
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins grass.pc
+
+	# fix weird +x on tcl scripts
+	find "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die
+}
+
+pkg_postinst() {
+	use X && xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	use X && xdg_pkg_postrm
+}
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index ed68dea0c142..0844f7c7bbff 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="sqlite"  # bug 572440
 
 inherit desktop flag-o-matic python-single-r1 toolchain-funcs xdg
@@ -36,7 +36,7 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd"
+IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite svm threads tiff truetype X zstd"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	opengl? ( X )"
@@ -48,7 +48,6 @@ RDEPEND="
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/ply[${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
 	')
 	sci-libs/gdal:=
 	sys-libs/gdbm:=
@@ -76,6 +75,7 @@ RDEPEND="
 	postgres? ( >=dev-db/postgresql-8.4:= )
 	readline? ( sys-libs/readline:= )
 	sqlite? ( dev-db/sqlite:3 )
+	svm? ( sci-libs/libsvm:= )
 	tiff? ( media-libs/tiff:= )
 	truetype? ( media-libs/freetype:2 )
 	X? (
@@ -202,6 +202,7 @@ src_configure() {
 		$(use_with las liblas "${EPREFIX}"/usr/bin/liblas-config)
 		$(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config)
 		$(use_with geos geos "${EPREFIX}"/usr/bin/geos-config)
+		$(use_with svm libsvm)
 		$(use_with X x)
 		$(use_with zstd)
 	)
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index 4dffe6c5b468..4b90fd219c90 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -22,6 +22,7 @@
 		<flag name="geos">Use <pkg>sci-libs/geos</pkg> for v.buffer and adds extended options to the v.select module</flag>
 		<flag name="las">Include support for LAS and LAZ encoded LiDAR files through <pkg>sci-geosciences/liblas</pkg></flag>
 		<flag name="pdal">Enable support for PDAL for point clouds via <pkg>sci-libs/pdal</pkg></flag>
+		<flag name="svm">Enable support for the Support Vector Machine library <pkg>sci-libs/libsvm</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">OSGeo/grass</remote-id>
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 9ba7c8e6f9a8..754b61eff03b 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/alt-ergo/Manifest b/sci-mathematics/alt-ergo/Manifest
index 8e0d20ae88d1..ddde0a292187 100644
--- a/sci-mathematics/alt-ergo/Manifest
+++ b/sci-mathematics/alt-ergo/Manifest
@@ -1,5 +1,4 @@
 AUX alt-ergo-2.4.3-dune.patch 136 BLAKE2B 7a8740fd14531be7dc595dd3dc3eef119c39943fbec98c9784f6a25dcc1947ebefacd079bcc95a48b07f8d94641ad66261e06efd18edc5cfe59783626b6bcf4d SHA512 016d80dc17436e469746822f62a1748a661a74e5ec2009a0f297a75a763b645cb95e564727ba03434602c494bf866f563adf558ff24f915d50fe198f9c9fe3c1
 DIST alt-ergo-2.4.3.tar.gz 2902450 BLAKE2B bb8931dc512e3745496c1801fe959ac0fc4758b03049462506689021508a4ea364f0aae8679c776d8154c9f86a09080801c9b822d23355c572a24bd8b0e38210 SHA512 88a26b138e41997516085dbbf279e1ce11d03c18c0464ba80d5403dc80ff0f8cb5cbd4ad1489a60ff2a3b9539f9c55e4274008b14eed47b6fd057ce0a94ef98f
-EBUILD alt-ergo-2.4.3-r1.ebuild 1387 BLAKE2B d98e1e278716f798a1851073c0e20b7173b4ad31ff61147119e19e69534047c65d4081c95a8ad471767fd4e4572efb6c94c1068db417c1c012f2c53f3ae2aa3f SHA512 31090c2d7f692790b52be86147b2865ad0dc887a57743cf7981f365ca98bffef185504cb0fdcd0411c3427ea510f236b4d2a741b0e3708fc4cd0557f3b2fcc58
-EBUILD alt-ergo-9999.ebuild 1382 BLAKE2B 9111155de5276042880f9ef4fa10f9374da2cd603e3ce4e999dc8a388507337e306e9cdf0bc76245b8a4aeebfc6057965f02e637071d9be1e0a3dab4167c2570 SHA512 471d147251a3edb665a72a09f15f33b60eabd67b68411a48cc3e9cfd0ca9e7d7fd6d0dfcc033060e5f4c69a66c100019e2be5946d493748b836861647d2dc6d1
+EBUILD alt-ergo-2.4.3-r2.ebuild 1380 BLAKE2B 306919a58792d8b5caf063b634e6e4f9f5897151cd753105a3cdbaea1b3efa23197787db0a1e79611964923e1b22ec4ffa1d0f973db48595f0be0a631e0e544e SHA512 8c587fc859d4a136ff09a38def1b4c3168e15b400089f6abc26e42766157f58ee01a5ec2229e1a8e90e62952364c049f3aa0ffe2c884a7e29fe0575f2c70ee3a
 MISC metadata.xml 957 BLAKE2B 2ac1b5428ee88fa81b3898a351b770b9a3b4e91ad049e7ab2b5b62e3ddcef635e2f19f801ef1c067b51c2f30f513b40a82e968a314be10e7a5ff795df24dd6d5 SHA512 bcbe312badeb5f3d6c243d620ec5744ac6bf3c23e6bc7b6327c7a1a72b42f2cc68cd4326b065a3fca3c2a9c7c1670e2a84ca1ca2e7bf423a274025010a6735f4
diff --git a/sci-mathematics/alt-ergo/alt-ergo-2.4.3-r1.ebuild b/sci-mathematics/alt-ergo/alt-ergo-2.4.3-r2.ebuild
index ecaf54aae4a4..22c57ef35837 100644
--- a/sci-mathematics/alt-ergo/alt-ergo-2.4.3-r1.ebuild
+++ b/sci-mathematics/alt-ergo/alt-ergo-2.4.3-r2.ebuild
@@ -27,13 +27,13 @@ RDEPEND="
 	>=dev-lang/ocaml-4.09.0:=[ocamlopt=]
 	>=sci-mathematics/psmt2-frontend-0.4.0:=
 
-	<dev-ml/zarith-1.14:=
+	<dev-ml/ocplib-simplex-0.5:=
 	>=dev-ml/cmdliner-1.1.0:=
 	>=dev-ml/menhir-20181006:=
-	>=dev-ml/ocplib-simplex-0.4:=
 	dev-ml/camlzip:=
 	dev-ml/num:=
 	dev-ml/stdlib-shims:=
+	dev-ml/zarith:=
 	gui? (
 		dev-ml/lablgtk:3
 		dev-ml/lablgtk-sourceview:3
diff --git a/sci-mathematics/alt-ergo/alt-ergo-9999.ebuild b/sci-mathematics/alt-ergo/alt-ergo-9999.ebuild
deleted file mode 100644
index 1ba42319bb6c..000000000000
--- a/sci-mathematics/alt-ergo/alt-ergo-9999.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Automatic theorem prover"
-HOMEPAGE="https://alt-ergo.ocamlpro.com
-	https://github.com/OCamlPro/alt-ergo/"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/OCamlPro/${PN}.git"
-else
-	SRC_URI="https://github.com/OCamlPro/${PN}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="CeCILL-C"
-SLOT="0/${PV}"
-IUSE="examples gui +ocamlopt"
-REQUIRED_USE="ocamlopt"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.09.0:=[ocamlopt=]
-	>=sci-mathematics/psmt2-frontend-0.4.0:=
-
-	>=dev-ml/cmdliner-1.1.0:=
-	>=dev-ml/menhir-20181006:=
-	>=dev-ml/ocplib-simplex-0.4:=
-	dev-ml/camlzip:=
-	dev-ml/num:=
-	dev-ml/stdlib-shims:=
-	dev-ml/zarith:=
-	gui? (
-		dev-ml/lablgtk:3
-		dev-ml/lablgtk-sourceview:3
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-ml/dune-build-info
-	dev-ml/dune-configurator
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.4.3-dune.patch )
-
-OCAML_SUBPACKAGES=(
-	alt-ergo-lib
-	alt-ergo-parsers
-	alt-ergo
-)
-
-src_prepare() {
-	default
-
-	if use gui ; then
-		OCAML_SUBPACKAGES+=( altgr-ergo )
-	fi
-}
-
-src_configure() {
-	sh ./configure --prefix /usr --libdir=/usr/$(get_libdir) || die
-}
-
-src_compile() {
-	dune-compile ${OCAML_SUBPACKAGES[@]}
-}
-
-src_install() {
-	dune-install ${OCAML_SUBPACKAGES[@]}
-
-	use examples && dodoc -r examples
-}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 7c5eb8b7d5ac..c7966f5e831b 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/pmix/Manifest b/sys-cluster/pmix/Manifest
index 938034c3cdb5..8ef8c99fecfe 100644
--- a/sys-cluster/pmix/Manifest
+++ b/sys-cluster/pmix/Manifest
@@ -1,7 +1,7 @@
 DIST pmix-4.2.2.tar.bz2 1639600 BLAKE2B b5109900e52750656200e7bdbdc39d870a01f5afc1fb622663dfb2c9647b1735c23ece906064b34923977c522fb5a89afc03d81b7d115b26337934ab5bfe7ce3 SHA512 b7cb1e2079d517b32fc5d99012a7c4b161c1509b3ac1e0ba7e4697f2fe0917455927d06c86ecab5f2fa6073e1f058e86260d2115b6f8cc968a43a5675439f28d
 DIST pmix-4.2.8.tar.bz2 4800886 BLAKE2B 49c6c74f2a3d4826ade004e2ca69f8adafb26232b8fe92f5e620e11f93bde6a84a3611e737818564a3a5fd6fb75a4819250fa038e55aab46cf0a29c3f04e9f7e SHA512 2bc78cda82af24a9d7db204684e1778e0db183acc425095a91d46e4253209cec06542d497d5502c502b946b0ed1517f3b34f532d1107ccac1a09f2f267f14089
-DIST pmix-5.0.2.tar.bz2 4875774 BLAKE2B b15c3d4829e5b763ad9ce0f7a8e78b1eeedea829524b55b21801a397329576b66b8807e41cb0735e5a02f2f3b93d2b9ed14cf237b582e1462178cc96200350af SHA512 f6c35a551dec7eeda887087a731ef447caa7754aeab42e6bf7f054f7ec5a376863b4836b8c4cc04a3e3630f93939dd9ba08dd9823172dfbcf2d68d9243cbcbdc
+DIST pmix-5.0.3.tar.bz2 5148447 BLAKE2B 3d885f1beb901a443d3a746eae2f4a7d28926e367c5054d3cbd7f971531390800899c0d3130c36b3880292f586bc2ff357c239c9ec6e26dbcd35a4535737f51c SHA512 d7930426f29d957440ebfbe6a8321d3146373b8880d61c57e719345dd467dbe3bd1495cb4942ac0c450da0e28cdd56aed71b32c0bdd6571a8abab85bf334596b
 EBUILD pmix-4.2.2-r1.ebuild 736 BLAKE2B e614cdf2231ea72840c50afd989665436fcdc2145b6ce98027794637e206c4e307728d76320060960e3deb19dc1962b06dae229a963e747e5275e623f4c814ae SHA512 445009dd71a34c48dfc8b1cb5e8a476bc9dbeec9f9e91c6eab19677e6b295dae8308c934a947c9376eeb453f5d587c65994028479fdabe870ea67c5033d93e0e
 EBUILD pmix-4.2.8.ebuild 1025 BLAKE2B 780321a335637a5b1208627e24ea5c01039ca92e3e2f4a8288cd148f2d21052f285c70dc14043279c07eaff7017b3b3891c7d452cf5e2a3095934390be69bfe3 SHA512 19d5b0e06f1aeb400dbfc44baf089b2d43cd04b9f489f3c9f22f6e1a8cc30647928885c175344562a3ef8529480e0d4dc11ca99728899a64962212cc748f0871
-EBUILD pmix-5.0.2.ebuild 1204 BLAKE2B 4f2d67633cb3d82f37fad4d417a530218a1138b280021690c878fba66a3fc49616e2379e0f64b9bed8d53a39fc2ad40cd1ca30fccd48949d01d76ad257a51308 SHA512 af6b7ea06df0816461b6b43a3765dc3c24f78199c75bb3d86b5479c29ab3d76a6cc010ea9d8be9d539ccd54cea216525b56fb3a9951a0d4e54b87dbd684ceb39
-MISC metadata.xml 471 BLAKE2B e20584b628032072a966c48d91b644e4329e8677f4d0b7fbe94d1eab2ce5f7c29294ad6effc8615308a965322846b1b3406b6e20f1e81c00efc6a18fd5533a70 SHA512 73d7109871bd2bdec5736612c595aa00bd3fd910779727f06a2b70a86461b6a549400a9d5f7547f0cbf902805aebbded507327e1893585673378c162b8b18630
+EBUILD pmix-5.0.3.ebuild 1204 BLAKE2B 4f2d67633cb3d82f37fad4d417a530218a1138b280021690c878fba66a3fc49616e2379e0f64b9bed8d53a39fc2ad40cd1ca30fccd48949d01d76ad257a51308 SHA512 af6b7ea06df0816461b6b43a3765dc3c24f78199c75bb3d86b5479c29ab3d76a6cc010ea9d8be9d539ccd54cea216525b56fb3a9951a0d4e54b87dbd684ceb39
+MISC metadata.xml 575 BLAKE2B 67bd77519d1b4461d8097c85d414427da4a550f3b6863684bcbd647c88ad1fbfe7957379c7adceca3938012a23de3e5967bd137159f65790319553e9ff00c63e SHA512 19d16bd6c08878ba2b61220dde3e86ce8db6e8d07f36e295f04679b5a6ef81dc8674d863e636f12382a96de5a9c0266a7dcb8ac24a669229ab44164b64c0b4c7
diff --git a/sys-cluster/pmix/metadata.xml b/sys-cluster/pmix/metadata.xml
index f8082fcc4911..a6a7fb92785f 100644
--- a/sys-cluster/pmix/metadata.xml
+++ b/sys-cluster/pmix/metadata.xml
@@ -10,6 +10,8 @@
 		<flag name="pmi">Build PMI1 and PMI2 interface</flag>
 	</use>
 	<upstream>
+		<doc>https://docs.openpmix.org</doc>
+		<bugs-to>https://github.com/openpmix/openpmix/issues</bugs-to>
 		<remote-id type="github">openpmix/openpmix</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-cluster/pmix/pmix-5.0.2.ebuild b/sys-cluster/pmix/pmix-5.0.3.ebuild
index 6cee90d4fa12..6cee90d4fa12 100644
--- a/sys-cluster/pmix/pmix-5.0.2.ebuild
+++ b/sys-cluster/pmix/pmix-5.0.3.ebuild
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index f99c3731d30c..b0da1eeafb1b 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
index 0098c1aa2459..46e993d54618 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -1,5 +1,5 @@
-AUX 35-intel-microcode-systemd.install 1274 BLAKE2B 302f5428a8ca7590ced274f3aef251fd7a00a922466d5599dde8f20c088a38438f9f1a4d4c99dd5752e5788927142bc3beff7c64ec6b93922af405a570dbe925 SHA512 cb1a2c8e31dd79550bcce854f7ddd4a955cac25caebc94b9fbe803274fc3e503055ea515420faaf750f39b341cddf9d8b436d05e5c1895a44d6d3c060a5549c2
-AUX 35-intel-microcode.install 1320 BLAKE2B 6b4209e1e622c50eefae1666d3192e2c5a2f1e558be25b0dabc8fda1d065495c398ef39162ce7c1e6729d30770fca47f1e58ba9c43e49570fbb0d3395998363d SHA512 2c36f6af1f26e5596c9cac120d82152ac84c7c32db722c8b50e43365f434562a7e4ae87a36bcc4c695793b6a4a4930811e8aa71e30fddfaff786c5ae4cd7b93b
+AUX 35-intel-microcode-systemd.install 1441 BLAKE2B d730b8297190a11952e136b6471f174b6a62f85365281cab21006e82a73ce16c233c16d2203dd42e0f381352f100337eade1758f73fb824cee3d2138befca8c6 SHA512 8b4bf710f4684c08554a72f92d61b240a2fab808299e13f6cdc124ede67c98923271c9c734e23943e1db29193b715391f266168b4bcb61d37b2a7de109581bb1
+AUX 35-intel-microcode.install 1442 BLAKE2B 6f4bf74d05986836d4da4b4bd6a4d82243fe29f5f658f5475ff8a44ad45a3afd68001f18912865d5429d45788ffdd72be08d7862c65d40d108446f7828f22df9 SHA512 7d6a53ab788c3225ecda78997dabee7bc132245890a86a9cd5fcdfa633dd665de3870ee5b608a26b15276a0014d53312a69baa00d6a8ac9c5d33e1688128da5a
 DIST intel-microcode-collection-20240312.tar.xz 13484040 BLAKE2B 947f78698211b372472629e7fdf076021db97f156d812ec2a84c5ab3d5ee374e04191f7881c956c261c6a6a5935b2c779b837879677ee98d44cf8c753a4393b8 SHA512 de577f232035a92ce563475edb4572c6fa40a0a2ee8e76b858de1ca42f905d366d107bf02e4968127ad6fe150baf37e11ed93191e40c1c5913ba34fe77184c00
 DIST intel-microcode-collection-20240514.tar.xz 13421016 BLAKE2B 83b7d213709bf8c1ea1b62456974cf6a2087470d9e2456ef3de93569007cfa8c94021a21a9f3f7b638ffe4b2ad0f516deda04a1c630e54f35709e92a113a7683 SHA512 4cc364b19355f133dae0178f7d10b50abcc0e6e7919e646cfc756c8ff8dc1d6d0819abae6f5cb7f659f0466ee31196625cf022bb994f500ab08e93238a66d104
 DIST intel-microcode-collection-20240526.tar.xz 14673584 BLAKE2B 262f667ac46e190994e86f547c98ac776c73b1576c208fa32df96a2dd60af6cda9bd0b0367ca68bb6b85fd19f75913e73069d0064eb2b4c560068c3da50618c8 SHA512 4227c68ba60aea940b851f10d1006ee42b45d55425eb143210adeb363468238329d4a2720d117f5bdaeb9857ae29a6952a3df22769f4436638a9080ded6793ba
@@ -9,5 +9,5 @@ DIST microcode-20240514.tar.gz 12870457 BLAKE2B 2a3a357ecf8d9f17fd20cd651386e568
 DIST microcode-20240531.tar.gz 12870497 BLAKE2B 6a2c5ee6b6f3543b28f3753b30812e360bad50776b4f81e32a832e2169f38c11f8d5108ce0a81ddcdf1ecf7557baf1fd62c053a365f39a33ded5fd5018580b1f SHA512 fb9d772491f279ebb691248e4a665da45c986ca7b4668ecf311c5fcb91a42400f7a5b35e8bfc31ceb1c9d598e753c817359900e3fa316d825f8ecec21ec63cfe
 EBUILD intel-microcode-20240312_p20240312.ebuild 11701 BLAKE2B 311c85bb20393d56faf922bab93eb56ac9d4fcf61f25e00bb38e0610c74d6b90ac6d3f858be17bf4b701d66e95d637a57bf7e162284c799c347e4f1e58b9d1f9 SHA512 d6098dc85df3e8fe6e0538b95c24585d8c087e73f34b709c1f011492a50d91beb5bd627fa3d075a3d035e2817ac955f168b8da6f19675cf013ef92e2bf8bed59
 EBUILD intel-microcode-20240514_p20240514.ebuild 11701 BLAKE2B 311c85bb20393d56faf922bab93eb56ac9d4fcf61f25e00bb38e0610c74d6b90ac6d3f858be17bf4b701d66e95d637a57bf7e162284c799c347e4f1e58b9d1f9 SHA512 d6098dc85df3e8fe6e0538b95c24585d8c087e73f34b709c1f011492a50d91beb5bd627fa3d075a3d035e2817ac955f168b8da6f19675cf013ef92e2bf8bed59
-EBUILD intel-microcode-20240531_p20240526-r1.ebuild 12041 BLAKE2B dfc50a9dcd8a1e334e206107d2d6d0c6c2f075fa24daa98ade7777274c678c5d3c8a61c31e12aefcd53e6d01bbc233868a1955b95a641572aa50fb024b8733ab SHA512 3fe2d5ba1fd6911600f4479de6281cdfa061a1f9003c64270873a5373d2c58d132f01b43e4c7fced562e833fe90f09274e840bf44afd83a4f232d9f4908601a8
+EBUILD intel-microcode-20240531_p20240526-r2.ebuild 12102 BLAKE2B bb133f39838ca995b90019bae4d3b67ab8fc5e8f106ddeb0455448e1bb91d35bacbe0fbfcabd72e550f67b3ae23dc88ce07e09fbc6c4dc10483d23aa074cd3d3 SHA512 944574fe929fc18dd06dc63f03da44e54838fbed17f96ff85e35036c9b5249c5aa180818fd0f0433cc2614c18d8ff39a7878d41ceb9a9b13e9777280a690cf61
 MISC metadata.xml 853 BLAKE2B b9103bc6c00cd36211b33060a28dc72159fa1309644f6dc8005c415c8eb435217f1e39ba70a289bf9f93a3edac7e73f2227bfe711e745f8743ae455e2d1caa4a SHA512 c425c341725210af9693ed50ae9b9f91cd4c44539f1abe5fff9f59c3441eed39aee6746c881f7a812aec1bab1a8c4974e111980211cf4cfb55e1bdb12e394631
diff --git a/sys-firmware/intel-microcode/files/35-intel-microcode-systemd.install b/sys-firmware/intel-microcode/files/35-intel-microcode-systemd.install
index 7ad7b8c49e83..58593a675b37 100644
--- a/sys-firmware/intel-microcode/files/35-intel-microcode-systemd.install
+++ b/sys-firmware/intel-microcode/files/35-intel-microcode-systemd.install
@@ -35,13 +35,18 @@ opts=(
 	--no-downgrade
 )
 
-if [[ ${KERNEL_INSTALL_VERBOSE} == 1 ]]; then
-	echo "Generating Intel CPU Microcode early initramfs image..."
-	opts+=(
-		--list-all
-		--list
-	)
+if [[ -d /lib/firmware/intel-ucode ]]; then
+	if [[ ${KERNEL_INSTALL_VERBOSE} == 1 ]]; then
+		echo "Generating Intel CPU Microcode early initramfs image..."
+		opts+=(
+			--list-all
+			--list
+		)
+	fi
+
+	iucode_tool /lib/firmware/intel-ucode "${opts[@]}" ||
+		{ echo "iucode_tool failed" && exit 1; }
+else
+	[[ ${KERNEL_INSTALL_VERBOSE} == 1 ]] && echo \
+		"No Intel CPU Microcode installed, nothing to do here."
 fi
-
-iucode_tool /lib/firmware/intel-ucode "${opts[@]}" ||
-	{ echo "iucode_tool failed" && exit 1; }
diff --git a/sys-firmware/intel-microcode/files/35-intel-microcode.install b/sys-firmware/intel-microcode/files/35-intel-microcode.install
index d4e9ef19d56b..513b3a84d08e 100644
--- a/sys-firmware/intel-microcode/files/35-intel-microcode.install
+++ b/sys-firmware/intel-microcode/files/35-intel-microcode.install
@@ -41,9 +41,13 @@ main() {
 		--list
 	)
 
-	einfo "Generating Intel CPU Microcode early initramfs image..."
-	iucode_tool /lib/firmware/intel-ucode "${opts[@]}" ||
-		die "iucode_tool failed"
+	if [[ -d /lib/firmware/intel-ucode ]]; then
+		einfo "Generating Intel CPU Microcode early initramfs image..."
+		iucode_tool /lib/firmware/intel-ucode "${opts[@]}" ||
+			die "iucode_tool failed"
+	else
+		einfo "No Intel CPU Microcode installed, nothing to do here."
+	fi
 }
 
 main
diff --git a/sys-firmware/intel-microcode/intel-microcode-20240531_p20240526-r1.ebuild b/sys-firmware/intel-microcode/intel-microcode-20240531_p20240526-r2.ebuild
index 55f66f30803d..947e22ff9bc2 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20240531_p20240526-r1.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20240531_p20240526-r2.ebuild
@@ -45,16 +45,24 @@ LICENSE="intel-ucode"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="dist-kernel hostonly +initramfs +split-ucode vanilla"
-REQUIRED_USE="!dist-kernel? ( || ( initramfs split-ucode ) )"
+REQUIRED_USE="
+	|| ( initramfs split-ucode )
+	dist-kernel? ( split-ucode )
+"
 RESTRICT="binchecks strip"
 
 BDEPEND=">=sys-apps/iucode_tool-2.3"
 # !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
 RDEPEND="
-	dist-kernel? ( virtual/dist-kernel )
-	hostonly? ( sys-apps/iucode_tool )
+	dist-kernel? (
+		virtual/dist-kernel
+		initramfs? (
+			sys-apps/iucode_tool
+		)
+	)
 "
 IDEPEND="
+	hostonly? ( sys-apps/iucode_tool )
 	dist-kernel? (
 		initramfs? ( sys-kernel/installkernel )
 	)
@@ -84,10 +92,10 @@ MICROCODE_SIGNATURES_DEFAULT=""
 
 pkg_pretend() {
 	if use initramfs; then
-		if [[ -z ${ROOT} ]] && use dist-kernel; then
+		if use dist-kernel; then
 			# Check, but don't die because we can fix the problem and then
 			# emerge --config ... to re-run installation.
-			nonfatal mount-boot_check_status
+			[[ -z ${ROOT} ]] && nonfatal mount-boot_check_status
 		else
 			mount-boot_pkg_pretend
 		fi
@@ -302,8 +310,8 @@ pkg_postrm() {
 
 pkg_postinst() {
 	if use initramfs; then
-		if [[ -z ${ROOT} ]] && use dist-kernel; then
-			dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+		if use dist-kernel; then
+			[[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
 		else
 			# Don't forget to umount /boot if it was previously mounted by us.
 			mount-boot_pkg_postinst
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index e1f3a6018807..a5e8edfd4b59 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/bcachefs-tools/Manifest b/sys-fs/bcachefs-tools/Manifest
index 880d87481f75..5e7a594de8fe 100644
--- a/sys-fs/bcachefs-tools/Manifest
+++ b/sys-fs/bcachefs-tools/Manifest
@@ -19,6 +19,7 @@ DIST bcachefs-tools-1.4.1.tar.gz 1069244 BLAKE2B 7be0a343758a221a39dad5eca1c11c7
 DIST bcachefs-tools-1.6.4.tar.gz 1083811 BLAKE2B 656b1545ccf41dd35e3e6f656a9b5280fe0b5fa43a0ea86243c6693033d986b091fdd3d79ab2ff5c1c9402bce6f4ee33f49e070f6aebd5bba355df7a82d8fc21 SHA512 3e73ee15673eac771393859132146f1c23f4250f68bf8753b5214e88e854959c56efabdaeff4a8ad883287bd289abe08c5c37f6ef7220b984fa679a90c578e57
 DIST bcachefs-tools-1.7.0.tar.gz 1103425 BLAKE2B 952310999035465a4e8621e8e3ef65e5a3ba50d40a0ca76a3ca8b7265bab2f33c40981d2ca83ef3ecc70a5da9cff0d002d2f9676aa6355d1717a0dad968828af SHA512 5f7934997c0cd6b893c67a87e9cb5060cdd37857d6761356bdb1c96572b67ea3a2c03c43fcbd8beb01b0cf9c30da3297d082ef40bb312f5ca40c85faa46cdd3a
 DIST bcachefs-tools-1.9.1.tar.gz 1125178 BLAKE2B b54b86d681f0694fc39a13c6229a2d79dd8e1fe7dc269f3a8e6ba38b5d972b05aa7ba199114a3935ff95f3b51711e515f124ca247aa1a390f6e2bd771d55e5ee SHA512 93bc85bb7b15d08eadc60a2af1b9c8b0b561400bcd4567c088af8f426d11ccc4321482455e89a10cd544b421da3a953cca9008eb936128124f9bd2e6818c484e
+DIST bcachefs-tools-1.9.4.tar.gz 1132203 BLAKE2B 447881b52dcaa3990a4c233523bf8c2b3faf4755f3a0fad315ca17fa900e2192b9a2168f22a3ac8c59ad2756999f8a6792b732a527510361044b541fec6ce26b SHA512 8a6a2896620c4e1aa3abd26a2e59087d417b5d546ee6dc1130a59e06c8e8561e8de29edeb1d5dd3c5223be8338a8b4265ad3e753c830f475413ed83a0d968dd8
 DIST bindgen-0.69.4.crate 221092 BLAKE2B 69ed55a5827bfe850f589e39bc6e2f4445e20363002c765c5475007b75e4d81cac3d9df358505c63bd6a48300ae4988507abf78dd734bb98b33525bf9212237b SHA512 99530060708690f2ce0b87b97c9ce2998ee968df193137f3c9bf4fa66836814e2ae74c7e0b3057dcff1da7d2c4ea38157e21143c5117be35e94b878c0a427a34
 DIST bitfield-0.14.0.crate 16776 BLAKE2B abca546581d912133e7344f049d93b8d793de323eba7780fab162c53a244b845582ec2bd14b529b9491c363c2da6228b7de58407afc554cc718a9df8370f5535 SHA512 703d534f0684b19af68a18048ecff37367ccbe5a52a3e8d987f2420b980e4a20da9640019ca610b1a73841cbe45dbf4d6a1cfb10cf0e7d09f53199b1fcd141fe
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
@@ -45,6 +46,7 @@ DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645
 DIST colored-2.0.4.crate 23654 BLAKE2B 41303ea33785c060415a955383ba2f22ac8e4afe9f1345b9f41dea9817348298f8715c4bfdc60cf4960315c3a7dfabf148f2fdf62e0e0a5ca77e34c57dfca307 SHA512 38e664d23546d77c81da6f5eca6ee8113d6ce20107bf7325255de2c59d532e662ee1f751420bba8ccbbe468b8cb13f743050e4145d0e1f1e37087a1f3a65ada0
 DIST colored-2.1.0.crate 23348 BLAKE2B e2778d83b28571501adb4e9ec3fa95d684faf5730f093f6e608ec631e58b883d2b9f17ed7e2c1612da285a58251f479a365aa90fa7be24a2adbb69e426e0fc89 SHA512 fa70f18fb29f6870a727d8243808c96e9497f8302f5f2b1748f9d9e396031e9c53a025b8edc9c8c9a0f8cfca12e5da73250a71e382b3074e9415b85bc004769e
 DIST either-1.9.0.crate 16660 BLAKE2B ad61038bfacb16f678fff5dd9ccf8f345e1bef18bd7aa0aa9c99d44abf8428939362f32fc8dbb1b60ac56016e0096201071d0bf8c0431b660605d0dfa97da466 SHA512 4978d50842386f51e31a47ad037d5e491106a668bc701bb833e6ec3998afe3ebd80efddc47756b2f300f534b39b26fc01386dc878d3b02cc8c1fec6a474c2177
+DIST env_logger-0.10.2.crate 36402 BLAKE2B 34ef02d0f53fea474e7284fd7021ed3b44b11be2c0d0c9a66ace8792bac74d1a6b43997e0e7d043ef89e14903f6ab6d42c169bbb164f05cfe4e1688611639edb SHA512 c44131efb703eed984d8f4edcf18c77ef14036edf013e8bf445703c74a4386e4c3f4b55a272490da1ccb47a692ccde4670772c74d35c5723601c870416144b69
 DIST errno-0.2.8.crate 9276 BLAKE2B b73738deb47d1f76ec91ffd15558126d32312647b82677290725669edb01b8f34a503172fad6518ebf0ffb1633ef0afaf0750982b9384a9fb87833d31721c9a8 SHA512 1f513743224cd9a9b7e4caaf33dab075a4a79efa90c9f46c9edfb0c8600daccd3ad2677ba2116621e19fcf8be456954da5d611cbcea4b6f1410f7731828b50d1
 DIST errno-0.3.7.crate 10712 BLAKE2B 1ac3a3084673791fc31e228ea3f49d334eea106f1bb6de3f9548882167d8982153e0d9cd9dbb4bde68fb9a12ea8eced99a4a128c507fe8a6ca90caf849cda1dd SHA512 ba4cd3919fefff84bd5ae473392ecdbaaec52ccaa9d1d93ae06ea5962523054d0fa1c5866787e36114a00d449a60df811a110f89c923a6acf7430d3668c2f54e
 DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d
@@ -57,8 +59,10 @@ DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5
 DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST hermit-abi-0.3.3.crate 14253 BLAKE2B 9ed8b40a1cc894addcba2a45562d74359ba55156e2c3a547afce139324b1345df2f158f58978ccd7d343fac5e5d2cda86e2e0a9dafc77af36d4cd8aa0a6d4c03 SHA512 eb162d085e8e0db72571aca925fdb6094d1e5d091766dd62d6a116957459bfadc8d51f1acc67f4da3cf6a8802c0ff445f3ad2516c1df8fcdca0b751632e150a1
+DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045
 DIST home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17a799db0f49a17fee8560df53f616ae22cd16020ae2a89ce7c6ec22e5e2c0d513405bc2859a6e3ec61f9 SHA512 3f1f7b619f1a47694cda92321a11d66ebbb2dc0b0c33446a7a4b886f547ee88231b61c038de04bb82acd50e617f19b5085893b8401206d32cd54502033e04bf1
 DIST io-lifetimes-1.0.11.crate 37346 BLAKE2B 7f278b7378a8569d3552c9b6d4be06d7908e05d77cdb964267f0b621ec4975a42fb6e48fc030a75ad5865681adf32ff747943ac559ab4ad73331a6611a1b10c6 SHA512 30c6e5ce6f5beabe0d7bee4f4522884d1316cf7d9b8d093ba0f952995997be3d0f10e1e77b9c20b7fe2b65429de0d2ec89bb35e939455795205206a3154ed544
+DIST is-terminal-0.4.12.crate 7470 BLAKE2B 6d1db6148198299d0775539734dc62a3c7e453d621d69e01c3addeadbec4e88dde6082e4e12c7b7e8359cbd93b68c0af314d4a8df4600061a9534834699cc38a SHA512 9eb840a419f530c60d6acc52fdc9d6477818fb513bf9c3e8ab808ecd19087a52933e958a930e7a8c316d5e5a3e5beb56c34b560dddaa03c744ad37cfe6554a0f
 DIST is-terminal-0.4.9.crate 8109 BLAKE2B 0fa495da123f6fe5e3ba5f643f1ee097fc4f8e8aa54d9525b6108855a6a2e58556534a5e8dbfe7b5f8e2f1932003ac63f6aa3384317de7b385cf724bee294468 SHA512 0803ea53945715333d9b5fb18feec7230a49cb1a5f7308e2ea8d06a650e376794dd372be111e85622fd21320228706dd589423510dd010cd6ea112f185c46966
 DIST itertools-0.12.1.crate 137761 BLAKE2B d7db67feb7418d6a779dc17d8a2f33481114cd81a4d53a10cffe08e13f0d3cf4525a5ef43368fe979d5a3ce230872eaf993f7065885531aeb5a6479351857708 SHA512 0d9c1849dcc0ddf7555b0aeb7e4f2ef3b101cfc6f03310ce1b6072d70ac8c8d3387ef4c726146102012e75171e0b0bf13465704b6edfc02752e349dc6af7cf68
 DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea8c460d13e52f0f9fea71bed5b3914cc4a7e05b407ed41e0dbc2292ae5873b3481297edcd92ec547866d044b8c SHA512 1c6650060750f3073140c4a77fc4d1acffa7d18320012807df0e20ab06ddb39afa7f086d89626e3909f89dc1f0408c9ccee4dd9454ca1f7a6a145bb213e7c5ce
@@ -72,6 +76,7 @@ DIST linux-raw-sys-0.3.8.crate 1013776 BLAKE2B 375b29d2cc700e95d94ea8dc304cb7115
 DIST linux-raw-sys-0.4.11.crate 1413981 BLAKE2B 45172cc348e758bf87831b47d2d52ea43e781a738a59654dffc04cd5f1726efdd8d1e2376cdc247019b64d82d756f4739815422c353f54f081a2c539df02b5f4 SHA512 befe18ab06e5248ee89f0cb8fbc192a5564c15c9873672fea62754322d3c197563d9133b839d5222e6baa522ec1fafc48176ee605ec7954c5d93e52dfb6d9772
 DIST linux-raw-sys-0.4.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62
 DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e
+DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
 DIST memchr-2.6.4.crate 94439 BLAKE2B d1136f7105a33565214fdeecdc5a95e74d7fc7cf45997f81bf3cf389f3015fa561ab326433ddcff2db0b7259246eb6d26fc7b4e3c90c3af8b9b7ed7e8ec56ba0 SHA512 1065a67e04ec9210c70e430288e0a8d39f36ce6414722099553e99112ea2f8f710eae44bf39f8775b9850e6c8a50e634a1b1b084a8eb4f6b2eae6697dcf5b5f4
 DIST memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5087903adbcca6af342c9abbb296496eb9bf6cb58915c4444b3edd6ca4e27131ac7d8aed8849815df87a944 SHA512 5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473
 DIST memoffset-0.8.0.crate 8912 BLAKE2B 19ad3abed21fc39461b0382b15a8cc312378aba36f042b1e5335012115d31b350a4e3bc720f1eea300d7d19b9b317f75a28d4ccd78ff3b31defd9e4b3147899c SHA512 47adcae0848ff967035e10543ea599c7af9c5bad387023eb4dc77c9e8d875994ec8139b9941b3ecc4fc17214d80944a47a3be174a45b334661914a5a7382dfbe
@@ -108,6 +113,7 @@ DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e78
 DIST rustix-0.37.27.crate 324534 BLAKE2B 65fc8317c5aa86236b2099104b6841a7d35d4567977218f5e59a85d199aee7d6b9f0278083d93f575b31d77ef8685576b7cba06ce8da6e96a164af30c854ace3 SHA512 e1c648cf11379509b732b9e9ed88ebd36006d8e73755528a09aed4f46df08e23a705696c5e6ff7ea0e4382513edb487f9859a8f1673150d60d70c698216fec3e
 DIST rustix-0.38.25.crate 362735 BLAKE2B 8d368458850d031d63c76c75e716d8e580a763fa365aaf3f065de7f6f28fa314cd57c558286b0322438b9a8fe5475ebc709b02dc804862e02ebf02ad8fd2f30b SHA512 f14d3112f82e254ee01059a845062e305b5386b84e2de14fd89443606b37c5640322258cac91dda3be79b11cd72de60557515649ee266bfe7a796a284afe6a11
 DIST rustix-0.38.31.crate 375443 BLAKE2B 9e8ba6bb4eb4fdf0bacfbc719124f745f383abbabfeb161bff9908d1948942d358f46191377b90c180a2793a88bb01be20dab556cfabc8da8efa2533af8e460b SHA512 593e0395a7bc5bba949e6f2a5ed9e39ae13140970a598def32ab7d6d91b4ec100752fb05abda407ee2e5e420d950b19e607f963f3974213637423c751df75960
+DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d238b8fb64ad4a90ecc4d8952fb042c0bde4bf13d52630cef34e73e96dd32cf772a8601b4f6eb5e2961f0a394add SHA512 717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f
 DIST rustversion-1.0.17.crate 17621 BLAKE2B 1f077ca6fd90333724d1ea9df7f5b178f37f895b71a7b2814e9ba8618bffcd2307f9cb4ac2eea25d461a6686a4b5b51eebb80f1b1ccc773d4da1948c47fe8abe SHA512 0565cddecaedae17e7cd99bc34f54cda242d4c29cd4269f8e3b178ff91d49f3682e7ffe66e436bbb138299736c8e55cc143fefb74c076911fefcc41ba98064f3
 DIST shlex-1.2.0.crate 6584 BLAKE2B ac07c648d9affe62512edab307fe07436dce69b428570ba6455aaf21c178145b1026e35704f920fc177b334cf190f57e393e4dd9e522dd26d133f80fb2c15f47 SHA512 cf48c0c47aac44654a48047fed3568c30f53f19cd131615cabbc247dbdf1eb1b7540b0d188f341251b4876dd0d5fcc13792800f0160f7907e8d8fe9a5e75083f
 DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
@@ -118,6 +124,7 @@ DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e
 DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3
 DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325
 DIST tempfile-3.8.1.crate 32164 BLAKE2B abccff7939df8cd223a5a8ee61e5af7c35335f1cd61b3e72fed9a8565465c293e99938d57b50743141aace3cd20422ad5d3090507ed66561cb0155771fe0a5ec SHA512 b257bfb70793575d59ec4cf4b7492aff83dafb68b367a48594211f476a3b1d4800b69bddc405d8749d8b320c30cbe71be1261a60b4bbc862663b37a6c7d97a3a
+DIST termcolor-1.4.1.crate 18773 BLAKE2B 34676efbde8e242415857d6d40a287ae3459678d8222f5144faefb8c84d635686f640e79588d98635c8f25b7628ec6663a01b16e1e462705b5cba7e8b8e61f44 SHA512 b66aad157c4fa2985f764321d157dfb1f0325fd633811870db7919b5579bf7bc19fefe99e1c706cdfa67504c37dc2ca3d283e11d1bb516edcfaf1eb7747a778a
 DIST terminal_size-0.2.6.crate 10585 BLAKE2B 8696b9046c717eec8bf7246346af84a5d0cb740ac6e1335a4d8c20476628f4c0dd7c6106cde33513681466e9701d4b05d73f22a3bd2dfabc4d22045a69d31345 SHA512 95f38bc00f8c5e1a6913bb2a0a7c46d96e02a4f3234af1623ad3d7be41eae677e77f1b5d5d005d1e9d778fcc6c87196f67a51ab37caab5b4d299da79c85d06ed
 DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681
 DIST thiserror-1.0.50.crate 19414 BLAKE2B a093f66ad191a8c4b15356f8d29578273b36f9f11b5843195eaa15b70bd4c8eaf6dffb631564386acf35a9ddf856e05055b419af52d4e008f582ae444f3dd5d2 SHA512 65605a9cfbc43447a50980739259a45d933f1eb315926dce909892f7162c79bd04bfcee7b38b5a9fa71b24fbe4416d050ae8e2443932577541513a23ebeeac46
@@ -131,6 +138,7 @@ DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d23
 DIST which-4.4.2.crate 15953 BLAKE2B 40ca22cd2f625cb035a1d919ed457a300b482c7751dcee4441974c53d56ce13f1f502535e1f7c0746a01981f4de2e2f761c3a255902d6353db1a4c3c62637448 SHA512 2d12aa1d4c2dbc140e39c8f15bd4ee1eeb8e8de71bcdf579479ef4be860fb0839eaf4cdb818addba242d50420f6e08acaf2bfc979a889e092c83644819246fd5
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.8.crate 12416 BLAKE2B 5b48c27dfbb5db5c332f7e248138327b35ceec0909788b940168e7f6fe1402800da5e7690b2b1654da6c510b5c720330a92da16dff53ef15821f37fef6f335e3 SHA512 e186111398f9f0f0686e791ad0d72c39205e5f246b6e020df413e477ee07f32e91d09405c61dc92752f061f54fd7533435545c1a151477b40e2d68acc94a57fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed
 DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03
@@ -157,5 +165,6 @@ EBUILD bcachefs-tools-1.4.1.ebuild 5563 BLAKE2B 4011b46e0e0f4d2fb7b5b3125c3ad258
 EBUILD bcachefs-tools-1.6.4-r1.ebuild 5241 BLAKE2B 1fb30d4d2ae8deabbe02c5d1db7d20adf2787da35bbcea37cbcde629b0c58610beb056986afb493948f35fab436e1e1e590413d860c7f7334a6aee4e978f6813 SHA512 3df29ecaba769f0f15f904c18b0630eb90f3e9de9813158f5753723eee54eeeb0b7978d89016ff508f4b0bf7b741da21b3224f9cffafded3c3fc2c1eb18760e9
 EBUILD bcachefs-tools-1.7.0.ebuild 5276 BLAKE2B 898d087a1a1503dab6cc088117a55514d7bb77ba0874156d930f112f07298714071d2143614777308a10c8a9901c0ba1aa353ab00b6bc291c979e297ba42a9bb SHA512 0df8db9e271820259c546442b785e06ddb7c674a406fbe9006d4ed7ef3310e8123cecf4c6dd8f6dfb01c09c430b2e9d58ed21263fae25cd55fc9c295165589ac
 EBUILD bcachefs-tools-1.9.1.ebuild 5348 BLAKE2B cdf335f63f60112cec40cc498fbc5cae96cc8afbbd2f8774565b0357fb355af556035646c147b66489ac5d186cae2118decb53f59ec00f8831d2ea3942c2929e SHA512 60a864050856d1d32c6eb9e533de74d91d5bbd93cdb246c1f8542edc0d10438dc37e95c467c19295beb59a4598e0e35c3ecc7bd974857d7aa7669c525569797a
-EBUILD bcachefs-tools-9999.ebuild 5242 BLAKE2B fd962577af482a9c6c1c83480eab65e9bd949c21e2560fb5c03c350ff63e0e81b3fc31f48725d38faf2ec28a250e753949e058d4c3e75bf4dd57e3d4938b8c98 SHA512 8a634605a38375893a9aa65c8ce9ab79aaa4a6b77f298bd4aa67175f94b254921acccdd4f9401e61bd9ef61bc9162d86c44216f9defaeb154e46f45fb744b22b
+EBUILD bcachefs-tools-1.9.4.ebuild 5393 BLAKE2B a422469f9e73e2c3c4de02b6e468ca6e003de7ff0d18b12b8152e5397f5ef11de1599949596161c80dc520b99901fe328e4656ee880baba6dfa044fcb14ec34e SHA512 812b39660e73f2c7e3511b9f447c7dea20338f24cbec855977bd6dd8f22541b7f0e626e73068aeee9b703cd9c2fc4007d04b1df0e3c874589621405f63e7bc3d
+EBUILD bcachefs-tools-9999.ebuild 4412 BLAKE2B cbb050d6d6fa74d5c4febb700a27e3c19d5a44adfcbe7396232901cf9e206223a7fc4aa859c9667d4d9f48457c86b5d84ae132fa8a920fcd9d5ab367e1530053 SHA512 1d9d98f845f277fd115b1101a3137705e9aed9893686865c8b514e437d2c3701aeef274af6525e712720e2c7e2a448f052c097d42abc1f534eed2c4e3297c23f
 MISC metadata.xml 751 BLAKE2B 58fb2ebb3092cb1056b36a5389d486faf4fb3fc6c107f5aeb65d1002722f7f238f776df5698bfceb4e2bf6b0ee4f1aa04d3015784c95141d300f6f82654525bd SHA512 5a6a46cfb145160a0871bf7a591238470d08744552870b54b9c7c78afac860a256fbd6765972a77ca81b78239695850b26c04acc1b24d1a4b35f52d6ef9e2501
diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.9.4.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.9.4.ebuild
new file mode 100644
index 000000000000..dd482ce9dcf3
--- /dev/null
+++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.9.4.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	aho-corasick@1.1.2
+	anstream@0.6.11
+	anstyle-parse@0.2.3
+	anstyle-query@1.0.2
+	anstyle-wincon@3.0.2
+	anstyle@1.0.6
+	anyhow@1.0.79
+	autocfg@1.1.0
+	bindgen@0.69.4
+	bitfield@0.14.0
+	bitflags@1.3.2
+	bitflags@2.4.2
+	byteorder@1.5.0
+	cc@1.0.83
+	cexpr@0.6.0
+	cfg-if@1.0.0
+	clang-sys@1.7.0
+	clap@4.4.18
+	clap_builder@4.4.18
+	clap_complete@4.4.10
+	clap_derive@4.4.7
+	clap_lex@0.6.0
+	colorchoice@1.0.0
+	either@1.9.0
+	env_logger@0.10.2
+	errno-dragonfly@0.1.2
+	errno@0.2.8
+	errno@0.3.8
+	glob@0.3.1
+	heck@0.4.1
+	hermit-abi@0.3.9
+	home@0.5.9
+	is-terminal@0.4.12
+	itertools@0.12.1
+	lazy_static@1.4.0
+	lazycell@1.3.0
+	libc@0.2.153
+	libloading@0.8.1
+	libudev-sys@0.1.4
+	linux-raw-sys@0.4.13
+	log@0.4.22
+	memchr@2.7.1
+	memoffset@0.8.0
+	minimal-lexical@0.2.1
+	nom@7.1.3
+	once_cell@1.19.0
+	paste@1.0.14
+	pkg-config@0.3.29
+	prettyplease@0.2.16
+	proc-macro2@1.0.78
+	quote@1.0.35
+	regex-automata@0.4.5
+	regex-syntax@0.8.2
+	regex@1.10.3
+	rustc-hash@1.1.0
+	rustix@0.38.34
+	rustversion@1.0.17
+	shlex@1.3.0
+	strsim@0.10.0
+	strum@0.26.2
+	strum_macros@0.26.2
+	syn@2.0.48
+	termcolor@1.4.1
+	terminal_size@0.3.0
+	udev@0.7.0
+	unicode-ident@1.0.12
+	utf8parse@0.2.1
+	uuid@1.7.0
+	which@4.4.2
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.8
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-targets@0.48.5
+	windows-targets@0.52.0
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.0
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.0
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.0
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.0
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.0
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.0
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.0
+	zeroize@1.8.1
+	zeroize_derive@1.4.2
+"
+
+LLVM_COMPAT=( {16..18} )
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cargo flag-o-matic llvm-r1 multiprocessing python-any-r1 shell-completion toolchain-funcs unpacker
+
+DESCRIPTION="Tools for bcachefs"
+HOMEPAGE="https://bcachefs.org/"
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://evilpiepirate.org/git/bcachefs-tools.git"
+else
+	SRC_URI="https://github.com/koverstreet/bcachefs-tools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		${CARGO_CRATE_URIS}"
+	S="${WORKDIR}/${P}"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="Apache-2.0 BSD GPL-2 MIT"
+SLOT="0"
+IUSE="fuse test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-libs/libaio
+	dev-libs/libsodium:=
+	dev-libs/userspace-rcu:=
+	sys-apps/keyutils:=
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/udev
+	fuse? ( >=sys-fs/fuse-3.7.0 )
+"
+
+RDEPEND="${DEPEND}"
+#
+# Clang is required for bindgen
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/docutils[${PYTHON_USEDEP}]
+		test? (
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		)
+	')
+	$(unpacker_src_uri_depends)
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}
+	')
+	virtual/pkgconfig
+	virtual/rust
+"
+
+QA_FLAGS_IGNORED="/sbin/bcachefs"
+
+python_check_deps() {
+	if use test; then
+		python_has_version \
+			"dev-python/pytest[${PYTHON_USEDEP}]" \
+			"dev-python/pytest-xdist[${PYTHON_USEDEP}]"
+	fi
+	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_src_unpack
+		S="${S}/rust-src" cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_prepare() {
+	default
+	tc-export CC
+
+	# Version sed needed because the Makefile hasn't been bumped yet
+	# Check if it is no longer before bumping
+	sed \
+		-e '/^CFLAGS/s:-O2::' \
+		-e '/^CFLAGS/s:-g::' \
+		-i Makefile || die
+	append-lfs-flags
+}
+
+src_compile() {
+	use fuse && export BCACHEFS_FUSE=1
+	export BUILD_VERBOSE=1
+	export VERSION=${PV}
+
+	default
+
+	use test && emake tests
+
+	local shell
+	for shell in bash fish zsh; do
+		./bcachefs completions ${shell} > ${shell}.completion || die
+	done
+}
+
+src_test() {
+	if ! use fuse; then
+		EPYTEST_IGNORE=( tests/test_fuse.py )
+	fi
+	EPYTEST_DESELECT=(
+		# Valgrind
+		'tests/test_fixture.py::test_read_after_free'
+		'tests/test_fixture.py::test_undefined'
+		'tests/test_fixture.py::test_write_after_free'
+		'tests/test_fixture.py::test_undefined_branch'
+		'tests/test_fixture.py::test_leak'
+		'tests/test_fixture.py::test_check'
+		# Fails in portage because of usersandbox; ensure that these pass before bumping!
+		'tests/test_basic.py::test_format'
+		'tests/test_basic.py::test_fsck'
+		'tests/test_basic.py::test_list'
+		'tests/test_basic.py::test_list_inodes'
+		'tests/test_basic.py::test_list_dirent'
+	)
+	epytest -v -n "$(makeopts_jobs)"
+}
+
+src_install() {
+	into /
+	dosbin bcachefs
+
+	dosym bcachefs /sbin/fsck.bcachefs
+	dosym bcachefs /sbin/mkfs.bcachefs
+	dosym bcachefs /sbin/mount.bcachefs
+
+	if use fuse; then
+		dosym bcachefs /sbin/fsck.fuse.bcachefs
+		dosym bcachefs /sbin/mkfs.fuse.bcachefs
+		dosym bcachefs /sbin/mount.fuse.bcachefs
+	fi
+
+	newbashcomp bash.completion bcachefs
+	newfishcomp fish.completion bcachefs.fish
+	newzshcomp zsh.completion _bcachefs
+
+	doman bcachefs.8
+}
+
+pkg_postinst() {
+	if use fuse; then
+		ewarn "FUSE support is experimental."
+		ewarn "Please only use it for development purposes at the risk of losing your data."
+		ewarn "You have been warned."
+	fi
+}
diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild
index 09617302a1b5..be2cd55914db 100644
--- a/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild
+++ b/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild
@@ -27,14 +27,16 @@ CRATES="
 	clap_derive@4.4.7
 	clap_lex@0.6.0
 	colorchoice@1.0.0
-	colored@2.1.0
 	either@1.9.0
+	env_logger@0.10.2
 	errno-dragonfly@0.1.2
 	errno@0.2.8
 	errno@0.3.8
 	glob@0.3.1
 	heck@0.4.1
+	hermit-abi@0.3.9
 	home@0.5.9
+	is-terminal@0.4.12
 	itertools@0.12.1
 	lazy_static@1.4.0
 	lazycell@1.3.0
@@ -42,7 +44,7 @@ CRATES="
 	libloading@0.8.1
 	libudev-sys@0.1.4
 	linux-raw-sys@0.4.13
-	log@0.4.20
+	log@0.4.22
 	memchr@2.7.1
 	memoffset@0.8.0
 	minimal-lexical@0.2.1
@@ -56,13 +58,15 @@ CRATES="
 	regex-automata@0.4.5
 	regex-syntax@0.8.2
 	regex@1.10.3
-	rpassword@7.3.1
-	rtoolbox@0.0.2
 	rustc-hash@1.1.0
-	rustix@0.38.31
+	rustix@0.38.34
+	rustversion@1.0.17
 	shlex@1.3.0
 	strsim@0.10.0
+	strum@0.26.2
+	strum_macros@0.26.2
 	syn@2.0.48
+	termcolor@1.4.1
 	terminal_size@0.3.0
 	udev@0.7.0
 	unicode-ident@1.0.12
@@ -70,6 +74,7 @@ CRATES="
 	uuid@1.7.0
 	which@4.4.2
 	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.8
 	winapi-x86_64-pc-windows-gnu@0.4.0
 	winapi@0.3.9
 	windows-sys@0.48.0
@@ -90,12 +95,14 @@ CRATES="
 	windows_x86_64_gnullvm@0.52.0
 	windows_x86_64_msvc@0.48.5
 	windows_x86_64_msvc@0.52.0
+	zeroize@1.8.1
+	zeroize_derive@1.4.2
 "
 
-LLVM_COMPAT=( {16..17} )
-PYTHON_COMPAT=( python3_{10..12} )
+LLVM_COMPAT=( {16..18} )
+PYTHON_COMPAT=( python3_{10..13} )
 
-inherit cargo flag-o-matic llvm-r1 multiprocessing python-any-r1 shell-completion toolchain-funcs unpacker
+inherit cargo flag-o-matic llvm-r1 python-any-r1 shell-completion toolchain-funcs unpacker
 
 DESCRIPTION="Tools for bcachefs"
 HOMEPAGE="https://bcachefs.org/"
@@ -111,8 +118,8 @@ fi
 
 LICENSE="Apache-2.0 BSD GPL-2 MIT"
 SLOT="0"
-IUSE="fuse test"
-RESTRICT="!test? ( test )"
+IUSE="fuse"
+RESTRICT="test"
 
 DEPEND="
 	app-arch/lz4:=
@@ -134,10 +141,6 @@ BDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_any_dep '
 		dev-python/docutils[${PYTHON_USEDEP}]
-		test? (
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		)
 	')
 	$(unpacker_src_uri_depends)
 	$(llvm_gen_dep '
@@ -147,12 +150,9 @@ BDEPEND="
 	virtual/rust
 "
 
+QA_FLAGS_IGNORED="/sbin/bcachefs"
+
 python_check_deps() {
-	if use test; then
-		python_has_version \
-			"dev-python/pytest[${PYTHON_USEDEP}]" \
-			"dev-python/pytest-xdist[${PYTHON_USEDEP}]"
-	fi
 	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
 }
 
@@ -166,7 +166,6 @@ src_unpack() {
 		git-r3_src_unpack
 		S="${S}/rust-src" cargo_live_src_unpack
 	else
-		unpack ${P}.tar.gz
 		cargo_src_unpack
 	fi
 }
@@ -191,36 +190,12 @@ src_compile() {
 
 	default
 
-	use test && emake tests
-
 	local shell
 	for shell in bash fish zsh; do
 		./bcachefs completions ${shell} > ${shell}.completion || die
 	done
 }
 
-src_test() {
-	if ! use fuse; then
-		EPYTEST_IGNORE=( tests/test_fuse.py )
-	fi
-	EPYTEST_DESELECT=(
-		# Valgrind
-		'tests/test_fixture.py::test_read_after_free'
-		'tests/test_fixture.py::test_undefined'
-		'tests/test_fixture.py::test_write_after_free'
-		'tests/test_fixture.py::test_undefined_branch'
-		'tests/test_fixture.py::test_leak'
-		'tests/test_fixture.py::test_check'
-		# Fails in portage because of usersandbox; ensure that these pass before bumping!
-		'tests/test_basic.py::test_format'
-		'tests/test_basic.py::test_fsck'
-		'tests/test_basic.py::test_list'
-		'tests/test_basic.py::test_list_inodes'
-		'tests/test_basic.py::test_list_dirent'
-	)
-	epytest -v -n "$(makeopts_jobs)"
-}
-
 src_install() {
 	into /
 	dosbin bcachefs
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index faf26029e47e..3c13a502da06 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/asahi-sources/Manifest b/sys-kernel/asahi-sources/Manifest
index f9721c056080..09067dc8eb3b 100644
--- a/sys-kernel/asahi-sources/Manifest
+++ b/sys-kernel/asahi-sources/Manifest
@@ -1,5 +1,4 @@
 AUX asahi-6.8-config-gentoo-Drop-RANDSTRUCT-from-GENTOO_KERNEL_SEL.patch 1826 BLAKE2B 4e170e302c1d52b3f5b8d4f6e79eb096fe859745042d5539745df97a8e78cdca50fad24204cd5667620a3c65f93406dcf54c3eb51a3f45d9cd10369ca83cfe12 SHA512 afd78d1b42eae94472ba45cb259db811d6258af6b46e4f9cd64e30fd3c47728063c815199431f6c700c45f8a5d91fbfbf6e2c07a5f38dae7371cc8a2edae6ecf
-AUX asahi-6.8.2_revert_spi_stable_asahi.patch 1451 BLAKE2B 749163f2c8d1d6f7b667f5123afdb99106e9341375767cb652039d48415f101542abc6150b8f559a1b594209d1d29eaa158a3f9c1e0a450e1dff620a0c5e7e4a SHA512 7145725dccdeeeb304e97070f1dbec450165296919101e111ae1e188fd6d7c55cc68fbddcdf50d2bfe0e052f4aeb401a9cace8c59636afb4940405725a7ea327
 DIST genpatches-6.9-10.base.tar.xz 602768 BLAKE2B 614634ed1d1132be830e91a13dc509022a6a476b678f63dd4f3c428e7c37eec46f47a32f927f3895ff65a6ab5b046a3b0ca2df88a94678f898292d0970859734 SHA512 7826d46d8faaf64fb268f8dc940621f434f8729e706b4178adac2a2c353bccd854e5fea6c3489d5d0c48d469d6f6e26befa01d5a0deaba48f3e6140eb096de5e
 DIST genpatches-6.9-10.extras.tar.xz 4052 BLAKE2B 607bede5f0c3d38f72fba841861caf6f90e7f0068373d951a6aa21a29cb7523bcd6faeeb5602c6a7395a802d35e657aaee1172582ecddd0c4143fc21ea9c4b3c SHA512 b9e59d200cb06ea3287557e1ca1cf7116df61019f423fa8149195d36d7d2b143265341bef5430c4f761b0926ad823775cb2c83c852d22dc4acdb0d9628da12bc
 DIST genpatches-6.9-9.base.tar.xz 548708 BLAKE2B e0130d225056f77c92e566eef9db643ecdef6faf2f81e8329859830850bb5409e212aca0ab0da85b9b1e3377121221259044dac650986ec05feac46f4d588a5d SHA512 714016638f866b536b85edd24e3e44513048591aa270dbee1460c5893b3e8b0508f299d86a202deacd10f105c0da48038d78219226b2808e17012d1811df391e
@@ -7,6 +6,6 @@ DIST genpatches-6.9-9.extras.tar.xz 4048 BLAKE2B 7be69cb63abf9df9267bc61e3e36567
 DIST linux-6.9.tar.xz 144034416 BLAKE2B 4cf86c3cfe6e6534745d42dfaeca59b17ea1168c4e8b615c80e6d8aac735f11283cd85fa992b440b5d4452917e94b9f08397a64af0be5894e3df23c68892377e SHA512 fed3b4cd1fbfb4d94618587c1934273d2ecc8b6e42a3d586ff8a5f24980be930f2ef803aa2923ca3bfa5e4e619f967f3af315368f24fa76f610b10443624a579
 DIST linux-asahi-6.9.8-1.patch 5296308 BLAKE2B 7a6640235488d11ebaa230d022fc89d85633830a9082d5fc7a62ed7a46272a62dcf3b5f68387bc2c2cbe14a5fc9167d31a896ddbeefe1d8d70557077d83d90df SHA512 0c0de341a98fa91da4670c14a704d5cc0aaaf80ad74af86b9df2a13762a0f9196f0c32b32fc80cffce4f65c459d92a9363bee7c2c5f02e35d5ecd0ee0118b5d4
 DIST linux-asahi-6.9.9-5.patch 5356022 BLAKE2B c3b5fa8be8320d391f11e7f02b7aa4c67055484539da5a241e3557d075db6c60daea15abcb992dd04cc2dcd7b8fd67bf2a17b21225737a492f0b70a987403189 SHA512 49bb4812e467b0ef07a71b0f6c1a16b8ee627be9c9c0862b87b419080712d77f0a8b5a83ddb54b92776defc79afa8241749cec97e262d98c29da874801decaa3
-EBUILD asahi-sources-6.9.8_p1.ebuild 1722 BLAKE2B dfa32aef22b6995527c63423e2941e114482cf82f66234eaf6a41190f3ffb1f4a3ae33b8fe164215feec8d699e8f0ac988cebc98f3d6ab42375b71185a294bcf SHA512 b48cbbf09c2c059632aaf4ecd9cb260b279577e023ecca6fbe291ded7da2ea42d12dbc0c58cc9e1878148286fe2dc48a1bd03da91263f6efb82c9eac87cff776
-EBUILD asahi-sources-6.9.9_p5.ebuild 1724 BLAKE2B 4e3b0ade0f7a3ffd6429f40d1263500f85c85d4120d4520eedcc90d2187e708fa029fc9cdc560ccf9fefe7889b495b648cdcb6d0595af2410b1009bae0ea0a62 SHA512 cceec565e1e986994131d10c472588aab742614c8e60c4875ab646df07407c4ba89e567f52de3bad7c9920af68369cad87a04c12c71eeda80eb9172a002ef244
+EBUILD asahi-sources-6.9.8_p1-r1.ebuild 1667 BLAKE2B 468797017674ddc886c27de712417afc54086aaaf94044662124c54bdb1fd4ca8c1bb034d469a325c896b06bff46b1ee3ad68746758943e71fcf2369bfe7c4c9 SHA512 87844e895d3fde35316967274d2af5bad28386fb9547e4743f8450b7c814c2cb48d38c9cc21c11a5c2bad7375d601e9088b5ccbbc820ec10557ae3f43da7c0c2
+EBUILD asahi-sources-6.9.9_p5-r1.ebuild 1669 BLAKE2B d5115d0f2880d4fa1cf5beb3722818bf2fc03e79bcd41babc0cbd2e1b3469e8ed7bfdf09a1ea2f71be4cb4eda050cdbca91f2c590878dc810ec8eadc52d6ea03 SHA512 1b9a6ef084f144ecaa81626cef33452c1fe40b249da290a32e9921880182b34f7289e911ccfc96b35cd1b4ebde764669eafa028d2a498d304dd8fa03662c360a
 MISC metadata.xml 606 BLAKE2B 81abc1eb15c66fbc4b2039b161e0bc06e8c6ce5e58727fca8ef80778db4dd04bc48486479d795c91e6181cd4e3f974b3ff7e3f6479e98e8271ccf4bdfd22b02e SHA512 c5e3349ebbbd7d04a0ac261c93df705b34882a3ed2472f28d90ef902377f5a89d3b5454e94b7f40c39c5d1745aedbd1267a607c189ff09917e77f0ed78009395
diff --git a/sys-kernel/asahi-sources/asahi-sources-6.9.8_p1.ebuild b/sys-kernel/asahi-sources/asahi-sources-6.9.8_p1-r1.ebuild
index ef7185794376..551f5fbce65e 100644
--- a/sys-kernel/asahi-sources/asahi-sources-6.9.8_p1.ebuild
+++ b/sys-kernel/asahi-sources/asahi-sources-6.9.8_p1-r1.ebuild
@@ -58,7 +58,6 @@ DEPEND="
 UNIPATCH_STRICTORDER="yes"
 UNIPATCH_LIST="
 	${FILESDIR}/asahi-6.8-config-gentoo-Drop-RANDSTRUCT-from-GENTOO_KERNEL_SEL.patch
-	${FILESDIR}/asahi-6.8.2_revert_spi_stable_asahi.patch
 	${DISTDIR}/linux-${ASAHI_TAG}.patch
 "
 
diff --git a/sys-kernel/asahi-sources/asahi-sources-6.9.9_p5.ebuild b/sys-kernel/asahi-sources/asahi-sources-6.9.9_p5-r1.ebuild
index 4b6fa5c16640..c7a931cddb78 100644
--- a/sys-kernel/asahi-sources/asahi-sources-6.9.9_p5.ebuild
+++ b/sys-kernel/asahi-sources/asahi-sources-6.9.9_p5-r1.ebuild
@@ -58,7 +58,6 @@ DEPEND="
 UNIPATCH_STRICTORDER="yes"
 UNIPATCH_LIST="
 	${FILESDIR}/asahi-6.8-config-gentoo-Drop-RANDSTRUCT-from-GENTOO_KERNEL_SEL.patch
-	${FILESDIR}/asahi-6.8.2_revert_spi_stable_asahi.patch
 	${DISTDIR}/linux-${ASAHI_TAG}.patch
 "
 
diff --git a/sys-kernel/asahi-sources/files/asahi-6.8.2_revert_spi_stable_asahi.patch b/sys-kernel/asahi-sources/files/asahi-6.8.2_revert_spi_stable_asahi.patch
deleted file mode 100644
index fc6522e205b8..000000000000
--- a/sys-kernel/asahi-sources/files/asahi-6.8.2_revert_spi_stable_asahi.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
-index 46f153548760..d1b297f438f1 100644
---- a/drivers/spi/spi.c
-+++ b/drivers/spi/spi.c
-@@ -1042,14 +1042,10 @@ static void spi_set_cs(struct spi_device *spi, bool enable, bool force)
- 	if (spi->mode & SPI_CS_HIGH)
- 		enable = !enable;
- 
--	/*
--	 * Handle chip select delays for GPIO based CS or controllers without
--	 * programmable chip select timing.
--	 */
--	if ((spi_is_csgpiod(spi) || !spi->controller->set_cs_timing) && !activate)
--		spi_delay_exec(&spi->cs_hold, NULL);
--
- 	if (spi_is_csgpiod(spi)) {
-+		if (!spi->controller->set_cs_timing && !activate)
-+			spi_delay_exec(&spi->cs_hold, NULL);
-+
- 		if (!(spi->mode & SPI_NO_CS)) {
- 			/*
- 			 * Historically ACPI has no means of the GPIO polarity and
-@@ -1083,16 +1079,16 @@ static void spi_set_cs(struct spi_device *spi, bool enable, bool force)
- 		if ((spi->controller->flags & SPI_CONTROLLER_GPIO_SS) &&
- 		    spi->controller->set_cs)
- 			spi->controller->set_cs(spi, !enable);
-+
-+		if (!spi->controller->set_cs_timing) {
-+			if (activate)
-+				spi_delay_exec(&spi->cs_setup, NULL);
-+			else
-+				spi_delay_exec(&spi->cs_inactive, NULL);
-+		}
- 	} else if (spi->controller->set_cs) {
- 		spi->controller->set_cs(spi, !enable);
- 	}
--
--	if (spi_is_csgpiod(spi) || !spi->controller->set_cs_timing) {
--		if (activate)
--			spi_delay_exec(&spi->cs_setup, NULL);
--		else
--			spi_delay_exec(&spi->cs_inactive, NULL);
--	}
- }
- 
- #ifdef CONFIG_HAS_DMA
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index a5ff63fd00bd..190a50b14003 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -8,6 +8,6 @@ DIST linux-firmware-20240709.tar.xz 376713860 BLAKE2B 33ea1ca0ffafa37b7260438695
 EBUILD linux-firmware-20240513.ebuild 11701 BLAKE2B badc3af8bec613910d4595d9c19bd981b9d7bec7b668a6b620c93fe5327e4ea6e5dee74b9288d090be0e61c80e920cc7f19b4c7630da191781e35917610d3e48 SHA512 d82b20e52adacec96ac1a748e53d757d45ebac37e84ab152ad4285ee202d79d2befec4d7a2695a3119366683e6d143ce8b1311197afb180ee14f3e922d03121e
 EBUILD linux-firmware-20240610-r1.ebuild 11594 BLAKE2B b55a6cba54c649fef4ef1f1ef711a6cd5cee7f7b40326293d0ca3a6e6188ab9f87ccd316f67872d51a77e65e16cd080ae8d4890251b3464ab255120a95cb1c9f SHA512 ef5bd4c4853b0eb7c1d09210e5eaaa4a1dd8cd41486edcbe051a16a6b1d672e92231ba615066e8627b2df7bcfa557b45d889278f97cc366ec426bab698833c75
 EBUILD linux-firmware-20240610-r3.ebuild 10992 BLAKE2B dc1c7ae870ce8e8fc69181be65e780106e50c02a940f2a6a5f1f9066109e7d88994a857b31ab81027eea9c8be7f529a82a02c56d1256c32e7e89e30ae32863d8 SHA512 0e827ca4ac75e0cf67f176d8f1965a13b13ea2840d222858f774291abbe700607e81d79c0f98c5e88bb736d41e5c331f20a588517f6f411261ce6d563364eb06
-EBUILD linux-firmware-20240709-r1.ebuild 10984 BLAKE2B ec8d8905dead0b807839f33ad72e19fd4fc13d10228695eb3af054aac5d41018285479fcd2537636f0565d972f61298d3859847f3290e311fe2dc70f0f667a48 SHA512 ce34df13c03842e4a3fd59836a1b00683b3948239e2d153f5aeb5b19f0f24ae207169ff14837b491e9765662718f1cd9a0a9a04b573c99a2fb1b8ed4d436b998
-EBUILD linux-firmware-99999999.ebuild 11280 BLAKE2B ddd3566709e67b8c7941521fbaf0945b6d36296eabe263a86efc73200c43376b86691bb2faab0770a01f30f0d0967b8200b06c2502b539aaee222852deacca76 SHA512 7dbfe192b9760096f0e70fd09ffbf4fc9a51cca2828e2b4d9b0b504800b92626c5046201d30a10176fbf9f1ca96b476b6a9cbcbd68ad0ac55e2313e3209e776d
+EBUILD linux-firmware-20240709-r1.ebuild 10984 BLAKE2B 116684d6e36977e0a30a4692a01bbb5df322cdb732521e65077d171a1468f54de0c9826f0ab7cb4e7b1e653de84e5964c51d3dc03dae92f3670eea117f22ced5 SHA512 9ef2f07f8444e53817828509234d0501a7310f04aa2be7bc62d682b8020be722c9222f83b4f31f389032736e52fdc7c304e35b6e947ec9e5f2a4d4cfb6477c7d
+EBUILD linux-firmware-99999999.ebuild 11280 BLAKE2B ea1d3eda1a5036593bad18b8872cd0d5cae0f699bed082d853966fcc4e34efaa5c283b16afb8c929cf8f66fa5ee411523c607bb4cabc1a116517c5735d816422 SHA512 2fcfe24d2cc4c6ca64c01ba7e611cb128d1776f48d67fbd5287450804d20f9e76d1020a81bc87922a006f5dd57e0c436d06b7ce589c3d5a06fc93dc4da53da25
 MISC metadata.xml 1289 BLAKE2B 109336d30e5ec5fb5e679cff9b31e6f69c0b4f629e2aaf4d0d7b6c0db78c1ddcbbb0b283f724f2758207324b622c2af9dfe15874ab34b34876e3e4f58cb5ced6 SHA512 9b925b26bb58a39360ab5ff3cdd7d88bd489645e73f101209f0813a0b926b15dae34f28db05ff6419a0a62fab2ac84ae0546b5007ce17ad3611188bf7aeda3e5
diff --git a/sys-kernel/linux-firmware/linux-firmware-20240709-r1.ebuild b/sys-kernel/linux-firmware/linux-firmware-20240709-r1.ebuild
index eba1ddedc308..b7c47404963d 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20240709-r1.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20240709-r1.ebuild
@@ -70,10 +70,10 @@ PATCHES=( "${FILESDIR}"/${PN}-copy-firmware-r4.patch )
 
 pkg_pretend() {
 	if use initramfs; then
-		if [[ -z ${ROOT} ]] && use dist-kernel; then
+		if use dist-kernel; then
 			# Check, but don't die because we can fix the problem and then
 			# emerge --config ... to re-run installation.
-			nonfatal mount-boot_check_status
+			[[ -z ${ROOT} ]] && nonfatal mount-boot_check_status
 		else
 			mount-boot_pkg_pretend
 		fi
@@ -376,8 +376,8 @@ pkg_postinst() {
 	done
 
 	if use initramfs; then
-		if [[ -z ${ROOT} ]] && use dist-kernel; then
-			dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+		if use dist-kernel; then
+			[[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
 		else
 			# Don't forget to umount /boot if it was previously mounted by us.
 			mount-boot_pkg_postinst
diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index 17a10c80a0fc..7635e488d909 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -68,10 +68,10 @@ QA_PREBUILT="*"
 
 pkg_pretend() {
 	if use initramfs; then
-		if [[ -z ${ROOT} ]] && use dist-kernel; then
+		if use dist-kernel; then
 			# Check, but don't die because we can fix the problem and then
 			# emerge --config ... to re-run installation.
-			nonfatal mount-boot_check_status
+			[[ -z ${ROOT} ]] && nonfatal mount-boot_check_status
 		else
 			mount-boot_pkg_pretend
 		fi
@@ -382,8 +382,8 @@ pkg_postinst() {
 	done
 
 	if use initramfs; then
-		if [[ -z ${ROOT} ]] && use dist-kernel; then
-			dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+		if use dist-kernel; then
+			[[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
 		else
 			# Don't forget to umount /boot if it was previously mounted by us.
 			mount-boot_pkg_postinst
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 866be3aac7c6..07def990b444 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/daemontools/Manifest b/sys-process/daemontools/Manifest
index 4f33907629ad..2a6f67f0198f 100644
--- a/sys-process/daemontools/Manifest
+++ b/sys-process/daemontools/Manifest
@@ -1,4 +1,5 @@
 AUX 0.76-C99-decls.patch 10397 BLAKE2B 3072b01973ebdf4e12d2d25ac70a953028c360a721b2ca6ef9cd05d6803fb3c9e48d9b7b11112d401e16b5e9dc039500cb2d9b5752000dcaabcc905c70643ad8 SHA512 36695347e98d4dc177f685cddcf9e7331da8630f0632d1fb35a2df1898c9e4a73d8908b56dd218d9b6f06cd3f063e6a946567ab256498bf0d425ea2f06719c58
+AUX 0.76-const-typecasts-C99.patch 9031 BLAKE2B 694b57edb7e44e6646191f0a9ae5d5fc44f29962eb56ed9e2410ac5d52b7059ec9743295c968b42c1a48fe6817628c326292cc243c0d367261160293079230df SHA512 bef1878140428a5c1ba06ad7d7d375c875569ca95ada71752de5bf3f969df839ac59f588b258e24673d5f6a3195c78c9868dd61c3d3a63583508fd0deb40d2fd
 AUX 0.76-errno.patch 246 BLAKE2B 10fc1da86bb91657dd9f1709f1f58852d93e6baa61ab89ce56911066677975699af1feff69bda5218afb36f2fbb66af6b810d5a9d8b6938054ff0123172c657a SHA512 76664b71e16ba4dbb081604a1a8c9ddc58a603777dccc0a53b0af9442ff8f0cdfce9ef8b05926dac62b81b2c805262df6a7e4df65920c00583132dbf136ba85e
 AUX 0.76-implicit-func-decl-clang16.patch 265 BLAKE2B 711ea0ff926d93964e6333745eb830979f50929892650489367246ab3c93963b28a4cecac5a3f72defa50646550b623687119036ac412930c836569c728cf37b SHA512 209250b752cda3d3b67784e3c906c02ae365de884dec759e21fd14ecaa433f7f6d646afc918d8c0ffd9eab313ccaacf482e1920669b9e2c884b79b7e1cfd6f66
 AUX 0.76-makefile.patch 3630 BLAKE2B 777309c2c8d029927e29b1587c751ce9100dbc258d22b6b45d1375b52a15bb0c369086d762e521b4858eaaed432d06f834c7bee3c0de208fbcab05f7712e9a5d SHA512 8df1923e9b3fa84430941c652bf3462e6ce9d4dfee67ccfce36512124aaa7ad364c2a8f2f2c1e4fef2ffb55a60491fe5208df576965d072a3c5c396da711d030
@@ -7,4 +8,5 @@ DIST daemontools-0.76-man-20020131.tar.gz 8005 BLAKE2B 0c8f0ae71754516fda772b377
 DIST daemontools-0.76.tar.gz 36975 BLAKE2B cb45c92fc06169b617befe9f9193377a07d31e9e6ae05526c299ce2a63c8009b599384a87f768fbe9283b229083ef74007b85662976cf7add5c855f5018fafa8 SHA512 e4a7938352b745a03ccc41acdddba1e6782f0ca245e5cae060de62ab6c5a23c841a994c30140298d274405a7f26d53ba7e84e5810a3d185b2c01e4c0feffe6c7
 EBUILD daemontools-0.76-r10.ebuild 1343 BLAKE2B b34581ec22e8be4c29b76995d351aa559c6aa5471b8aa38adf8500493088639724cf66e7c19e1cbc7a06f589b60eefddb58c22fa05e1178b0083e163597c16f0 SHA512 6293cf98ed25b886e80013b07e98117073f03d6f0a4f2a186e74fd4a1fe152ce490ecad31192903681be1ef04182db3d7171236d69b0758a99ca86194eab5f13
 EBUILD daemontools-0.76-r11.ebuild 1397 BLAKE2B b8e5ea3cc96ba23a01b96a7234ac83a127c83b23f1494be3bd822d288bd2a51495fcc52bea5d07fd480784ff4a44204779947fdd6b4327fcbd6202e48741afd0 SHA512 29010524af5267947c69bf7f7ea99588575a715db392961c048bb6828c0ba16474c866dff3f65385b6b09499be1e5776283d2a6a386e8ad99c0da9ca0e56845c
+EBUILD daemontools-0.76-r12.ebuild 1452 BLAKE2B 5f5cb0c148769ed9116262faf683d6742c61febffb905e319ba80d809fff0cd52c38e984069a91c0e41ed1e52eff8cf07746274df8e581d8e966e0c0fda7040f SHA512 efbec6f58dbd4c8d5502f2c50c9275af141b2bd9a28674a349221d72afe4c0808c5795be5441e726e2bcfd3cf87ae1b9e08dad804eaee6a076299d9e286a2b04
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-process/daemontools/daemontools-0.76-r12.ebuild b/sys-process/daemontools/daemontools-0.76-r12.ebuild
new file mode 100644
index 000000000000..308128cac5a2
--- /dev/null
+++ b/sys-process/daemontools/daemontools-0.76-r12.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Collection of tools for managing UNIX services"
+HOMEPAGE="https://cr.yp.to/daemontools.html"
+SRC_URI="
+	https://cr.yp.to/daemontools/${P}.tar.gz
+	https://smarden.org/pape/djb/manpages/${P}-man-20020131.tar.gz"
+S="${WORKDIR}/admin/${P}/src"
+
+LICENSE="public-domain GPL-2"	# GPL-2 for init script
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="selinux static"
+
+RDEPEND="selinux? ( sec-policy/selinux-daemontools )"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-errno.patch
+	"${FILESDIR}"/${PV}-C99-decls.patch
+	"${FILESDIR}"/${PV}-makefile.patch
+	"${FILESDIR}"/${PV}-implicit-func-decl-clang16.patch
+	"${FILESDIR}"/${PV}-const-typecasts-C99.patch
+)
+
+src_configure() {
+	tc-export AR CC
+	use static && append-ldflags -static
+
+	touch home || die
+}
+
+src_install() {
+	keepdir /service
+
+	dobin $(<../package/commands)
+	dodoc CHANGES ../package/README TODO
+	doman "${WORKDIR}"/${PN}-man/*.8
+
+	newinitd "${FILESDIR}"/svscan.init-0.76-r7 svscan
+}
+
+pkg_postinst() {
+	einfo
+	einfo "You can run daemontools using the svscan init.d script,"
+	einfo "or you could run it through inittab."
+	einfo "To use inittab, emerge supervise-scripts and run:"
+	einfo "svscan-add-to-inittab"
+	einfo "Then you can hup init with the command telinit q"
+	einfo
+}
diff --git a/sys-process/daemontools/files/0.76-const-typecasts-C99.patch b/sys-process/daemontools/files/0.76-const-typecasts-C99.patch
new file mode 100644
index 000000000000..3b34db2d2c08
--- /dev/null
+++ b/sys-process/daemontools/files/0.76-const-typecasts-C99.patch
@@ -0,0 +1,292 @@
+Memory allocation should have internal accounting and automatically
+free the memory that was allocated and pointed by this, whatever
+type pointer is.
+Also, there's a lot of erroneous assignments of const types, added
+consts everywhere, removed or cast them away only where it was impossible
+https://bugs.gentoo.org/920062
+--- a/pathexec_env.c	2024-05-11 08:21:41.834811961 +0000
++++ b/pathexec_env.c	2024-05-11 08:23:16.190437842 +0000
+@@ -65,5 +65,5 @@
+   e[elen] = 0;
+ 
+   pathexec_run(*argv,argv,e);
+-  alloc_free(e);
++  alloc_free((char *)e);
+ }
+diff '--color=auto' -ru a/buffer.c b/buffer.c
+--- a/buffer.c	2024-06-23 17:46:32.395780947 -0000
++++ b/buffer.c	2024-06-23 17:53:20.305622176 -0000
+@@ -2,7 +2,7 @@
+ 
+ #include "buffer.h"
+ 
+-void buffer_init(buffer *s,int (*op)(int, char*, int),int fd,char *buf,unsigned int len)
++void buffer_init(buffer *s,int (*op)(int, const char*, int),int fd,char *buf,unsigned int len)
+ {
+   s->x = buf;
+   s->fd = fd;
+diff '--color=auto' -ru a/buffer.h b/buffer.h
+--- a/buffer.h	2024-06-23 17:46:32.395780947 -0000
++++ b/buffer.h	2024-06-23 17:56:59.835455791 -0000
+@@ -8,14 +8,14 @@
+   unsigned int p;
+   unsigned int n;
+   int fd;
+-  int (*op)(int, char*, int);
++  int (*op)(int, const char*, int);
+ } buffer;
+ 
+ #define BUFFER_INIT(op,fd,buf,len) { (buf), 0, (len), (fd), (op) }
+ #define BUFFER_INSIZE 8192
+ #define BUFFER_OUTSIZE 8192
+ 
+-extern void buffer_init(buffer *, int (*)(int, char*, int), int, char *, unsigned int);
++extern void buffer_init(buffer *, int (*)(int, const char*, int), int, char *, unsigned int);
+ 
+ extern int buffer_flush(buffer *);
+ extern int buffer_put(buffer *,const char *,unsigned int);
+@@ -49,8 +49,8 @@
+ 
+ extern int buffer_copy(buffer *,buffer *);
+ 
+-extern int buffer_unixread(int,char *,unsigned int);
+-extern int buffer_unixwrite(int, char *, int);
++extern int buffer_unixread(int,const char *,unsigned int);
++extern int buffer_unixwrite(int, const char *, int);
+ 
+ extern buffer *buffer_0;
+ extern buffer *buffer_0small;
+diff '--color=auto' -ru a/buffer_0.c b/buffer_0.c
+--- a/buffer_0.c	2024-06-23 17:46:32.395780947 -0000
++++ b/buffer_0.c	2024-06-23 18:00:19.773386824 -0000
+@@ -2,7 +2,7 @@
+ 
+ #include "buffer.h"
+ 
+-int buffer_0_read(int fd, char *buf, int len)
++int buffer_0_read(int fd, const char *buf, int len)
+ {
+   if (buffer_flush(buffer_1) == -1) return -1;
+   return buffer_unixread(fd,buf,len);
+diff '--color=auto' -ru a/buffer_get.c b/buffer_get.c
+--- a/buffer_get.c	2024-06-23 17:46:32.395780947 -0000
++++ b/buffer_get.c	2024-06-23 17:54:25.506277116 -0000
+@@ -4,7 +4,7 @@
+ #include "byte.h"
+ #include "error.h"
+ 
+-static int oneread(int (*op)(int, char*, int),int fd,char *buf,unsigned int len)
++static int oneread(int (*op)(int, const char*, int),int fd,char *buf,unsigned int len)
+ {
+   int r;
+ 
+diff '--color=auto' -ru a/buffer_put.c b/buffer_put.c
+--- a/buffer_put.c	2024-06-23 17:46:32.395780947 -0000
++++ b/buffer_put.c	2024-06-23 17:51:41.689144081 -0000
+@@ -5,7 +5,7 @@
+ #include "byte.h"
+ #include "error.h"
+ 
+-static int allwrite(int (*op)(int, char*, int),int fd,const char *buf,unsigned int len)
++static int allwrite(int (*op)(int, const char*, int),int fd,const char *buf,unsigned int len)
+ {
+   int w;
+ 
+diff '--color=auto' -ru a/buffer_read.c b/buffer_read.c
+--- a/buffer_read.c	2024-06-23 17:46:32.387780989 -0000
++++ b/buffer_read.c	2024-06-23 18:04:30.854044424 -0000
+@@ -3,7 +3,7 @@
+ #include <unistd.h>
+ #include "buffer.h"
+ 
+-int buffer_unixread(int fd,char *buf,unsigned int len)
++int buffer_unixread(int fd,const char *buf,unsigned int len)
+ {
+-  return read(fd,buf,len);
++  return read(fd,(void *)buf,len);
+ }
+diff '--color=auto' -ru a/buffer_write.c b/buffer_write.c
+--- a/buffer_write.c	2024-06-23 17:46:32.395780947 -0000
++++ b/buffer_write.c	2024-06-23 17:55:26.617953696 -0000
+@@ -3,7 +3,7 @@
+ #include <unistd.h>
+ #include "buffer.h"
+ 
+-int buffer_unixwrite(int fd, char *buf, int len)
++int buffer_unixwrite(int fd, const char *buf, int len)
+ {
+   return write(fd,buf,len);
+ }
+diff '--color=auto' -ru a/byte.h b/byte.h
+--- a/byte.h	2024-06-23 17:46:32.395780947 -0000
++++ b/byte.h	2024-06-23 18:07:46.502998389 -0000
+@@ -4,10 +4,10 @@
+ #define BYTE_H
+ 
+ unsigned int byte_chr(char *s, unsigned int n, int c);
+-unsigned int byte_rchr(char *s, unsigned int n, int c);
+-void byte_copy(char *to, unsigned int n, char *from);
++unsigned int byte_rchr(const char *s, unsigned int n, int c);
++void byte_copy(char *to, unsigned int n, const char *from);
+ void byte_copyr(char *to, unsigned int n, char *from);
+-int byte_diff(char *s, unsigned int n, char *t);
++int byte_diff(char *s, unsigned int n, const char *t);
+ 
+ #define byte_equal(s,n,t) (!byte_diff((s),(n),(t)))
+ 
+diff '--color=auto' -ru a/byte_copy.c b/byte_copy.c
+--- a/byte_copy.c	2024-06-23 17:46:32.395780947 -0000
++++ b/byte_copy.c	2024-06-23 17:48:30.327156821 -0000
+@@ -2,7 +2,7 @@
+ 
+ #include "byte.h"
+ 
+-void byte_copy(char *to, unsigned int n, char *from)
++void byte_copy(char *to, unsigned int n, const char *from)
+ {
+   for (;;) {
+     if (!n) return; *to++ = *from++; --n;
+diff '--color=auto' -ru a/byte_diff.c b/byte_diff.c
+--- a/byte_diff.c	2024-06-23 17:46:32.396780942 -0000
++++ b/byte_diff.c	2024-06-23 17:48:50.431050426 -0000
+@@ -2,7 +2,7 @@
+ 
+ #include "byte.h"
+ 
+-int byte_diff(char *s, unsigned int n, char *t)
++int byte_diff(char *s, unsigned int n, const char *t)
+ {
+   for (;;) {
+     if (!n) return 0; if (*s != *t) break; ++s; ++t; --n;
+diff '--color=auto' -ru a/byte_rchr.c b/byte_rchr.c
+--- a/byte_rchr.c	2024-06-23 17:46:32.396780942 -0000
++++ b/byte_rchr.c	2024-06-23 18:08:32.408752954 -0000
+@@ -2,11 +2,11 @@
+ 
+ #include "byte.h"
+ 
+-unsigned int byte_rchr(char *s, unsigned int n, int c)
++unsigned int byte_rchr(const char *s, unsigned int n, int c)
+ {
+   register char ch;
+-  register char *t;
+-  register char *u;
++  register const char *t;
++  register const char *u;
+ 
+   ch = c;
+   t = s;
+diff '--color=auto' -ru a/multilog.c b/multilog.c
+--- a/multilog.c	2024-06-23 17:46:32.396780942 -0000
++++ b/multilog.c	2024-06-23 18:09:29.152449574 -0000
+@@ -173,7 +173,7 @@
+ 
+ void startprocessor(struct cyclog *d)
+ {
+-  const char *args[4];
++  char *args[4];
+   int fd;
+ 
+   sig_uncatch(sig_term);
+@@ -268,7 +268,7 @@
+   }
+ }
+ 
+-int c_write(int pos,char *buf,int len)
++int c_write(int pos,const char *buf,int len)
+ {
+   struct cyclog *d;
+   int w;
+@@ -446,7 +446,7 @@
+   flagforcerotate = 1;
+ }
+ 
+-int flushread(int fd,char *buf,int len)
++int flushread(int fd,const char *buf,int len)
+ {
+   int j;
+ 
+@@ -468,7 +468,7 @@
+   sig_unblock(sig_term);
+   sig_unblock(sig_alarm);
+ 
+-  len = read(fd,buf,len);
++  len = read(fd,(void *)buf,len);
+ 
+   sig_block(sig_term);
+   sig_block(sig_alarm);
+diff '--color=auto' -ru a/pathexec_run.c b/pathexec_run.c
+--- a/pathexec_run.c	2024-06-23 17:46:32.396780942 -0000
++++ b/pathexec_run.c	2024-06-23 17:59:54.340522801 -0000
+@@ -16,7 +16,7 @@
+   int savederrno;
+ 
+   if (file[str_chr(file,'/')]) {
+-    execve(file,argv,envp);
++    execve(file,(char *const *)argv,(char *const *)envp);
+     return;
+   }
+ 
+@@ -33,7 +33,7 @@
+     if (!stralloc_cats(&tmp,file)) return;
+     if (!stralloc_0(&tmp)) return;
+ 
+-    execve(tmp.s,argv,envp);
++    execve(tmp.s,(char *const *)argv,(char *const *)envp);
+     if (errno != error_noent) {
+       savederrno = errno;
+       if ((errno != error_acces) && (errno != error_perm) && (errno != error_isdir)) return;
+diff '--color=auto' -ru a/supervise.c b/supervise.c
+--- a/supervise.c	2024-06-23 17:46:32.397780936 -0000
++++ b/supervise.c	2024-06-23 18:03:30.334367992 -0000
+@@ -85,7 +85,7 @@
+   write(selfpipe[1],"",1);
+ }
+ 
+-const char *run[2] = { "./run", 0 };
++char * const run[2] = { "./run", 0 };
+ 
+ void trystart(void)
+ {
+diff '--color=auto' -ru a/svscan.c b/svscan.c
+--- a/svscan.c	2024-06-23 17:46:32.385781000 -0000
++++ b/svscan.c	2024-06-23 17:47:36.647440909 -0000
+@@ -101,7 +101,7 @@
+         args[0] = "supervise";
+         args[1] = fn;
+         args[2] = 0;
+-	pathexec_run(*args,args,environ);
++	pathexec_run(*args,args,(const char *const *)environ);
+         strerr_die4sys(111,WARNING,"unable to start supervise ",fn,": ");
+       default:
+ 	x[i].pid = child;
+@@ -120,7 +120,7 @@
+         args[0] = "supervise";
+         args[1] = "log";
+         args[2] = 0;
+-	pathexec_run(*args,args,environ);
++	pathexec_run(*args,args,(const char *const *)environ);
+         strerr_die4sys(111,WARNING,"unable to start supervise ",fn,"/log: ");
+       default:
+ 	x[i].pidlog = child;
+diff '--color=auto' -ru a/tai64n.c b/tai64n.c
+--- a/tai64n.c	2024-06-23 17:46:32.397780936 -0000
++++ b/tai64n.c	2024-06-23 18:05:56.551586243 -0000
+@@ -2,7 +2,7 @@
+ #include "timestamp.h"
+ #include "buffer.h"
+ 
+-int mywrite(int fd,char *buf,int len)
++int mywrite(int fd,const char *buf,int len)
+ {
+   int w;
+   w = buffer_unixwrite(fd,buf,len);
+@@ -13,7 +13,7 @@
+ char outbuf[2048];
+ buffer out = BUFFER_INIT(mywrite,1,outbuf,sizeof outbuf);
+ 
+-int myread(int fd,char *buf,int len)
++int myread(int fd,const char *buf,int len)
+ {
+   int r;
+   buffer_flush(&out);
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 46d5ea71318a..ca5b6262fe10 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest
index 5082fb7f2cf7..9d9d533501c7 100644
--- a/www-apache/mod_wsgi/Manifest
+++ b/www-apache/mod_wsgi/Manifest
@@ -4,5 +4,5 @@ DIST mod_wsgi-4.9.4.gh.tar.gz 706904 BLAKE2B 6473ee5be4f21d7d5806028b22d582e9d2b
 DIST mod_wsgi-5.0.0.gh.tar.gz 707590 BLAKE2B 14dd43849c0f9d1e67eece9a87acc3573cbb38f8d6338551b22ba33ebd8b6f6e1371e97c7c5d3f1b15cb10e2ae9990eff7f4c6af62fb9236bcc78b35aad4a8db SHA512 3ecc3ad2fd05164929915541be61201db8d35d1e27183ce26c67583b836bb404bd10c88a2ada94714a14140a7f885eb67256cf02bf47aa0dbd81aecd0894a984
 EBUILD mod_wsgi-4.9.0.ebuild 1108 BLAKE2B b85f3abbc1b1da6af973babf3aa2142a1dd5b571ea345d2cbc7cbc418dff5b5389cdff674ec6389f4bdde76f4fcc0ac4602cfaea0ccfe7869c9586690c2b50ca SHA512 d993d3cb33f60839a8b68bffbdf91e50a56e4d84ad6dfac5568a6a1dbbd19be182099c1d7ee8a16a8a3f293be40ca31cce1038677cd3fc5b111ddf8152a54e6b
 EBUILD mod_wsgi-4.9.4-r1.ebuild 1093 BLAKE2B bb0d072da7e4e2a9e2dd344075f89be656a4cc36ff3ba9ff053581e9ad82801eab8b3c6b184eafa9410d5fc42f8e5851ec5aed7b9c5fcbeb82e586340ae18924 SHA512 004903697b5d4931ab2b9a26aa59fa70794b87228bd8e70f2aa7c50e097eb6ef03ca94fcdd7529c323c07be0ff6908868566ed826bf10e0855fab125cbf19039
-EBUILD mod_wsgi-5.0.0.ebuild 1095 BLAKE2B ca914c3c6a19319839212dadc94c97a3bf3e2c32ad7a01abd33fa35ceb13c58797bab3b6bb5f2c7f1edfa9e9f5af4e3ef9c3824b7c9cd65cee6758f2aba7d232 SHA512 ce15429811143f6581b911f3e1c7c2f9a833575a6ff23c62d5abe426bb822151dc8cb4f0ab35bc5e25f46082a27975e226dfa8535fce44b0fb5bbc10a528b7da
+EBUILD mod_wsgi-5.0.0.ebuild 1093 BLAKE2B 1c3c779bad6b352537a4ce5afcbef0e9a6a53eb23ee3df809eeb610110cbc32000e14dd5cd1ff04b0dce965ec7e648ec7a2af75090b10d567c2d0da0bfbb07a9 SHA512 a3c9f49eacd2c213b381bfdf85366a87e5daba151298091da55ee26a95557d19b68f23e0e6829f03b6677cedf3899acb8ec54d3dbdefa5c6c6b64b3470e7e780
 MISC metadata.xml 303 BLAKE2B 3b6303fa847f0f5b287faece9a7f0ce422531e0a0a130035cb5a032049daccba08c5460fc58af8a68d2eede0b8f5e76502e9c64109f33f219757ace3b2e82b98 SHA512 d24e5bcec7363bc5bb7f3c5798aa6978aefaee6990f5917ff133362fdcc32927a7b68a939b90cf38ebddbcf04c5b6310a1654a92d0a5eece5ba27245b8df0550
diff --git a/www-apache/mod_wsgi/mod_wsgi-5.0.0.ebuild b/www-apache/mod_wsgi/mod_wsgi-5.0.0.ebuild
index 777e934aadbf..b609a01ce5cc 100644
--- a/www-apache/mod_wsgi/mod_wsgi-5.0.0.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-5.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 9826164620f0..7a188c305b2c 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index 7fac8bd8adf2..3cbd62ee63b8 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -1,3 +1,3 @@
-DIST chromedriver-bin-126.0.6478.126.linux64.zip 8767006 BLAKE2B a976633561b58c3356e4f760e034c6fe87d492f598f4c0899d552d68f406b5632a3683e44b39882e07b5682f70dde81b0d7435c9d9f28a4531a6ac08b21a11b0 SHA512 5b59053fbd2b1b8b02fb093e11d03201e302adb5fd901b2adc8cf1715f06c8a2064666de966dd4dbe8c40c5eb419f051fd5a9407f54f032e411e5e089bf9ce34
-EBUILD chromedriver-bin-126.0.6478.126.ebuild 723 BLAKE2B 03683d52be41beb713d96fe5b459de4807cd8be267a6559ed0fc8a6539095acfefe8c32e8774790f30c6eb7ad842f8cc5f261699938dd528e8a669454b313c9d SHA512 691bfcc0c4827b0e29ddda34293d247547e181365ee2cda16a8dc860a1359621ecefcf0a286d90ab6bc0c86d1a9a57aafb95809ff02aec673e6b414f711a09d1
+DIST chromedriver-bin-126.0.6478.182.linux64.zip 8766567 BLAKE2B d7608db11a6c2283bc6fcfc932201a87de9817d00f03ecb47168e4359a4fc2597db979a37ee6fbf92ecb9f26ceae6644dd7dcbe888ea76fa8cf61c6afa54da72 SHA512 f08f23b443ed04e6c7c4962b48b0638d87d2f0fe98c911b5798da3c418eb69cb2710ae5209f2d7594195c351d95e08c61f51edf8810bc2453997f65108401683
+EBUILD chromedriver-bin-126.0.6478.182.ebuild 723 BLAKE2B 03683d52be41beb713d96fe5b459de4807cd8be267a6559ed0fc8a6539095acfefe8c32e8774790f30c6eb7ad842f8cc5f261699938dd528e8a669454b313c9d SHA512 691bfcc0c4827b0e29ddda34293d247547e181365ee2cda16a8dc860a1359621ecefcf0a286d90ab6bc0c86d1a9a57aafb95809ff02aec673e6b414f711a09d1
 MISC metadata.xml 461 BLAKE2B 4e6e0fd9bf732be9040a4defe4dc1ca63ba7e1ba860abfc97ad487d6220f7bc5cb1e304d001409cb866408fdf393ca42f3b95eb9b8dc258a0627aaa978f66e6e SHA512 3c9217fe5af26ee8ddc705edad8a32604d542ad60c3e78ed8aba9e08a5bd2b3508234e42710d4524149f8b7626bba08f83cb96f7f942fe5ccdfbd8bd98908bec
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-126.0.6478.126.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-126.0.6478.182.ebuild
index ff9ba50fc766..ff9ba50fc766 100644
--- a/www-apps/chromedriver-bin/chromedriver-bin-126.0.6478.126.ebuild
+++ b/www-apps/chromedriver-bin/chromedriver-bin-126.0.6478.182.ebuild
diff --git a/www-apps/sonarr-bin/Manifest b/www-apps/sonarr-bin/Manifest
index a77c6155fd7a..f470e5ba69a8 100644
--- a/www-apps/sonarr-bin/Manifest
+++ b/www-apps/sonarr-bin/Manifest
@@ -1,10 +1,10 @@
 AUX sonarr.init-r2 148 BLAKE2B ec52d371fe94038459978619cb51e1a5394d48178af12eaf8e48758af2476edad621866261454a33fc4d1fdf985463c5036442627ded3733531549c00bf7d980 SHA512 769e844e962df9880d5aa6d6030af792e14d6ca7c375f687cb0a62921b784037f45bc7e2d0da2803400f6de5a2a32b5903e3cfa910bc06bfca5a2f90b042ea65
 AUX sonarr.logrotate 185 BLAKE2B 177e0158baba22056af33f59656a734541be16a9e5dbbd09758ba6ed23b3262979c9b1ca6072bfaca8567ca3165af35f2911838c903a9c75da37cc9aa259858e SHA512 9fddf238caa123801462158debf2296ac04ba2e2d42f1566b50b4823b10e8c84dfdb5f1649ae1a6c3bebce19e639289b5c9a491d7ba20a37e19980673a32a5cb
 AUX sonarr.service-r1 568 BLAKE2B 7ccc2f3def560fd07713e433a657f2664c153acbf316442e516f9591a918dc042bcc8302877e1456af2dc4ae30d44157ffc1b11e6844ea9cbea9990aecd62c24 SHA512 d99f6312ffe8dff2c0d938a3c0e5801355e1323261b7e8752f409ddab5885ebacd9c6237060cd4153bd91e1f1c8c3e70dd69285002956cc45a8259798268bfcb
-DIST Sonarr.main.4.0.8.1874.linux-arm.tar.gz 95014147 BLAKE2B 1c2ed6d835edd63f9f2516594c85db4cca3da2c38d0adf6f47c73d157301eeecdc2499a5290f3d79852956ef62e09aed2b75b9696f0e7efe195c78c3a2141c21 SHA512 648582f22d3b963fb1ae8f206854df1b88f4ee8ac1eb09e6b5e4024b8c59d34c58c94d80f245db8f470ab553cf6e659d76fd0eb9b355f2cc334ee704a3e1f34f
-DIST Sonarr.main.4.0.8.1874.linux-arm64.tar.gz 94748643 BLAKE2B e98c70ad9d34d0f19e2e133ae0488b18a8c3364cd6a5fc502b1477520ff8022453bfe6227ff550d76b447caf7886074484a1a3eb39fb1dd88cc1f90cf22976da SHA512 de5eabc20a598a5dfa6b661423db50395076a14609016e0f5f3d459e29d92096c97b1557c07599bcf6f561cd3300e59f61bd18d856742e5a1ff435bef300516b
-DIST Sonarr.main.4.0.8.1874.linux-musl-arm64.tar.gz 94803467 BLAKE2B c998e2e5fd5158c3275848a314d949b5dcce1b115440d2e8ff09677f9824a6eb2a657bccf9a9425dcb943f687d00bfb30b9c7aec8403b0248c1112ef3dd3a2b3 SHA512 80ac0c873e25fc134291e4254251ed2454c0733274ece284e07e12404ba7916b1976a7d84eb3762c8875713263c49cf9eddc23bb8c709faf731cb58a1277f757
-DIST Sonarr.main.4.0.8.1874.linux-musl-x64.tar.gz 99767964 BLAKE2B cab216252e20ece34f2117b6aa322a2c16a0a7aa894167d1e81b11ed70cb4c2ca199d521b0a9db7dcd2193446c1aeab2f5e01b870f9fad1368d69a5f430bb658 SHA512 306d1c73ca9c852027ff9e10966bd68af9385af19a6cdb461f2e08a9ea4cd6011dcff0c797456a9d120bcc909953c4462a90ca6944b6ccce8b56b26088e0797b
-DIST Sonarr.main.4.0.8.1874.linux-x64.tar.gz 100703846 BLAKE2B ef052d72ebd857dfd1024b44d9c8ca49c1d06c4db355137d89fe5dbb9fcb34d07fa85280199f1df0cda6e0a7f0347b66c2c0162a905e3e7a0adc9f50165ccbed SHA512 5afdc6fd91e15279b0b50901f1da87c9519f56a0d8b75cae01720138d331b77e1a9fde8626e9b6b1199d6e6a55c766b923d37b78fc825b76ea71a5370c097ab7
-EBUILD sonarr-bin-4.0.8.1874.ebuild 1734 BLAKE2B 0351ccd1769fdb0a1ef1b473ececbe8e35202d1338357e8083210604c86886dbf9388c488fbd73da101d77b065537f221e69d31a178ae5f39db7b63bd6e63bc6 SHA512 6d99454f27acda84b9c04e45ac48b9c580f8f73a7b161a9116765d3c371bcc92975109411e2171ac1d53dc0bec93f73e063d78a0538e8dec216af78f895b1727
+DIST Sonarr.develop.4.0.8.1893.linux-arm.tar.gz 95025064 BLAKE2B 32256b25098905030c0a290e90d37ed4b32bf60b84a1a6ecfbe889e64b1540f8665fe55f9ec8a03c2ba12033892bc22666dd11de53d94d4b783c30f82c56284a SHA512 ba98717a06f5e4ccd19e95fc93aa7517b00659ab58cef0bc43defe3f004149c551118ea0ef44929297c825a303cc7f2874087324be621db7521a9adfd2d3a303
+DIST Sonarr.develop.4.0.8.1893.linux-arm64.tar.gz 94765704 BLAKE2B c4e667cda4edcf360018623044f7f686df7ddc7de50c7ce37f61a013a0d39d94770473105bddb56275bfa45805670dcad20c7c2f64b18ebdcdf80a2b025b7007 SHA512 06b146377132f942df133e29e6d5294abcc6b897bbcc522c91b6c5ce9379eb4658d6dbadff059166a6b83d38c4084b49915382e7b73cc7ec796015c337e71d5a
+DIST Sonarr.develop.4.0.8.1893.linux-musl-arm64.tar.gz 94816480 BLAKE2B 58ced6f832be9141b7563a2f2a02edb3cd619108b610c2bd2fa17a816b3bacc5a062e83c37d9ecb2f131cd097186a77f470c25a1e3845fd504678a8003ca9f62 SHA512 9c5b48c81122dd9b754e0e81dab86bf1e765f3464c622882f7011fc3dab7e79d8c8f918b14a84629f4d479dc8056d311efcb7096382293bd90e74158ec681153
+DIST Sonarr.develop.4.0.8.1893.linux-musl-x64.tar.gz 99770898 BLAKE2B 621e123967f17cec01d5b149caf734b4cc0c5406bbba3cf671d934b895d9c2b0c727501092de98bafad8122d8a58be4ea4e9641a4a90f52945889a97f5d8b463 SHA512 3127d08cad2d0d00ea98dc7437baaf161ef8af563bd49dd79585a82d138640fb7f0e16290b6eff233c25727bea4806cae3fcf47e9c3d01c3eb4eac6b6735b919
+DIST Sonarr.develop.4.0.8.1893.linux-x64.tar.gz 100707777 BLAKE2B 9bab3a9eb4cce7c7af00dd13f556d12ffb9a51646351c4e37a549a52f1d2723f44bc9b32971f9a8ab489f0d3621d6514bb5ef991d26adbabe8f9aafb7a5e1d51 SHA512 fbd59cf514910409eba680981bb51ec469432bfb9b850c37a14e837f62a30b42d10c51ef3ff1f7700f1763806a15c7c41cdf45d0e433cccc0572579b72ee507d
+EBUILD sonarr-bin-4.0.8.1893.ebuild 1749 BLAKE2B 2e42b6b35dbfda7b42504b8b89ae91f39c4e9a665f51b9cee0cf0daf4fb2ea3460c2e3f8c6733302a55d23b0794208d82c77528baa3719e28001af8c4526323b SHA512 719e9316fc0a72b7f86fc54a27a97f81f204a18bf3cdc3360f0732d565b363d9f956bce157aa42600e4b9afcaf6ced5bb05305abca892875495ccf2e68db5b4c
 MISC metadata.xml 675 BLAKE2B 5ac9fb421e127c8552ee273b784205059a59245d3783efa5c69225dcc34a65cdf00e39de3dc47013807923766110992f557cb3247f9866ec6d0c836b42ab4cd5 SHA512 1c347d1e422a2653fe8c403169cc1f16f7d5c668831d60a67d67a2df8ca90c696fb28fde70cd4a3c9336f983c39fbba30ec570ab7c14caee946cdd983aa6ba58
diff --git a/www-apps/sonarr-bin/sonarr-bin-4.0.8.1874.ebuild b/www-apps/sonarr-bin/sonarr-bin-4.0.8.1893.ebuild
index 33263b6aa642..f10489599d33 100644
--- a/www-apps/sonarr-bin/sonarr-bin-4.0.8.1874.ebuild
+++ b/www-apps/sonarr-bin/sonarr-bin-4.0.8.1893.ebuild
@@ -11,23 +11,23 @@ HOMEPAGE="https://www.sonarr.tv"
 SRC_URI="
 	amd64? (
 		elibc_glibc? (
-			https://github.com/Sonarr/Sonarr/releases/download/v${PV}/Sonarr.main.${PV}.linux-x64.tar.gz
+			https://github.com/Sonarr/Sonarr/releases/download/v${PV}/Sonarr.develop.${PV}.linux-x64.tar.gz
 		)
 		elibc_musl? (
-			https://github.com/Sonarr/Sonarr/releases/download/v${PV}/Sonarr.main.${PV}.linux-musl-x64.tar.gz
+			https://github.com/Sonarr/Sonarr/releases/download/v${PV}/Sonarr.develop.${PV}.linux-musl-x64.tar.gz
 		)
 	)
 	arm? (
 		elibc_glibc? (
-			https://github.com/Sonarr/Sonarr/releases/download/v${PV}/Sonarr.main.${PV}.linux-arm.tar.gz
+			https://github.com/Sonarr/Sonarr/releases/download/v${PV}/Sonarr.develop.${PV}.linux-arm.tar.gz
 		)
 	)
 	arm64? (
 		elibc_glibc? (
-			https://github.com/Sonarr/Sonarr/releases/download/v${PV}/Sonarr.main.${PV}.linux-arm64.tar.gz
+			https://github.com/Sonarr/Sonarr/releases/download/v${PV}/Sonarr.develop.${PV}.linux-arm64.tar.gz
 		)
 		elibc_musl? (
-			https://github.com/Sonarr/Sonarr/releases/download/v${PV}/Sonarr.main.${PV}.linux-musl-arm64.tar.gz
+			https://github.com/Sonarr/Sonarr/releases/download/v${PV}/Sonarr.develop.${PV}.linux-musl-arm64.tar.gz
 		)
 	)
 "
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 28054a23dc96..23084291172b 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 91f6525a64e7..cb40b1f7bcb6 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -11,9 +11,9 @@ AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9
 DIST chromium-126-clang.tar.xz 50615992 BLAKE2B 293709399ddf343ba195cec452974178228ebb72921931ad58136351956b881f8dc0bc8ca740252bcd4971701c9ee8ccc0a33648aee25a5b1cece56e0af6b83f SHA512 7bb2938b1df452585d0ee93da3bcf9c3e64e88e39059a713fe21758df670190b12ca002ef2764dc99efdb4284b4c4b7cde861e2e495d99956c21120a51b8c3dc
 DIST chromium-126-rust.tar.xz 150643432 BLAKE2B d9c827008a2fae07977628beccdf3cf4e5d9bf3c9728e4b2839c8bc86ee2f87844921064e30c067a1b620a3d53cbf54a74053172b1436239332fc668f772924d SHA512 431c0305a81e59da231d56f1b119226b661d7f5a93d0da92afbfc384b0e5be28f282c2911137983298a5369c93b60184d41875ec63b47048a782ee2b1301fc77
 DIST chromium-126.0.6478.126.tar.xz 4166142564 BLAKE2B 4c709c3a02a01f6bef46309b4a2f3d8cd688007e6b69152a5119a098c98aa272e10ea1ebf418c75387d08e1b9dde75ad53eabc12cf860b288e732c9b974e6066 SHA512 4a86edb82ec530299f8298b7604a18efb5ccf6a6cde37950d7821a73b005b9e83805a0b7f36f2fa5b4f71e237bf70ec628c1864e4f81caa4333a5dc904fb3aab
+DIST chromium-126.0.6478.182.tar.xz 4173311388 BLAKE2B fd11cdc99b9b5f9700ba2c64777c3b49f457a619687c6b1532145bc6a89ec6491bc7f9c2a71e2466530f3a1785b428f86d0fcb678dfdabd7f7708a7ad980a78c SHA512 3809234f9e9e5adba0b3b9fdfb12ff078ac2376a7f56d05df4f56f1d8ae2dad4be8f3683460c790a9e6b187a4760f70580fde8b7d7266b4b16ce3004ffc19fcf
 DIST chromium-127-clang.tar.xz 50869256 BLAKE2B a25c78c28e1a19bb251ce78831ff8aeea51f0ff0a3fcba4f57e14e676aadba38f248554a52d9f67da8c0ccf533ef9f60b4bbb26f8935914efa2b871444e61d8f SHA512 9033c2dd7dd217917caf3dbed52f72ded18fe81b431edd4ef82fe7c592f7b9fbf6d5d2c8f7ba4ebffb4994bef20579d30aea9dd1ad36db86bec5d0adb6eca062
 DIST chromium-127-rust.tar.xz 151082700 BLAKE2B 53b5e72724425ae97bbb22e128ca5e826a2db5fb49f615c5331cdf6d790c253d58061223ff9fbd7f4deecaa19668e7b905b0a661380f48ce74d7f66a9605be18 SHA512 a47fc0bdbf48da9c8c17c91d9dc1a4a3f09578e82199c0d5843dfb6188803161cdb98d065ee3f85ceaf78efd2c233397c325c4c9f2d19255f38734a81599404b
-DIST chromium-127.0.6533.26.tar.xz 6590894364 BLAKE2B 1806ba0d75aca8c9a6d491ff14401364d5429ad5fb2c3c605d2c7694492782007e5b584bf543f59fdc7732589871bf307503c9928b2da57121b54269cd0f6c30 SHA512 4a3a08ed6b3a0ba40597c99bf520112a92d2c92171ac8f3c13356b5ce7bfd6ba91473b69d4216b23757ac2ffc267aa34d18e77d21a6bbaabfe10c674ec791ace
 DIST chromium-127.0.6533.43.tar.xz 6598802356 BLAKE2B eab679025fd4764e7e3eb6ed0b32e0e3c106848626d7477c02a9a1201eb5add64614864366bdecf9d7b0a9fe62b9df621d4d6cb8762f7f7e85d7725ae2eed5bf SHA512 138e709105f6b7328c5029e6c5e5d9f0cf9611561bb6631605eb79051f3ef8be6dd0c2fb50ab2a89c7b1b5a869dcfb69bbc37ec56f4239039e32a8ada72be172
 DIST chromium-patches-126.tar.bz2 4538 BLAKE2B c1f224015618ec908ef09d0c04a2243923371e2caeccd60d93747599fd1434b284291a5b4326008db21749cf78827d5a4b50d22fc805dcd3c1fd86303dc82729 SHA512 6692075adac0379b5f27d1023de1a051cf7f7f7138efd32dfc3af0d501b714142a16daf18022bb46d92218587f364f4dafe9f4aea24f6826e88b0e7cc2be7d0b
 DIST chromium-patches-127.tar.bz2 4545 BLAKE2B cd0221e74a886ad3fc598e92876021b847a92a587ddc66774357ccf06bdd14e23f8bfede9bbe6fd154af8cea570bfa6ee27a2ff393883bd314a7d1326c7260f5 SHA512 938926ecd406d96662a6ed6e9fab9efab156f5691e98c044c75c4d335075f61e80eae2cf3be9b626c01d3542c1785dd0fc63ac31e5cbf1555a8eca3c6aed8c56
@@ -21,7 +21,8 @@ DIST chromium-ppc64le-gentoo-patches-1.tar.xz 5636 BLAKE2B 1d898939df023c59285b2
 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
 DIST chromium_124.0.6367.207-1raptor0~deb12u1.debian.tar.xz 587248 BLAKE2B 4c5a12b3e70be85b31d60d35d160281cbf8b93422169243f743fff25805bc7006ffeed5f95b415fb49e9cf4c3bf2c0a2d5ed10642d8f772df24cab1fe738125a SHA512 025ac185f27c66438a5eaf482120fded42d37403706fd012fbde1b6acf5c2e360bb2fb7723183d4883f66f36afe10167a2d919cde11735186a1a87b28ffaf9c6
 DIST chromium_126.0.6478.114-1raptor0~deb12u1.debian.tar.xz 613488 BLAKE2B ecdf33e0ced01d540b7f1e599df6655055afd8f72b22a92c600205d1b02176be76140a5bfa550e62e4a0e4f03c68992eb480d9ba4a256b3f8b48b525a8ce7400 SHA512 53ea7f89dac5c42ca991f40f2a5515393cb74334a27df72b944552d5a557f6c53b0dac9c89cfb99918fd502396bc80a677a87533f48552af9f7fd440b7b8b2cc
+DIST chromium_126.0.6478.126-1raptor0~deb12u1.debian.tar.xz 614000 BLAKE2B 5eaad3a34447aefb080f9c0ff5170d111a318c8dc6866807aedbcfb014113877a2b8f6b4b80ec4ad8a35e2ed01a0bf0bc2bdcee1474ba4d7759180d0fbe77124 SHA512 6f1c8090bd94fa09c057799938c92d1cad1ac1638944727196ce5cc172d5a41f3f7121bc0b28ad07172b65108a8ae17086e6503b9bc4a20e2662c40f6d65f765
 EBUILD chromium-126.0.6478.126.ebuild 48104 BLAKE2B e0193ac2d2e26c46a62281581b0b6a4b2a9a438edcfe075d729a84ffd4413e26ae0bd6c4ff90a0c05934f610b90fad1310167ad65c0032c01a1d3343fc30b6aa SHA512 70a207aaea416e392d6b8e39024a31c01ded76e08f0135a388ccdb26e9ed02cb65114d09706927fc2dba153b921def3380c2938123bcadd3057db076fc048593
-EBUILD chromium-127.0.6533.26.ebuild 45914 BLAKE2B d8da08a94c5022dfc306e9b04c5d412a1bb8668392e71d935affd65c7bde95ba010f64ed8dce4570453aaf5089f03b8b416fe3db5bdbeba1dedcca9613991ffb SHA512 bdfbeecd56b7b1508d168994577f03de7408231a980b0b094b1c7a4be572894b08b6f9d1f6727a92d3cb49d6d67e085d0b92bd96b3ce7100994519998d3c762c
+EBUILD chromium-126.0.6478.182.ebuild 48106 BLAKE2B 7bd62e34eb8a84fa205c0eec9e7e061e4568924bd2a6424e71cb4a8f2ff59ff6a9b53bc60184809ba7ae2cef06a2339fdda2dd7e2eb1bb3e85789beed3c8c1f7 SHA512 3fcb38b0ba3e9a9a3d8b26259d168f4b4282fe381aa2d9f88f2b3181f25bf4eb7ca32238dce0a4908f33688b97614625c3e1b904f16cb66f904b116116968670
 EBUILD chromium-127.0.6533.43.ebuild 45890 BLAKE2B 03f585bc8ab09d6fa840281e08956471d3a575c28bb174234aaf4da37f23a1f6af6275db7fd103c38568279f1b98fd42c7afe19637f1d34a8eac3df7b5aaf1b5 SHA512 0119595c337f4192ba890f6909b46c8257a86336263ec1636b19d5585d287b7331d702e7c5d7f2ee77b4429c10ac440291d281ad283fccf273114531052f36c4
 MISC metadata.xml 2249 BLAKE2B 42e914e06d12ce6ebff4251fa81c28970676bb6cad7e9b1591dbbf79e45a8805fad6ee3bfb7c1b81f47e91e101091fbfcd565a0cc47f8280b9f169559ca61f2c SHA512 a30553dc4878fdb70546a1dbcb8c38ac42b0bddd500e1d09ba5a8414f681b3304e9a6a02e734c1e7eb58e782f30f6390be97b4a22996788e7639e8a9feb01ee9
diff --git a/www-client/chromium/chromium-127.0.6533.26.ebuild b/www-client/chromium/chromium-126.0.6478.182.ebuild
index f3ac63017ee6..a3a310425b93 100644
--- a/www-client/chromium/chromium-127.0.6533.26.ebuild
+++ b/www-client/chromium/chromium-126.0.6478.182.ebuild
@@ -3,6 +3,9 @@
 
 EAPI=8
 
+PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_REQ_USE="xml(+)"
+
 # PACKAGING NOTES
 
 # Google roll their bundled Clang every two weeks, and the bundled Rust
@@ -11,6 +14,14 @@ EAPI=8
 # the bundled Clang due to the use of prerelease features. We've been lucky
 # enough so far that this hasn't been an issue.
 
+# We try and avoid forcing the use of the custom/bundled libcxx, but sometimes
+# it is unavoidable. Remember to force the use of Clang when this is forced.
+
+# GCC is _not_ supported upstream, though patches are welcome. We do our
+# best to enable builds with GCC but reserve the right to force Clang
+# builds if we can't keep up with upstream's changes. Please comment
+# when forcing Clang builds so we can track the need for it.
+
 # GN is bundled with Chromium, but we always use the system version. Remember to
 # check for upstream changes to GN and update ebuild (and version below) as required.
 
@@ -23,11 +34,26 @@ EAPI=8
 # For non-binhost builds, we build the bundled ffmpeg and enable proprietary codecs because there's
 # no reason not to. Todo: Re-enable USE=system-ffmpeg.
 
+# These variables let us easily bound supported major dependency versions in one place.
+GCC_MIN_VER=12
 GN_MIN_VER=0.2165
-RUST_MIN_VER=1.78.0
+# Since Google use prerelease llvm we can let any adventurous users try to build with prerelease
+# ebuilds; try to keep this up to date with the latest version in the tree.
+LLVM_MAX_SLOT=19
+LLVM_MIN_SLOT=17
+RUST_MIN_VER=1.72.0
 # chromium-tools/get-chromium-toolchain-strings.sh
-GOOGLE_CLANG_VER=llvmorg-19-init-10646-g084e2b53-57
-GOOGLE_RUST_VER=32dd3795bce8b347fda786529cf5e42a813e0b7d-2
+GOOGLE_CLANG_VER=llvmorg-19-init-9433-g76ea5feb-1
+GOOGLE_RUST_VER=31e6e8c6c5b6ce62656c922c7384d3376018c980-2
+
+# https://bugs.chromium.org/p/v8/issues/detail?id=14449 - V8 used in 120 can't build with GCC
+# Resolved upstream, requires testing and some backporting I'm sure
+: ${CHROMIUM_FORCE_CLANG=yes}
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101227 - Chromium 120:
+#    webrtc -  no matching member function for call to 'emplace'
+: ${CHROMIUM_FORCE_LIBCXX=yes}
+# 121's 'gcc_link_wrapper.py' currently fails if not using lld due to the addition of rust
+: ${CHROMIUM_FORCE_LLD=yes}
 
 : ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN=no}
 
@@ -37,18 +63,12 @@ CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu
 	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
 	sv sw ta te th tr uk ur vi zh-CN zh-TW"
 
-# Since Google use prerelease llvm we can let any adventurous users try to build with prerelease
-# ebuilds; try to keep this up to date with the latest version in the tree.
-LLVM_COMPAT=( {17..18} )
-PYTHON_COMPAT=( python3_{11..13} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit check-reqs chromium-2 desktop flag-o-matic llvm-r1 ninja-utils pax-utils
+inherit check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils
 inherit python-any-r1 qmake-utils readme.gentoo-r1 systemd toolchain-funcs virtualx xdg-utils
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://www.chromium.org/"
-PATCHSET_PPC64="124.0.6367.207-1raptor0~deb12u1"
+PATCHSET_PPC64="126.0.6478.126-1raptor0~deb12u1"
 PATCH_V="${PV%%\.*}"
 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
 	system-toolchain? (
@@ -57,7 +77,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 	!system-toolchain? (
 		https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/clang-${GOOGLE_CLANG_VER}.tar.xz
 			-> chromium-${PV%%\.*}-clang.tar.xz
-		https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/rust-toolchain-${GOOGLE_RUST_VER}-${GOOGLE_CLANG_VER%???}.tar.xz
+		https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/rust-toolchain-${GOOGLE_RUST_VER}-${GOOGLE_CLANG_VER%??}.tar.xz
 			-> chromium-${PV%%\.*}-rust.tar.xz
 	)
 	ppc64? (
@@ -67,19 +87,19 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
 
 LICENSE="BSD"
-SLOT="0/beta"
-KEYWORDS="~amd64 ~arm64"
+SLOT="0/stable"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
 IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
-IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +lto +official pax-kernel pgo +proprietary-codecs pulseaudio"
+IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos libcxx +lto +official pax-kernel pgo +proprietary-codecs pulseaudio"
 IUSE+=" qt5 qt6 +screencast selinux +system-toolchain +vaapi +wayland +widevine"
 RESTRICT="!bindist? ( bindist )"
 
 REQUIRED_USE="
 	!headless? ( || ( X wayland ) )
-	official? ( lto )
 	pgo? ( X !wayland )
 	qt6? ( qt5 )
 	screencast? ( wayland )
+	!system-toolchain? ( libcxx )
 	ffmpeg-chromium? ( bindist proprietary-codecs )
 "
 
@@ -180,6 +200,34 @@ DEPEND="${COMMON_DEPEND}
 	)
 "
 
+depend_clang_llvm_version() {
+	echo "sys-devel/clang:$1"
+	echo "sys-devel/llvm:$1"
+	echo "=sys-devel/lld-$1*"
+}
+
+# When passed multiple arguments we assume that
+# we want a range of versions, inclusive.
+depend_clang_llvm_versions() {
+	local _v
+	if [[ $# -eq 1 ]]; then
+		depend_clang_llvm_version "$1"
+	elif [[ $# -eq 2 ]]; then
+		if [[ $1 -eq $2 ]]; then
+			depend_clang_llvm_version "$1"
+		fi
+		echo "|| ("
+		for ((i=$1; i<=$2; i++)); do
+			echo "("
+			depend_clang_llvm_version "${i}"
+			echo ")"
+		done
+		echo ")"
+	else
+		die "depend_clang_llvm_versions() requires 1 or 2 arguments"
+	fi
+}
+
 BDEPEND="
 	${COMMON_SNAPSHOT_DEPEND}
 	${PYTHON_DEPS}
@@ -192,18 +240,14 @@ BDEPEND="
 		qt6? ( dev-qt/qtbase:6 )
 	)
 	system-toolchain? (
-		$(llvm_gen_dep '
-			sys-devel/clang:${LLVM_SLOT}
-			sys-devel/llvm:${LLVM_SLOT}
-			sys-devel/lld:${LLVM_SLOT}
-			virtual/rust:0/llvm-${LLVM_SLOT}[profiler(-)]
-			pgo? ( sys-libs/compiler-rt-sanitizers:${LLVM_SLOT}[profile] )
-		')
+		libcxx? ( >=sys-devel/clang-${LLVM_MIN_SLOT} )
+		lto? ( $(depend_clang_llvm_versions ${LLVM_MIN_SLOT} ${LLVM_MAX_SLOT}) )
 		pgo? (
 			>=dev-python/selenium-3.141.0
 			>=dev-util/web_page_replay_go-20220314
+			$(depend_clang_llvm_versions ${LLVM_MIN_SLOT} ${LLVM_MAX_SLOT})
 		)
-		dev-util/bindgen
+		>=virtual/rust-${RUST_MIN_VER}[profiler(-)]
 	)
 	>=dev-build/gn-${GN_MIN_VER}
 	dev-build/ninja
@@ -216,6 +260,17 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+="system-toolchain? ( >=sys-devel/clang-${LLVM_MIN_SLOT} ) "
+fi
+
+if [[ ${CHROMIUM_FORCE_LLD} == yes ]]; then
+	BDEPEND+="system-toolchain? ( >=sys-devel/lld-${LLVM_MIN_SLOT} ) "
+else
+	# #918897: Hack for arm64
+	BDEPEND+=" arm64? ( >=sys-devel/lld-${LLVM_MIN_SLOT} )"
+fi
+
 if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
 	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
 fi
@@ -253,6 +308,30 @@ python_check_deps() {
 	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
 }
 
+needs_clang() {
+	[[ ${CHROMIUM_FORCE_CLANG} == yes ]] || use libcxx || use lto || use pgo
+}
+
+needs_lld() {
+	# #641556: Force lld for lto and pgo builds, otherwise disable
+	# #918897: Temporary hack w/ use arm64
+	[[ ${CHROMIUM_FORCE_LLD} == yes ]] || use lto || use pgo || use arm64
+}
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if ( use lto || use pgo ) && ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
+		einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
 pre_build_checks() {
 	# Check build requirements: bugs #471810, #541816, #914220
 	# We're going to start doing maths here on the size of an unpacked source tarball,
@@ -295,31 +374,34 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	ewarn "PATH = ${PATH}"
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
 		pre_build_checks
 
 		if use system-toolchain; then
-			# The linux:unbundle toolchain in GN grabs CC, CXX, CPP (etc) from the environment
-			# We'll set these to clang here then let llvm-r1_pkg_setup reconfigure them to be
-			# specific to the selected slot.
-			# 935689 - call llvm-r1_pkg_setup once to make sure that PATH is set then again
-			# to make sure that CC and friends get updated appropriately.
-			llvm-r1_pkg_setup
-			AR=llvm-ar
-			CPP="${CHOST}-clang++ -E"
-			NM=llvm-nm
-			CC=${CHOST}-clang
-			CXX=${CHOST}-clang++
-
-			if tc-is-cross-compiler; then
-				use pgo && die "The pgo USE flag cannot be used when cross-compiling"
-				CPP="${CBUILD}-clang++ -E"
+			local -x CPP="$(tc-getCXX) -E"
+			if tc-is-gcc && ! ver_test "$(gcc-version)" -ge ${GCC_MIN_VER}; then
+				die "At least gcc ${GCC_MIN_VER} is required"
+			fi
+			if use pgo && tc-is-cross-compiler; then
+				die "The pgo USE flag cannot be used when cross-compiling"
+			fi
+			if needs_clang && ! tc-is-clang; then
+				if tc-is-cross-compiler; then
+					CPP="${CBUILD}-clang++ -E"
+				else
+					CPP="${CHOST}-clang++ -E"
+				fi
+			fi
+			if needs_clang || tc-is-clang; then
+				if ver_test "$(clang-major-version)" -lt ${LLVM_MIN_SLOT}; then
+					die "At least Clang ${LLVM_MIN_SLOT} is required"
+				fi
+				# Ideally we never see this, but it should help prevent bugs like 927154
+				if ver_test "$(clang-major-version)" -gt ${LLVM_MAX_SLOT}; then
+					die "Clang $(clang-major-version) is too new; ${LLVM_MAX_SLOT} is the highest supported version"
+				fi
 			fi
-
-			llvm-r1_pkg_setup
-
 		fi
 		# Users should never hit this, it's purely a development convenience
 		if ver_test $(gn --version || die) -lt ${GN_MIN_VER}; then
@@ -330,30 +412,6 @@ pkg_setup() {
 	chromium_suid_sandbox_check_kernel_config
 }
 
-src_unpack() {
-	# In 126 Chromium upstream decided to change the way that the rust toolchain is packaged
-	# so now we get a fancy src_unpack function to ensure that we don't accidentally unpack
-	# one toolchain over the other. The addtional control over over unpacking also helps us
-	# ensure that GN doesn't try and use some bundled tool (like bindgen) instead of the system
-	# package by just not unpacking it unless we're using the bundled toolchain.
-	unpack ${P}.tar.xz
-	if use system-toolchain; then
-		unpack chromium-patches-${PATCH_V}.tar.bz2
-	else
-		unpack chromium-${PV%%\.*}-clang.tar.xz
-		local rust_dir="${WORKDIR}/rust-toolchain"
-		mkdir -p ${rust_dir} || die "Failed to create rust toolchain directory"
-		tar xf "${DISTDIR}/chromium-${PV%%\.*}-rust.tar.xz" -C ${rust_dir} || die "Failed to unpack rust toolchain"
-	fi
-
-	use pgo && unpack chromium-profiler-0.2.tar
-
-	if use ppc64; then
-		unpack chromium_${PATCHSET_PPC64}.debian.tar.xz
-		unpack chromium-ppc64le-gentoo-patches-1.tar.xz
-	fi
-}
-
 src_prepare() {
 	# Calling this here supports resumption via FEATURES=keepwork
 	python_setup
@@ -364,20 +422,13 @@ src_prepare() {
 		"chrome/browser/media/router/media_router_feature.cc" || die
 
 	local PATCHES=(
-		"${FILESDIR}/chromium-cross-compile.patch"
 		"${FILESDIR}/chromium-109-system-zlib.patch"
 		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
+		"${FILESDIR}/chromium-125-system-zstd.patch"
 		"${FILESDIR}/chromium-126-oauth2-client-switches.patch"
-		"${FILESDIR}/chromium-127-browser-ui-deps.patch"
-		"${FILESDIR}/chromium-127-bindgen-custom-toolchain.patch"
+		"${FILESDIR}/chromium-cross-compile.patch"
 	)
 
-	# 127: test deps are broken for ui/lens with system ICU "//third_party/icu:icuuc_public"
-	sed -i '/source_set("unit_tests") {/,/}/d' \
-		chrome/browser/ui/lens/BUILD.gn || die "Failed to remove bad test target"
-	sed -i '/lens:unit_tests/d' chrome/test/BUILD.gn components/BUILD.gn \
-		|| die "Failed to remove dependencies on bad target"
-
 	if use system-toolchain; then
 		# The patchset is really only required if we're using the system-toolchain
 		PATCHES+=( "${WORKDIR}/chromium-patches-${PATCH_V}" )
@@ -409,7 +460,7 @@ src_prepare() {
 
 	default
 
-	rm third_party/node/linux/node-linux-x64/bin/node || die
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
 	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
 
 	# adjust python interpreter version
@@ -422,6 +473,7 @@ src_prepare() {
 		base/third_party/nspr
 		base/third_party/superfasthash
 		base/third_party/symbolize
+		base/third_party/valgrind
 		base/third_party/xdg_user_dirs
 		buildtools/third_party/libc++
 		buildtools/third_party/libc++abi
@@ -440,8 +492,8 @@ src_prepare() {
 		third_party/anonymous_tokens
 		third_party/apple_apsl
 		third_party/axe-core
-		third_party/bidimapper
 		third_party/blink
+		third_party/bidimapper
 		third_party/boringssl
 		third_party/boringssl/src/third_party/fiat
 		third_party/breakpad
@@ -466,7 +518,6 @@ src_prepare() {
 		third_party/closure_compiler
 		third_party/content_analysis_sdk
 		third_party/cpuinfo
-		third_party/crabbyavif
 		third_party/crashpad
 		third_party/crashpad/crashpad/third_party/lss
 		third_party/crashpad/crashpad/third_party/zlib
@@ -498,7 +549,6 @@ src_prepare() {
 		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/rxjs
 		third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data
 		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/front_end/third_party/web-vitals
 		third_party/devtools-frontend/src/third_party
 		third_party/distributed_point_functions
 		third_party/dom_distiller_js
@@ -513,12 +563,15 @@ src_prepare() {
 		third_party/freetype
 		third_party/fusejs
 		third_party/fxdiv
+		third_party/highway
+		third_party/liburlpattern
+		third_party/libzip
+		third_party/lit
 		third_party/gemmlowp
 		third_party/google_input_tools
 		third_party/google_input_tools/third_party/closure_library
 		third_party/google_input_tools/third_party/closure_library/third_party/closure
 		third_party/googletest
-		third_party/highway
 		third_party/hunspell
 		third_party/iccjpeg
 		third_party/inspector_protocol
@@ -536,7 +589,6 @@ src_prepare() {
 		third_party/libaom/source/libaom/third_party/vector
 		third_party/libaom/source/libaom/third_party/x86inc
 		third_party/libavif
-		third_party/libc++
 		third_party/libevent
 		third_party/libgav1
 		third_party/libjingle
@@ -545,7 +597,6 @@ src_prepare() {
 		third_party/libsrtp
 		third_party/libsync
 		third_party/libudev
-		third_party/liburlpattern
 		third_party/libva_protected_content
 		third_party/libvpx
 		third_party/libvpx/source/libvpx/third_party/x86inc
@@ -554,12 +605,13 @@ src_prepare() {
 		third_party/libxcb-keysyms
 		third_party/libxml/chromium
 		third_party/libyuv
-		third_party/libzip
-		third_party/lit
 		third_party/lottie
 		third_party/lss
 		third_party/lzma_sdk
 		third_party/mako
+		third_party/maldoca
+		third_party/maldoca/src/third_party/tensorflow_protos
+		third_party/maldoca/src/third_party/zlibwrapper
 		third_party/markupsafe
 		third_party/material_color_utilities
 		third_party/mesa
@@ -586,12 +638,11 @@ src_prepare() {
 		third_party/pdfium/third_party/libtiff
 		third_party/perfetto
 		third_party/perfetto/protos/third_party/chromium
-		third_party/perfetto/protos/third_party/simpleperf
 		third_party/pffft
 		third_party/ply
 		third_party/polymer
-		third_party/private_membership
 		third_party/private-join-and-compute
+		third_party/private_membership
 		third_party/protobuf
 		third_party/pthreadpool
 		third_party/puffin
@@ -601,7 +652,6 @@ src_prepare() {
 		third_party/re2
 		third_party/rnnoise
 		third_party/rust
-		third_party/ruy
 		third_party/s2cellid
 		third_party/securemessage
 		third_party/selenium-atoms
@@ -609,22 +659,19 @@ src_prepare() {
 		third_party/sentencepiece/src/third_party/darts_clone
 		third_party/shell-encryption
 		third_party/simplejson
-		third_party/six
 		third_party/skia
 		third_party/skia/include/third_party/vulkan
 		third_party/skia/third_party/vulkan
 		third_party/smhasher
 		third_party/snappy
-		third_party/spirv-headers
-		third_party/spirv-tools
 		third_party/sqlite
 		third_party/swiftshader
 		third_party/swiftshader/third_party/astc-encoder
 		third_party/swiftshader/third_party/llvm-subzero
 		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/subzero
 		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
 		third_party/swiftshader/third_party/SPIRV-Tools
-		third_party/swiftshader/third_party/subzero
 		third_party/tensorflow_models
 		third_party/tensorflow-text
 		third_party/tflite
@@ -632,6 +679,8 @@ src_prepare() {
 		third_party/tflite/src/third_party/fft2d
 		third_party/tflite/src/third_party/xla/third_party/tsl
 		third_party/tflite/src/third_party/xla/xla/tsl/util
+		third_party/ruy
+		third_party/six
 		third_party/ukey2
 		third_party/unrar
 		third_party/utf
@@ -653,12 +702,12 @@ src_prepare() {
 		third_party/x11proto
 		third_party/xcbproto
 		third_party/xnnpack
-		third_party/zlib/google
 		third_party/zxcvbn-cpp
+		third_party/zlib/google
 		url/third_party/mozilla
 		v8/src/third_party/siphash
-		v8/src/third_party/utf8-decoder
 		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
 		v8/third_party/glibc
 		v8/third_party/inspector_protocol
 		v8/third_party/v8
@@ -686,6 +735,10 @@ src_prepare() {
 		keeplibs+=( third_party/zstd )
 	fi
 
+	if use libcxx || [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		keeplibs+=( third_party/libc++ )
+	fi
+
 	if ! use system-toolchain || [[ ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN} == yes ]]; then
 			keeplibs+=( third_party/llvm )
 	fi
@@ -740,26 +793,53 @@ chromium_configure() {
 
 	local myconf_gn=""
 
-	# We already forced the correct clang via {llvm-r1_}pkg_setup
-	if use system-toolchain; then
-		if tc-is-cross-compiler; then
-			CC="${CC} -target ${CHOST} --sysroot ${ESYSROOT}"
-			CXX="${CXX} -target ${CHOST} --sysroot ${ESYSROOT}"
-			BUILD_AR=${AR}
-			BUILD_CC=${CC}
-			BUILD_CXX=${CXX}
-			BUILD_NM=${NM}
+	if use system-toolchain && [[ ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN} == no ]]; then
+		# Make sure the build system will use the right tools, bug #340795.
+		tc-export AR CC CXX NM
+
+		if needs_clang && ! tc-is-clang; then
+			# Force clang since gcc is either broken or build is using libcxx.
+			if tc-is-cross-compiler; then
+				CC="${CBUILD}-clang -target ${CHOST} --sysroot ${ESYSROOT}"
+				CXX="${CBUILD}-clang++ -target ${CHOST} --sysroot ${ESYSROOT}"
+				BUILD_CC=${CBUILD}-clang
+				BUILD_CXX=${CBUILD}-clang++
+			else
+				CC=${CHOST}-clang
+				CXX=${CHOST}-clang++
+			fi
+			strip-unsupported-flags
 		fi
 
-		strip-unsupported-flags
+		if tc-is-clang; then
+			myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+			# Workaround for build failure with clang-18 and -march=native without
+			# avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
+			use amd64 && is-flagq -march=native &&
+				[[ $(clang-major-version) -eq 18 ]] && [[ $(clang-minor-version) -lt 6 ]] &&
+				tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
+				append-flags -mevex512
+		else
+			myconf_gn+=" is_clang=false"
+		fi
 
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-		# https://bugs.gentoo.org/918897#c32
-		append-ldflags -Wl,--undefined-version
-		myconf_gn+=" use_lld=true"
+		if needs_lld ; then
+			# https://bugs.gentoo.org/918897#c32
+			append-ldflags -Wl,--undefined-version
+			myconf_gn+=" use_lld=true"
+		else
+			# This doesn't prevent lld from being used, but rather prevents gn from forcing it
+			myconf_gn+=" use_lld=false"
+		fi
 
-		# Make sure the build system will use the right tools, bug #340795.
-		tc-export AR CC CXX NM
+		if use lto; then
+			AR=llvm-ar
+			NM=llvm-nm
+			if tc-is-cross-compiler; then
+				BUILD_AR=llvm-ar
+				BUILD_NM=llvm-nm
+			fi
+		fi
 
 		myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
 
@@ -783,17 +863,6 @@ chromium_configure() {
 			myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
 		fi
 
-		# bindgen settings
-		# From 127, to make bindgen work, we need to provide a location for libclang.
-		# We patch this in for gentoo - see chromium-*-bindgen-custom-toolchain.patch
-		# rust_bindgen_root = directory with `bin/bindgen` beneath it.
-		myconf_gn+=" rust_bindgen_root=\"${EPREFIX}/usr/\""
-		myconf_gn+=" bindgen_libclang_path=\"$(get_llvm_prefix)/$(get_libdir)\""
-		# We don't need to set 'clang_base_bath' for anything in our build
-		# and it defaults to the google toolchain location. Instead provide a location
-		# to where system clang lives sot that bindgen can find system headers (e.g. stddef.h)
-		myconf_gn+=" clang_base_path=\"${EPREFIX}/usr/lib/clang/${LLVM_SLOT}/\""
-
 		local rustc_ver
 		rustc_ver=$(chromium_rust_version_check)
 		if ver_test "${rustc_ver}" -lt "${RUST_MIN_VER}"; then
@@ -892,13 +961,20 @@ chromium_configure() {
 	# Chromium builds provided by Linux distros) should disable the testing config
 	myconf_gn+=" disable_fieldtrial_testing_config=true"
 
+	if use system-toolchain; then
+		myconf_gn+=" use_gold=false"
+	fi
+
 	# The sysroot is the oldest debian image that chromium supports, we don't need it
 	myconf_gn+=" use_sysroot=false"
 
-	# Use in-tree libc++ (buildtools/third_party/libc++ and buildtools/third_party/libc++abi)
-	# instead of the system C++ library for C++ standard library support.
-	# default: true, but let's be explicit (forced since 120 ; USE removed 127).
-	myconf_gn+=" use_custom_libcxx=true"
+	# This determines whether or not GN uses the bundled libcxx
+	# default: true
+	if use libcxx || [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		myconf_gn+=" use_custom_libcxx=true"
+	else
+		myconf_gn+=" use_custom_libcxx=false"
+	fi
 
 	# Disable pseudolocales, only used for testing
 	myconf_gn+=" enable_pseudolocales=false"
@@ -946,6 +1022,13 @@ chromium_configure() {
 		if [[ ${myarch} == amd64 ]]; then
 			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a
 		fi
+
+		if tc-is-gcc; then
+			# https://bugs.gentoo.org/904455
+			local -x CPP="$(tc-getCXX) -E"
+			# https://bugs.gentoo.org/912381
+			filter-lto
+		fi
 	fi
 
 	if [[ $myarch = amd64 ]] ; then
@@ -961,7 +1044,11 @@ chromium_configure() {
 		die "Failed to determine target arch, got '$myarch'."
 	fi
 
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
 	myconf_gn+=" treat_warnings_as_errors=false"
+
 	# Disable fatal linker warnings, bug 506268.
 	myconf_gn+=" fatal_linker_warnings=false"
 
@@ -983,12 +1070,13 @@ chromium_configure() {
 	# https://bugs.gentoo.org/654216
 	addpredict /dev/dri/ #nowarn
 
-	# We don't use the same clang version as upstream, and with -Werror
-	# we need to make sure that we don't get superfluous warnings.
-	append-flags -Wno-unknown-warning-option
-	if tc-is-cross-compiler; then
+	# Disable unknown warning message from clang.
+	if tc-is-clang; then
+		append-flags -Wno-unknown-warning-option
+		if tc-is-cross-compiler; then
 			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
 			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
+		fi
 	fi
 
 	# Explicitly disable ICU data file support for system-icu/headless builds.
@@ -1057,7 +1145,7 @@ chromium_configure() {
 		# Allow building against system libraries in official builds
 		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
 			tools/generate_shim_headers/generate_shim_headers.py || die
-		# Req's LTO; handled by REQUIRED_USE - TODO: not compatible with -fno-split-lto-unit
+		# Disable CFI: unsupported for GCC, requires clang+lto+lld
 		myconf_gn+=" is_cfi=false"
 		# Don't add symbols to build
 		myconf_gn+=" symbol_level=0"
@@ -1073,6 +1161,12 @@ chromium_configure() {
 		myconf_gn+=" chrome_pgo_phase=0"
 	fi
 
+	# user CXXFLAGS might overwrite -march=armv8-a+crc+crypto, bug #851639
+	if use arm64 && tc-is-gcc; then
+		sed -i '/^#if HAVE_ARM64_CRC32C/a #pragma GCC target ("+crc+crypto")' \
+			third_party/crc32c/src/src/crc32c_arm64.cc || die
+	fi
+
 	# skipping typecheck is only supported on amd64, bug #876157
 	if ! use amd64; then
 		myconf_gn+=" devtools_skip_typecheck=false"
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index d6f15a6f3450..8f4b1a7940f8 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_127.0.6533.43-1_amd64.deb 109226720 BLAKE2B d6871b409569e3a305630f3c7337ec81e213f91d8528ac03d430227ba6012f1f4189cec57020d6f28d9aa7c7a0c824ee43f5f8d88debe8b287e9f59bcee0b90f SHA512 e65a0548e86fdf281227b1b889dcfad76167a038ce4e5a6818aae7ab794d8fdd9e88c6ad114b3ff7dc8cc24eea21ae1cd0d4cc8cf5aaee25a9fbd52fa0d873dd
-EBUILD google-chrome-beta-127.0.6533.43.ebuild 2983 BLAKE2B c0683d291bd6459daf64a35c34b4d56824b1c1119afe758af8bc18dc2a3625f16c5e94b4a137a8fd5b7673d36d3b6e559df17269ad3dce405643edb809137e10 SHA512 b00a89fbd7d0d9dd1a999ae2b01b7aec9ad2b6e7b9bde8727e22b9a35769da5ed7fe351fcca6681e02007380662b0688a2990f205b1dfed8effb91d991ab21d4
+DIST google-chrome-beta_127.0.6533.57-1_amd64.deb 109188896 BLAKE2B 2f73db42f57a40be97889b182bccc43e31981de4a25eb6a9472b85f0dfe56cafd91df60c3472c7e047ff13ecbd8707b7327f7c5b2486bc7a354c06fbed5e06d9 SHA512 e37f93e1a4c5839e6cfd52d9c19430a9d09e6acec6f35e74cd38d27f78c4e189ec66486ef8ea46b61ef4e7aa89fc744aa70892f42f11a539c67f99df8b52fe70
+EBUILD google-chrome-beta-127.0.6533.57.ebuild 2983 BLAKE2B c0683d291bd6459daf64a35c34b4d56824b1c1119afe758af8bc18dc2a3625f16c5e94b4a137a8fd5b7673d36d3b6e559df17269ad3dce405643edb809137e10 SHA512 b00a89fbd7d0d9dd1a999ae2b01b7aec9ad2b6e7b9bde8727e22b9a35769da5ed7fe351fcca6681e02007380662b0688a2990f205b1dfed8effb91d991ab21d4
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-beta/google-chrome-beta-127.0.6533.43.ebuild b/www-client/google-chrome-beta/google-chrome-beta-127.0.6533.57.ebuild
index dd9e9c497aea..dd9e9c497aea 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-127.0.6533.43.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-127.0.6533.57.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 1789af916b98..1f28edc441b7 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_128.0.6559.0-1_amd64.deb 109921208 BLAKE2B 55a225f2e5cd32b4f22d36e4622ccf0b37a7d159993fcc1de181e24bf579f93e327b5ec10516b1cf64ef0a91d1c17b3f7c157f15d8efa6851d2f6290d3bc26d1 SHA512 e9e730be7506897d3ed85e90db016dbd9615850a0f72058746d1bd79747a54f5e08663430b6d74627229d2af27bc3141d0ee11077da07287f2b8b2702bd3fca3
-EBUILD google-chrome-unstable-128.0.6559.0.ebuild 2983 BLAKE2B c0683d291bd6459daf64a35c34b4d56824b1c1119afe758af8bc18dc2a3625f16c5e94b4a137a8fd5b7673d36d3b6e559df17269ad3dce405643edb809137e10 SHA512 b00a89fbd7d0d9dd1a999ae2b01b7aec9ad2b6e7b9bde8727e22b9a35769da5ed7fe351fcca6681e02007380662b0688a2990f205b1dfed8effb91d991ab21d4
+DIST google-chrome-unstable_128.0.6585.0-1_amd64.deb 110270616 BLAKE2B 3e71610836409645422d9041dc4aeafcaa0c68ee5f1e0ce9275759b8cfc9d58d9c9e7182d1ebbbad6752ed82212933b9ff705041f88cc4382eb1316bfb5d7ec3 SHA512 6999db35e87788db360506dfa119c3689b2f1bed811b591fa5be690af9b5173f9999f7a3a38a974c8d132188b3d2338a23395f85ed222f6f69bee68bc3518d13
+EBUILD google-chrome-unstable-128.0.6585.0.ebuild 2983 BLAKE2B c0683d291bd6459daf64a35c34b4d56824b1c1119afe758af8bc18dc2a3625f16c5e94b4a137a8fd5b7673d36d3b6e559df17269ad3dce405643edb809137e10 SHA512 b00a89fbd7d0d9dd1a999ae2b01b7aec9ad2b6e7b9bde8727e22b9a35769da5ed7fe351fcca6681e02007380662b0688a2990f205b1dfed8effb91d991ab21d4
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-128.0.6559.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-128.0.6585.0.ebuild
index dd9e9c497aea..dd9e9c497aea 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-128.0.6559.0.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-128.0.6585.0.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 8218ccdf8501..85efa6411bdf 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_126.0.6478.126-1_amd64.deb 108773084 BLAKE2B 4e59333e6073b2b7320b50551a6241fc402509398a404742e63ccde60dce3a9c8d5a490a0b9fb4a9a409562ee4ea078ac1a6d441b0ead94bd40792b16afa48f9 SHA512 cae09818d2032253e1d9a8e58dfde53d56bb4fd63de0b7ad89bc6558da66103220057dce331ae519fa79e7ec140f116bc8d3e10200eb9845bb278aeaf3cf5d95
-EBUILD google-chrome-126.0.6478.126.ebuild 2982 BLAKE2B 94c28a910834b70ccfa642f6e5372dce9e534bf5b9c210516958e8cd96c4b8e042d360a9fa5c85d13cbe4b152a26b7751f5f87ab832002fe21e83f2cdf03f47e SHA512 23c9d78446da4b7ceef659dd659af367733abb766207e343fc991122d13744e3d67b0919d9d6371df5fc43815301c062087e1ce8d685e41ad0613e352b8c96ee
+DIST google-chrome-stable_126.0.6478.182-1_amd64.deb 108772160 BLAKE2B 8f4a95894a440f64654d5247c32468379b986b7629c5acc33c15e6239f5795d2cb1c781bdab4b071337400156ad3b9bdc9c7b295e7c733b959b77eba6f4ccbef SHA512 3e3e2a41aead21afb612f5d23e6d0538c85b290265f66c481530939b77968642d67c3215b34beb05f0ba8104945a76a1ed53169e38cfffaf3fe92370ddbcf141
+EBUILD google-chrome-126.0.6478.182.ebuild 2982 BLAKE2B 94c28a910834b70ccfa642f6e5372dce9e534bf5b9c210516958e8cd96c4b8e042d360a9fa5c85d13cbe4b152a26b7751f5f87ab832002fe21e83f2cdf03f47e SHA512 23c9d78446da4b7ceef659dd659af367733abb766207e343fc991122d13744e3d67b0919d9d6371df5fc43815301c062087e1ce8d685e41ad0613e352b8c96ee
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome/google-chrome-126.0.6478.126.ebuild b/www-client/google-chrome/google-chrome-126.0.6478.182.ebuild
index a6673ff33b80..a6673ff33b80 100644
--- a/www-client/google-chrome/google-chrome-126.0.6478.126.ebuild
+++ b/www-client/google-chrome/google-chrome-126.0.6478.182.ebuild
diff --git a/www-client/microsoft-edge-beta/Manifest b/www-client/microsoft-edge-beta/Manifest
index 50abcdebf8f9..701afd2bc526 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-beta_127.0.2651.15-1_amd64.deb 166274998 BLAKE2B 68b5e24fb80c0b9069e13349b05a44f5b2e8cfa5aa41256b4c0bf35ccb8a32da6d1fbb52620f81a873afd63a816ecc3da9a146b83fd2e24f601240c4cbcf674c SHA512 6121ac0e214b10235317ca4909668c49ad39e8be37f023a753df4ea01f2c16e6e36f7852a692fc1181e182d938fb6a2b4ffd46453ec330fa3b29a93bd09d9e46
 DIST microsoft-edge-beta_127.0.2651.31-1_amd64.deb 166291494 BLAKE2B 6a444905f2a7d8f7f28b86205196d6d08622d293297f034d9431f5e680e915c742e4109afcc5fbcd8796e76add68d311850f3e3315c69e1cdefeb1842f20173b SHA512 0743b3a68626093559b6a587923bb51eb2d8f8989de36984f1a3bb8dd5167454217048a989c4364aeaa01fb075de5e46d709cda8bfbadf975e1bc94892035bb7
 DIST microsoft-edge-beta_127.0.2651.45-1_amd64.deb 167081034 BLAKE2B ec49bb538a7edbf10344ac7caf91a1b4d00db22483e6d06bbb076b4634090a6d8c584f5dcd4f79b243cb610e784345a9804e3bd4014f4368959b6561a80a643e SHA512 2c6b69f05c61801698fcc5abe304e65699772dffa063c89bda7d5f9c53070f570a4920d6c3f85d83a07a4ec25de04169effac19ad02bf6c2f0fc30a78585f9d6
-EBUILD microsoft-edge-beta-127.0.2651.15.ebuild 2712 BLAKE2B e4c40954c5106692f7b454e32c79e47cdc99c09b2e1aa02a263951adcafb56ef2179235210e2c1c4a24b7571338c9329d46bf7c5fa8430284be2e1d2eb447148 SHA512 1d1a784a1b19db517d78db66fd8457b5dbfe803f852cf82d7137bd18f624618e91016f38f571e0d848542a17788d01685228863fb005cc8de4bbb96381e3044b
+DIST microsoft-edge-beta_127.0.2651.49-1_amd64.deb 167190014 BLAKE2B b35632e690895a75c3cab7a61b9c032a6281b08de59bde1692728b160c216e43a39369387cae06f6c3f444cb32323319e987b97cc951f5da8c4a629523468baf SHA512 b69190dcc89b09caf44a261844f358b256e6a74a08d95730ad2ce7bf4ff728cefef25b02a0a51e031d578f5bec25bdec9d6bb93ee866332c55b8370fa7e5528a
 EBUILD microsoft-edge-beta-127.0.2651.31.ebuild 2712 BLAKE2B e4c40954c5106692f7b454e32c79e47cdc99c09b2e1aa02a263951adcafb56ef2179235210e2c1c4a24b7571338c9329d46bf7c5fa8430284be2e1d2eb447148 SHA512 1d1a784a1b19db517d78db66fd8457b5dbfe803f852cf82d7137bd18f624618e91016f38f571e0d848542a17788d01685228863fb005cc8de4bbb96381e3044b
 EBUILD microsoft-edge-beta-127.0.2651.45.ebuild 2712 BLAKE2B e4c40954c5106692f7b454e32c79e47cdc99c09b2e1aa02a263951adcafb56ef2179235210e2c1c4a24b7571338c9329d46bf7c5fa8430284be2e1d2eb447148 SHA512 1d1a784a1b19db517d78db66fd8457b5dbfe803f852cf82d7137bd18f624618e91016f38f571e0d848542a17788d01685228863fb005cc8de4bbb96381e3044b
+EBUILD microsoft-edge-beta-127.0.2651.49.ebuild 2712 BLAKE2B e4c40954c5106692f7b454e32c79e47cdc99c09b2e1aa02a263951adcafb56ef2179235210e2c1c4a24b7571338c9329d46bf7c5fa8430284be2e1d2eb447148 SHA512 1d1a784a1b19db517d78db66fd8457b5dbfe803f852cf82d7137bd18f624618e91016f38f571e0d848542a17788d01685228863fb005cc8de4bbb96381e3044b
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-127.0.2651.15.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-127.0.2651.49.ebuild
index 0ff710cc5ddc..0ff710cc5ddc 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-127.0.2651.15.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-127.0.2651.49.ebuild
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index 580724271be5..bd56b1a2c1de 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-dev_127.0.2651.8-1_amd64.deb 166223282 BLAKE2B a45295f0a41c739eab3ff926a1f7250ec4285c423243018005f9ba3f2f720a90ad37d7278ba422664caff89c150498f9238afce8560e6c080e5315993e534188 SHA512 d333c6b9ee120c106757e8ca1bbd03ede0342900d517add720a57c21ecb07c7d0010ac4aed1ea8a00fa08412d1a76bc8f15a79516b5de100ba421018fb924b58
 DIST microsoft-edge-dev_128.0.2661.0-1_amd64.deb 166470038 BLAKE2B 2e0ba0688d6bb0759f5bd3311dadab16fe659a7f50c1b9786fe75f9f8304617fe5e3c6baf7526fbab6724866131729effbf6577513201f503bdeae7a504d544c SHA512 c88bf304dc552f68f49a07b3f8bbad28b96b593e18d161884c7898f67768361e01c653f3681512fb27fe0c8949f5211ed4fd70ce14c12c896452441be2ccc2d3
 DIST microsoft-edge-dev_128.0.2677.1-1_amd64.deb 167448190 BLAKE2B 53d8abb515e2dc836af3f962a3860993bf714da8fa56f94e62f4c89c8800d259c23c8818243e14ab5975d6cb08cc538afcb4cebe183538d5eb5b7c17fa09d511 SHA512 769c781155e88afda271a435c5affe4ce1cab751417ce4baea4e9321a5eae033c8db760fcec6c899b938efcc23310ade875c340642065e7af01eaae35567c8e3
-EBUILD microsoft-edge-dev-127.0.2651.8.ebuild 2712 BLAKE2B e4c40954c5106692f7b454e32c79e47cdc99c09b2e1aa02a263951adcafb56ef2179235210e2c1c4a24b7571338c9329d46bf7c5fa8430284be2e1d2eb447148 SHA512 1d1a784a1b19db517d78db66fd8457b5dbfe803f852cf82d7137bd18f624618e91016f38f571e0d848542a17788d01685228863fb005cc8de4bbb96381e3044b
+DIST microsoft-edge-dev_128.0.2708.0-1_amd64.deb 167730670 BLAKE2B 17c503c20050cba6bb0cac4c2f3d900b51d6e8020db117ef5aaa0b319edd65b0a3ee5e49cadadd5659f4b7d9113b866466f2d6a0bf67d7264731baa0ab8511ed SHA512 c98ce5cad5b6347bb0989fe6197eccfc4a3d3d69d63e2365894cf681a969e84c97ba939afaffdc13c362639fb96369a018dc71b4745726a4e60725ffbc6f541d
 EBUILD microsoft-edge-dev-128.0.2661.0.ebuild 2712 BLAKE2B e4c40954c5106692f7b454e32c79e47cdc99c09b2e1aa02a263951adcafb56ef2179235210e2c1c4a24b7571338c9329d46bf7c5fa8430284be2e1d2eb447148 SHA512 1d1a784a1b19db517d78db66fd8457b5dbfe803f852cf82d7137bd18f624618e91016f38f571e0d848542a17788d01685228863fb005cc8de4bbb96381e3044b
 EBUILD microsoft-edge-dev-128.0.2677.1.ebuild 2712 BLAKE2B e4c40954c5106692f7b454e32c79e47cdc99c09b2e1aa02a263951adcafb56ef2179235210e2c1c4a24b7571338c9329d46bf7c5fa8430284be2e1d2eb447148 SHA512 1d1a784a1b19db517d78db66fd8457b5dbfe803f852cf82d7137bd18f624618e91016f38f571e0d848542a17788d01685228863fb005cc8de4bbb96381e3044b
+EBUILD microsoft-edge-dev-128.0.2708.0.ebuild 2712 BLAKE2B e4c40954c5106692f7b454e32c79e47cdc99c09b2e1aa02a263951adcafb56ef2179235210e2c1c4a24b7571338c9329d46bf7c5fa8430284be2e1d2eb447148 SHA512 1d1a784a1b19db517d78db66fd8457b5dbfe803f852cf82d7137bd18f624618e91016f38f571e0d848542a17788d01685228863fb005cc8de4bbb96381e3044b
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-127.0.2651.8.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-128.0.2708.0.ebuild
index 0ff710cc5ddc..0ff710cc5ddc 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-127.0.2651.8.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-128.0.2708.0.ebuild
diff --git a/www-client/microsoft-edge/Manifest b/www-client/microsoft-edge/Manifest
index 0a07aa121a14..baff25aa52e3 100644
--- a/www-client/microsoft-edge/Manifest
+++ b/www-client/microsoft-edge/Manifest
@@ -1,3 +1,3 @@
-DIST microsoft-edge-stable_126.0.2592.87-1_amd64.deb 168170546 BLAKE2B e1f4464f7bf50c2efbb36510578d5b26c4538c29aaf4f783335e8d0333db5978aac9a429cef1ba76d7662ac4bd93244e2a13238ded468c191858a8e46a4a6d89 SHA512 cbf72b15eb179e861f769908cc6cc84d2913e56b9f35405784063d12efc957cf5c6c4ff8f587e12500d0bbc1b27a5b6d71b455f31315a1a5b798480044d4fb2b
-EBUILD microsoft-edge-126.0.2592.87.ebuild 2711 BLAKE2B 1bb44a3c56ae9b33ff45f5cede57afd5c9f39d9b02f030029e22de9694efe09e68eb0106d8a896e85de2fb033341c7b479a3c4d10e9b5be5ee50fa9ab218da0b SHA512 3df8105072f7b861b8fbb50a8c93ecd9b8221548dcfc84563b8aae1546c94687d45d8dded312c9b560f99bb9b3bcf0da24ca8489dd413b52a245943e778a073a
+DIST microsoft-edge-stable_126.0.2592.102-1_amd64.deb 168166266 BLAKE2B 02f884e3d22c933b0033ce4b0b1bccf4364aad51a49f622b8003f803ef732a3ed5ed9346c6bfdb5873ce3676ec76b903034aaceb1cdb0c7c8e5a4a5c46d8603c SHA512 67d5fb6269a0c80680d5961783b82958f2c5d53143800a85c3aa7772e34fd32a4f860a040b37e5bae92c7d8a72efd975bd8047b5072a7e11335a63d6d03857c5
+EBUILD microsoft-edge-126.0.2592.102.ebuild 2711 BLAKE2B 1bb44a3c56ae9b33ff45f5cede57afd5c9f39d9b02f030029e22de9694efe09e68eb0106d8a896e85de2fb033341c7b479a3c4d10e9b5be5ee50fa9ab218da0b SHA512 3df8105072f7b861b8fbb50a8c93ecd9b8221548dcfc84563b8aae1546c94687d45d8dded312c9b560f99bb9b3bcf0da24ca8489dd413b52a245943e778a073a
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge/microsoft-edge-126.0.2592.87.ebuild b/www-client/microsoft-edge/microsoft-edge-126.0.2592.102.ebuild
index 7ea339bd40f9..7ea339bd40f9 100644
--- a/www-client/microsoft-edge/microsoft-edge-126.0.2592.87.ebuild
+++ b/www-client/microsoft-edge/microsoft-edge-126.0.2592.102.ebuild
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 6202c1c45c60..2d76371e546c 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -2,6 +2,6 @@ DIST opera-beta_111.0.5168.15_amd64.deb 110248164 BLAKE2B 05a58600640ffdf6d75ca6
 DIST opera-beta_112.0.5197.10_amd64.deb 111011432 BLAKE2B 214a3ac05a1c457dda6ab78529bd28023a3ee8e809da12a45cdb23eb37765eb8be36d0854d765ac8b472e762ded7ca147a951ff7ea2ec44402c874312b8760de SHA512 c8efefc1f412ac3c4bd1555fbf837fa18917b7857ed22436c0044631d05a6188d24be5f60a6b283f8884a76eaca7fcc5462217d0f52e4b8445614724b1a18b52
 DIST opera-beta_112.0.5197.5_amd64.deb 111091348 BLAKE2B 4e683d4fdb536a9b6beaa9be325738bd5282afa18cde816de04cc1285c1f021f8063fec07b505ab9af56eb33170e4342959154a63e384be7d9cde9bd9fe62b56 SHA512 d98b62e2ac94f154474f247a60c9acbb4fcddf1bf3443456bc742152c5a2f9ac36d6cfecd60e3f416550257f2f088cee61d45a2a28b4f4376e077784840fa186
 EBUILD opera-beta-111.0.5168.15.ebuild 4223 BLAKE2B fac1c8287ed7e76dd485b251090c7619215e007ed594a29b5c3f04ff947ab440058f609bcd187a5e170c50f00beabddc5194990f91c4ebf36d8d8bdebaafa4dc SHA512 5a5fcd27cdeecda900c1f24b303c5f6a529dde9e41f3be29d8ed1b284c7c701eab728dd43f42aa8f9e427b4746c99dd4b15d70dc3eb222a492f7f83009a25d28
-EBUILD opera-beta-112.0.5197.10.ebuild 4223 BLAKE2B fac1c8287ed7e76dd485b251090c7619215e007ed594a29b5c3f04ff947ab440058f609bcd187a5e170c50f00beabddc5194990f91c4ebf36d8d8bdebaafa4dc SHA512 5a5fcd27cdeecda900c1f24b303c5f6a529dde9e41f3be29d8ed1b284c7c701eab728dd43f42aa8f9e427b4746c99dd4b15d70dc3eb222a492f7f83009a25d28
-EBUILD opera-beta-112.0.5197.5.ebuild 4223 BLAKE2B fac1c8287ed7e76dd485b251090c7619215e007ed594a29b5c3f04ff947ab440058f609bcd187a5e170c50f00beabddc5194990f91c4ebf36d8d8bdebaafa4dc SHA512 5a5fcd27cdeecda900c1f24b303c5f6a529dde9e41f3be29d8ed1b284c7c701eab728dd43f42aa8f9e427b4746c99dd4b15d70dc3eb222a492f7f83009a25d28
+EBUILD opera-beta-112.0.5197.10.ebuild 4223 BLAKE2B c69e5de821ac295003aadbb2b94cd21ad617274870c6363ddd9b6214360ae60a7d8b77609b92b4f46f7b77220a63f966a011a093debf6580a71d5383821203cf SHA512 75b8c0a7e46ea5610d798d45c3260d6d684f943298d232670a17dc38ddef395a00fd52d3f7f06efd79b5c0dcddeec204bb597b0594f6471a2934d3409fd889c0
+EBUILD opera-beta-112.0.5197.5.ebuild 4223 BLAKE2B c69e5de821ac295003aadbb2b94cd21ad617274870c6363ddd9b6214360ae60a7d8b77609b92b4f46f7b77220a63f966a011a093debf6580a71d5383821203cf SHA512 75b8c0a7e46ea5610d798d45c3260d6d684f943298d232670a17dc38ddef395a00fd52d3f7f06efd79b5c0dcddeec204bb597b0594f6471a2934d3409fd889c0
 MISC metadata.xml 544 BLAKE2B e8594a0cb9a73ac5901ece78db220822043dca9faec994810af426f96e2ece7fdb069c5f1d639f66d1236ec83e6c46e50bd21c49f8a075cf0de41c9db9afd8a0 SHA512 2361ebdde2707166e465058b41a893b4c14db7c7ba8f4fe34f7ab34da4275f0af691e55881232a9253f5d793ff76e61d57689f56dd8ab879fc3ecb3294fc8777
diff --git a/www-client/opera-beta/opera-beta-112.0.5197.10.ebuild b/www-client/opera-beta/opera-beta-112.0.5197.10.ebuild
index 0d49f3a56353..00ead24ed5e1 100644
--- a/www-client/opera-beta/opera-beta-112.0.5197.10.ebuild
+++ b/www-client/opera-beta/opera-beta-112.0.5197.10.ebuild
@@ -42,7 +42,7 @@ fi
 # Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
 # used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium)
 # Does not need to be updated for every new version of Opera, only when it breaks
-CHROMIUM_VERSION="125"
+CHROMIUM_VERSION="126"
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}"
 S=${WORKDIR}
 
diff --git a/www-client/opera-beta/opera-beta-112.0.5197.5.ebuild b/www-client/opera-beta/opera-beta-112.0.5197.5.ebuild
index 0d49f3a56353..00ead24ed5e1 100644
--- a/www-client/opera-beta/opera-beta-112.0.5197.5.ebuild
+++ b/www-client/opera-beta/opera-beta-112.0.5197.5.ebuild
@@ -42,7 +42,7 @@ fi
 # Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
 # used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium)
 # Does not need to be updated for every new version of Opera, only when it breaks
-CHROMIUM_VERSION="125"
+CHROMIUM_VERSION="126"
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}"
 S=${WORKDIR}
 
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index f2279434b2c9..94d7d3b0d827 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,7 +1,7 @@
-DIST opera-developer_113.0.5210.0_amd64.deb 111403232 BLAKE2B 603b94351147f937898b9db752f4c942609ca28f56d1ff1cc234c10ac3bd29b9ec80bd6a017d237b575b47f38700467854de5f195e60b1362101b8c88688c54f SHA512 f8270863a4d4b0e29e67f4b741dcfd3cfdb373a0769059c861d508d8a02babf6851a38aab8e7be579b5d0604c7d2d1819c460e8a2f271532580f1e7836b85748
 DIST opera-developer_113.0.5215.0_amd64.deb 111400132 BLAKE2B 77d8c619831f98141e8817c8118807ff1e679c7883550bbc4c4eaddb833f58ac9fdba342bb0460788150a6cb5548f6f670f6ff43c705e6446f8ae087f418af21 SHA512 b87436a75e07c32a3b671b7c68fcc8b3e002835fb772dc238c64dcd21ddefa215c8051f534c97ad9db80ae296454fb3caf590bb183bdbb1137aa9c81a44be765
 DIST opera-developer_113.0.5222.0_amd64.deb 111175644 BLAKE2B 51a72409ba280bf1abd45963bd8f72bbe481700e3dc2d97d11d2d3e71dbb313acf18488e0b52cfd356fd2b27081119aed9f28bce3b605b630c35d08c855a7506 SHA512 a0a3787fb6278e60af1f32307ac3d1b868d45488659734e385bfda1b2bd776a01193c3e0dba5396e05fc37c05d46d9448ab77b0606819a255a3fedf6274ba4ab
-EBUILD opera-developer-113.0.5210.0.ebuild 4223 BLAKE2B fac1c8287ed7e76dd485b251090c7619215e007ed594a29b5c3f04ff947ab440058f609bcd187a5e170c50f00beabddc5194990f91c4ebf36d8d8bdebaafa4dc SHA512 5a5fcd27cdeecda900c1f24b303c5f6a529dde9e41f3be29d8ed1b284c7c701eab728dd43f42aa8f9e427b4746c99dd4b15d70dc3eb222a492f7f83009a25d28
-EBUILD opera-developer-113.0.5215.0.ebuild 4223 BLAKE2B fac1c8287ed7e76dd485b251090c7619215e007ed594a29b5c3f04ff947ab440058f609bcd187a5e170c50f00beabddc5194990f91c4ebf36d8d8bdebaafa4dc SHA512 5a5fcd27cdeecda900c1f24b303c5f6a529dde9e41f3be29d8ed1b284c7c701eab728dd43f42aa8f9e427b4746c99dd4b15d70dc3eb222a492f7f83009a25d28
-EBUILD opera-developer-113.0.5222.0.ebuild 4223 BLAKE2B fac1c8287ed7e76dd485b251090c7619215e007ed594a29b5c3f04ff947ab440058f609bcd187a5e170c50f00beabddc5194990f91c4ebf36d8d8bdebaafa4dc SHA512 5a5fcd27cdeecda900c1f24b303c5f6a529dde9e41f3be29d8ed1b284c7c701eab728dd43f42aa8f9e427b4746c99dd4b15d70dc3eb222a492f7f83009a25d28
+DIST opera-developer_113.0.5227.0_amd64.deb 111218448 BLAKE2B 219cf02352571a6f3b9b9e67134d78391526a93ff7db17763ff61bb0c67219277e3c10875bb8e5c536eb50424daeb91077b3382e8df37137bd590ed0e2c727b9 SHA512 c125b2c7e89c1b1174ce4b3972077e4783f725a7d66b325401a1ce98aeedd73078881bd551d96a3502ed443e23631083b47899fe8cddef0e11632783188a3e8e
+EBUILD opera-developer-113.0.5215.0.ebuild 4223 BLAKE2B c69e5de821ac295003aadbb2b94cd21ad617274870c6363ddd9b6214360ae60a7d8b77609b92b4f46f7b77220a63f966a011a093debf6580a71d5383821203cf SHA512 75b8c0a7e46ea5610d798d45c3260d6d684f943298d232670a17dc38ddef395a00fd52d3f7f06efd79b5c0dcddeec204bb597b0594f6471a2934d3409fd889c0
+EBUILD opera-developer-113.0.5222.0.ebuild 4223 BLAKE2B c69e5de821ac295003aadbb2b94cd21ad617274870c6363ddd9b6214360ae60a7d8b77609b92b4f46f7b77220a63f966a011a093debf6580a71d5383821203cf SHA512 75b8c0a7e46ea5610d798d45c3260d6d684f943298d232670a17dc38ddef395a00fd52d3f7f06efd79b5c0dcddeec204bb597b0594f6471a2934d3409fd889c0
+EBUILD opera-developer-113.0.5227.0.ebuild 4223 BLAKE2B c69e5de821ac295003aadbb2b94cd21ad617274870c6363ddd9b6214360ae60a7d8b77609b92b4f46f7b77220a63f966a011a093debf6580a71d5383821203cf SHA512 75b8c0a7e46ea5610d798d45c3260d6d684f943298d232670a17dc38ddef395a00fd52d3f7f06efd79b5c0dcddeec204bb597b0594f6471a2934d3409fd889c0
 MISC metadata.xml 544 BLAKE2B e8594a0cb9a73ac5901ece78db220822043dca9faec994810af426f96e2ece7fdb069c5f1d639f66d1236ec83e6c46e50bd21c49f8a075cf0de41c9db9afd8a0 SHA512 2361ebdde2707166e465058b41a893b4c14db7c7ba8f4fe34f7ab34da4275f0af691e55881232a9253f5d793ff76e61d57689f56dd8ab879fc3ecb3294fc8777
diff --git a/www-client/opera-developer/opera-developer-113.0.5215.0.ebuild b/www-client/opera-developer/opera-developer-113.0.5215.0.ebuild
index 0d49f3a56353..00ead24ed5e1 100644
--- a/www-client/opera-developer/opera-developer-113.0.5215.0.ebuild
+++ b/www-client/opera-developer/opera-developer-113.0.5215.0.ebuild
@@ -42,7 +42,7 @@ fi
 # Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
 # used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium)
 # Does not need to be updated for every new version of Opera, only when it breaks
-CHROMIUM_VERSION="125"
+CHROMIUM_VERSION="126"
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}"
 S=${WORKDIR}
 
diff --git a/www-client/opera-developer/opera-developer-113.0.5222.0.ebuild b/www-client/opera-developer/opera-developer-113.0.5222.0.ebuild
index 0d49f3a56353..00ead24ed5e1 100644
--- a/www-client/opera-developer/opera-developer-113.0.5222.0.ebuild
+++ b/www-client/opera-developer/opera-developer-113.0.5222.0.ebuild
@@ -42,7 +42,7 @@ fi
 # Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
 # used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium)
 # Does not need to be updated for every new version of Opera, only when it breaks
-CHROMIUM_VERSION="125"
+CHROMIUM_VERSION="126"
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}"
 S=${WORKDIR}
 
diff --git a/www-client/opera-developer/opera-developer-113.0.5210.0.ebuild b/www-client/opera-developer/opera-developer-113.0.5227.0.ebuild
index 0d49f3a56353..00ead24ed5e1 100644
--- a/www-client/opera-developer/opera-developer-113.0.5210.0.ebuild
+++ b/www-client/opera-developer/opera-developer-113.0.5227.0.ebuild
@@ -42,7 +42,7 @@ fi
 # Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
 # used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium)
 # Does not need to be updated for every new version of Opera, only when it breaks
-CHROMIUM_VERSION="125"
+CHROMIUM_VERSION="126"
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}"
 S=${WORKDIR}
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 111006dbc4a4..ea4db5c5db29 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,3 +1,3 @@
-DIST opera-stable_111.0.5168.61_amd64.deb 110240376 BLAKE2B 3ab085acef9c082cc9a40f9a492461f7dc33f4034e88645b084bf9f3fe516d0221cfdb1cb015bc4a0de1f0a2e8e5d1e9d93fb7681d2be97e870adf432c19b3ac SHA512 90e96a60e3b1401bf5eb18d614db2ccea8c9f701a9f0f54315ce632b99f06d6e2576c9e356074352180ed3802145d085ad73d3e904a9dcbf2f08b9c5bd2917a1
-EBUILD opera-111.0.5168.61.ebuild 4222 BLAKE2B 1091bc144473a96cbc91da218fbf249d640c7dd37ff38a7796043c1cd20a670bc1342221af7d80369b0f0f7c2a65815547cc117f49436392f5490c76d98df9dc SHA512 ecf572caaf6133d3824f38555c1d9c1ac4045f23400bdf81f824735714e9e8d454ff81e6657f3e9654e4a61bd3e3e83458f3dee0f33f0bc7fa8ddbe4ac2e21bf
+DIST opera-stable_112.0.5197.25_amd64.deb 111204316 BLAKE2B a53d1380193e4d5484a19705e35d166770a64d7f36ba6f5b95dc03369c80c83c99d9db4600911e7166dfab3916419faad3bbaae7f9920b07a1542817850a67b7 SHA512 bb13bbaf56606375ed5f3a59170b81797442ce563574d47931f274bc1407e39a3c96910ac9cdd1382cb47a63517082942a8abb9656405345877123b60f44d0fe
+EBUILD opera-112.0.5197.25.ebuild 4222 BLAKE2B de117147a88de6901509c580d05cac5bf34cacaf4a36bb16ef232f48c1edd4386a1b6d1fb69f6804dbe75f1f64332d410b76af3d88308aaec0ff7ea3b8d594d2 SHA512 c0652186e3053ad951cde8aafcbd7a0e81ac6914c3ed2e23fafd557bc7b825bbfe05aa7da282569822e789d5ea04940f7cebc278b69ffffcbe59663554d1263d
 MISC metadata.xml 544 BLAKE2B 94b2f6807c021794769fc62b041c69bd08a0d307c51db96109bd45a1fff240d586c51daa91e894055e47291505750f07e9054b6b1b364a691c18f5711acbe9b4 SHA512 691c7b62fa7c8a46e4cc981a2f211a1609b1c57620aca668b001eeaa2cbcd2f38299680c4707a73a8f32ee19b054cd131a2b09600bac30b8530af35142694ff7
diff --git a/www-client/opera/opera-111.0.5168.61.ebuild b/www-client/opera/opera-112.0.5197.25.ebuild
index 0de1bebfcf29..71d9b3421ce4 100644
--- a/www-client/opera/opera-111.0.5168.61.ebuild
+++ b/www-client/opera/opera-112.0.5197.25.ebuild
@@ -42,7 +42,7 @@ fi
 # Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
 # used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium)
 # Does not need to be updated for every new version of Opera, only when it breaks
-CHROMIUM_VERSION="125"
+CHROMIUM_VERSION="126"
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}"
 S=${WORKDIR}
 
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 921a5b4107fc..5862df2cd5d4 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 580b168298be..342911fc8eff 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_127.0.6533.43-1_amd64.deb 109226720 BLAKE2B d6871b409569e3a305630f3c7337ec81e213f91d8528ac03d430227ba6012f1f4189cec57020d6f28d9aa7c7a0c824ee43f5f8d88debe8b287e9f59bcee0b90f SHA512 e65a0548e86fdf281227b1b889dcfad76167a038ce4e5a6818aae7ab794d8fdd9e88c6ad114b3ff7dc8cc24eea21ae1cd0d4cc8cf5aaee25a9fbd52fa0d873dd
-DIST google-chrome-stable_126.0.6478.126-1_amd64.deb 108773084 BLAKE2B 4e59333e6073b2b7320b50551a6241fc402509398a404742e63ccde60dce3a9c8d5a490a0b9fb4a9a409562ee4ea078ac1a6d441b0ead94bd40792b16afa48f9 SHA512 cae09818d2032253e1d9a8e58dfde53d56bb4fd63de0b7ad89bc6558da66103220057dce331ae519fa79e7ec140f116bc8d3e10200eb9845bb278aeaf3cf5d95
-DIST google-chrome-unstable_128.0.6559.0-1_amd64.deb 109921208 BLAKE2B 55a225f2e5cd32b4f22d36e4622ccf0b37a7d159993fcc1de181e24bf579f93e327b5ec10516b1cf64ef0a91d1c17b3f7c157f15d8efa6851d2f6290d3bc26d1 SHA512 e9e730be7506897d3ed85e90db016dbd9615850a0f72058746d1bd79747a54f5e08663430b6d74627229d2af27bc3141d0ee11077da07287f2b8b2702bd3fca3
-EBUILD chrome-binary-plugins-126.0.6478.126.ebuild 1176 BLAKE2B e70956e4da5ba037adad441508cb54dca89e18425df805ccb84ccc47fb8aa4ae6540305481607711220658c4a16aff8df58233a1e1fb2eefaff66b443b87b7c7 SHA512 efb6d8caa86d8c52ee9a8d4dc1c9b9755b5f04efbbc2d4812793cdc9af6999a151b33840996d487a50422e9f6a8619e5a61d06523e2041653f659970b315887c
-EBUILD chrome-binary-plugins-127.0.6533.43_beta.ebuild 1177 BLAKE2B ff98afe435096c3c48545decc8299355d91dda1d1d3058529157b529b541d5e3cbeb18626ec6624ae4476a06c2867326a1849a1b71e5b5d37873b503f586db35 SHA512 1ae067b2582cb3995a9f362a88b1ab88d787d296486e99a9568d425b438af1556baa5b90317b278e5379501c7170d9de1408ead365529d6875fed441e2a11662
-EBUILD chrome-binary-plugins-128.0.6559.0_alpha.ebuild 1177 BLAKE2B ff98afe435096c3c48545decc8299355d91dda1d1d3058529157b529b541d5e3cbeb18626ec6624ae4476a06c2867326a1849a1b71e5b5d37873b503f586db35 SHA512 1ae067b2582cb3995a9f362a88b1ab88d787d296486e99a9568d425b438af1556baa5b90317b278e5379501c7170d9de1408ead365529d6875fed441e2a11662
+DIST google-chrome-beta_127.0.6533.57-1_amd64.deb 109188896 BLAKE2B 2f73db42f57a40be97889b182bccc43e31981de4a25eb6a9472b85f0dfe56cafd91df60c3472c7e047ff13ecbd8707b7327f7c5b2486bc7a354c06fbed5e06d9 SHA512 e37f93e1a4c5839e6cfd52d9c19430a9d09e6acec6f35e74cd38d27f78c4e189ec66486ef8ea46b61ef4e7aa89fc744aa70892f42f11a539c67f99df8b52fe70
+DIST google-chrome-stable_126.0.6478.182-1_amd64.deb 108772160 BLAKE2B 8f4a95894a440f64654d5247c32468379b986b7629c5acc33c15e6239f5795d2cb1c781bdab4b071337400156ad3b9bdc9c7b295e7c733b959b77eba6f4ccbef SHA512 3e3e2a41aead21afb612f5d23e6d0538c85b290265f66c481530939b77968642d67c3215b34beb05f0ba8104945a76a1ed53169e38cfffaf3fe92370ddbcf141
+DIST google-chrome-unstable_128.0.6585.0-1_amd64.deb 110270616 BLAKE2B 3e71610836409645422d9041dc4aeafcaa0c68ee5f1e0ce9275759b8cfc9d58d9c9e7182d1ebbbad6752ed82212933b9ff705041f88cc4382eb1316bfb5d7ec3 SHA512 6999db35e87788db360506dfa119c3689b2f1bed811b591fa5be690af9b5173f9999f7a3a38a974c8d132188b3d2338a23395f85ed222f6f69bee68bc3518d13
+EBUILD chrome-binary-plugins-126.0.6478.182.ebuild 1176 BLAKE2B e70956e4da5ba037adad441508cb54dca89e18425df805ccb84ccc47fb8aa4ae6540305481607711220658c4a16aff8df58233a1e1fb2eefaff66b443b87b7c7 SHA512 efb6d8caa86d8c52ee9a8d4dc1c9b9755b5f04efbbc2d4812793cdc9af6999a151b33840996d487a50422e9f6a8619e5a61d06523e2041653f659970b315887c
+EBUILD chrome-binary-plugins-127.0.6533.57_beta.ebuild 1177 BLAKE2B ff98afe435096c3c48545decc8299355d91dda1d1d3058529157b529b541d5e3cbeb18626ec6624ae4476a06c2867326a1849a1b71e5b5d37873b503f586db35 SHA512 1ae067b2582cb3995a9f362a88b1ab88d787d296486e99a9568d425b438af1556baa5b90317b278e5379501c7170d9de1408ead365529d6875fed441e2a11662
+EBUILD chrome-binary-plugins-128.0.6585.0_alpha.ebuild 1177 BLAKE2B ff98afe435096c3c48545decc8299355d91dda1d1d3058529157b529b541d5e3cbeb18626ec6624ae4476a06c2867326a1849a1b71e5b5d37873b503f586db35 SHA512 1ae067b2582cb3995a9f362a88b1ab88d787d296486e99a9568d425b438af1556baa5b90317b278e5379501c7170d9de1408ead365529d6875fed441e2a11662
 MISC metadata.xml 263 BLAKE2B 63f20710af1b20f01824544c06058c4bef7c4b6e1b66a2bcd17c2dde8f48e6b30a074ec6c3940976d652bb8885a80495914a3ddf4de5766c04f5913780c85668 SHA512 85a03d35084d8d81e038c8065fe58a36f3dd1f5355aaf62033ba590636fa4855ee993ec5f3d10645a55754debddf0b57b4403172f3808e4575b3b2d8d7f180c0
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-126.0.6478.126.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-126.0.6478.182.ebuild
index 01e48ea7c665..01e48ea7c665 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-126.0.6478.126.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-126.0.6478.182.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-127.0.6533.43_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-127.0.6533.57_beta.ebuild
index 3dabec912ba2..3dabec912ba2 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-127.0.6533.43_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-127.0.6533.57_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-128.0.6559.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-128.0.6585.0_alpha.ebuild
index 3dabec912ba2..3dabec912ba2 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-128.0.6559.0_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-128.0.6585.0_alpha.ebuild
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 2a1af65fef3b..fcc909770205 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
index df633011531e..1cf61948f26d 100644
--- a/x11-wm/spectrwm/Manifest
+++ b/x11-wm/spectrwm/Manifest
@@ -1,4 +1,7 @@
 AUX spectrwm-3.5.0-fix-cflags-ldflags.patch 1149 BLAKE2B bedac9647ffca75f79d6ddfc66b13b3f6ddf0545df669cf79c8e1f5f18a2b3f9e5ac90abf69652c2954b3433e5071c6e627305bd8f06fa56bf2d99c315419d51 SHA512 915210bc84a4f563c6ddc5b05b3cf1dc5758d9060b2fb132dc25c41f08723b2e06c8baf443e23c27ced36ffbdf6e6ed28b7ffb5d83ce615e4ad2df33c633bbe2
+AUX spectrwm-3.6.0-fix-cflags-ldflags.patch 1177 BLAKE2B 4ce9f4d94734e64c6bc92d4cc6c59a55cb048072000943f70d158df46f323cc20bf8dd73c5e9919f90ba1558c7ce04b83e60b9358d33e89cfe47698a5d67c65b SHA512 88a2d148f349e349abe6357c9a01e8ce1c06b0e5133377f0c599cd1bf166acc41eb494660e53137f060cdf4f33889128abcb80890838fb62637c4b583f444bd4
 DIST spectrwm-3.5.1.tar.gz 196431 BLAKE2B 4de0240353dd0b0066e68148b02aed68b037fda5b5d5fa2a979621ba6b3f029d3c341768929cd8cc7d7aebd1e44594bfb31617078cf83c0179c395a7212d50eb SHA512 9a5b9bee6debd395b6b5f706d12dbb80a848e4f5f02405a54cf9a47b2bcceb407bf14fce64a9cc4ff9205ed7e688adeefb0280289b73a0cf9927b44cfaec02fa
-EBUILD spectrwm-3.5.1.ebuild 1228 BLAKE2B 0d4e6ccd72a37c285f27008170c4713ea01634311f14f604ba75efed502489bba18f50c3094d32bc4c34755410bb0a411746819eafa94af72ffda781a3cbf85f SHA512 ad558d5dea1dc1842584815a7e9eb0864b66ef5f740057d905fb5bc79a3007537845b96aff03ab89cfc8f104995b3e9251db6dc2c1a75b6e9930bc4459b64b07
+DIST spectrwm-3.6.0.tar.gz 205957 BLAKE2B b6fb72031a4ee7110465b5f55773d623210b4f8f74113381d061c593c9d7ef408e651061601402be82ff774355611a1f939af5edc251e361dc75a70ffc715c5e SHA512 70ae19d792ae8b9fcbaaf15d9e1a13b83e992c06ac77333712eca4178270b431adb13125ed316c129aadb2d8243abd9f5b1b6a91505f1b7a04feaf78c6f3d85d
+EBUILD spectrwm-3.5.1.ebuild 1244 BLAKE2B 916a4a2f24f0d3a6f143e3c03f9ab93ace7656069952c5bde9c77300f725f10ff3197f0f7cf252ed3c9950949b85982b126c2eeb0370ca56732fe080dd78fe0e SHA512 c26146aae0a497bdf99d78098f83bbe12c455c4a3596e86bff9c2d7d34a8c4b3edb729c3deff143608da00f18ce9dacfc63587b00cb13fbd1fe91e33d3709682
+EBUILD spectrwm-3.6.0.ebuild 1263 BLAKE2B df17a35970d6d6a7c44f64c33947f371e84856eaa6976e88b89bf5116df554efbc298a1d18b49b8780a89f8faccf344781cb5d1c0a0a2f356b2c82bd36ba22e8 SHA512 f3f3cdca512df88af1077b4bd7eb3b9026f40ff4f5dd64d668005536bbd3ae8abd7a9294a945e638ace10800845f7206dd5702545a73ed69fd1006f06b66b565
 MISC metadata.xml 328 BLAKE2B 4f82bd35cf47d6791ea543bec20f7e510abba33f9de8bc8e0fe8176b0d3e908c30581a6083e90e6f0a2947ad3ffb6ff93d0e11030e68b8056451a017debfb377 SHA512 97e6057c3043db295d56ffd208c189cb5b575cf48f1cc9b78475f8055e59801fa8f7c8c1b8c9c090beb85e00365438c33831c87d9499e95495ee6287ecf7e4c4
diff --git a/x11-wm/spectrwm/files/spectrwm-3.6.0-fix-cflags-ldflags.patch b/x11-wm/spectrwm/files/spectrwm-3.6.0-fix-cflags-ldflags.patch
new file mode 100644
index 000000000000..53f05c4199bc
--- /dev/null
+++ b/x11-wm/spectrwm/files/spectrwm-3.6.0-fix-cflags-ldflags.patch
@@ -0,0 +1,24 @@
+diff '--color=auto' -ur a/linux/Makefile b/linux/Makefile
+--- a/linux/Makefile	2024-07-10 06:19:42.000000000 -0500
++++ b/linux/Makefile	2024-07-17 08:16:22.559326147 -0500
+@@ -12,16 +12,16 @@
+ LIBVERSION      := $(shell .  $(CURDIR)/../lib/shlib_version; echo $$major.$$minor)
+ LIBMAJORVERSION := $(shell .  $(CURDIR)/../lib/shlib_version; echo $$major)
+ 
+-MAINT_CFLAGS   := -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -g
+-MAINT_LDFLAGS  := -Wl,--as-needed
++MAINT_CFLAGS   := -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow
++MAINT_LDFLAGS  :=
+ MAINT_CPPFLAGS := -I. -D_GNU_SOURCE -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LIBVERSION)\"
+ 
+ ifneq ("${BUILDVERSION}", "")
+ MAINT_CPPFLAGS += -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\"
+ endif
+ 
+-BIN_CFLAGS   := -fPIE
+-BIN_LDFLAGS  := -fPIE -pie
++BIN_CFLAGS   :=
++BIN_LDFLAGS  :=
+ BIN_CPPFLAGS := $(shell $(PKG_CONFIG) --cflags libbsd-overlay x11 x11-xcb xcb-icccm xcb-keysyms xcb-randr xcb-util xcb-xinput xcb-xtest xcursor fontconfig xft)
+ BIN_LDLIBS   := $(shell $(PKG_CONFIG) --libs   libbsd-overlay x11 x11-xcb xcb-icccm xcb-keysyms xcb-randr xcb-util xcb-xinput xcb-xtest xcursor fontconfig xft)
+ LIB_CFLAGS   := -fPIC
diff --git a/x11-wm/spectrwm/spectrwm-3.5.1.ebuild b/x11-wm/spectrwm/spectrwm-3.5.1.ebuild
index 8e29591ba462..9bc5bf3223c5 100644
--- a/x11-wm/spectrwm/spectrwm-3.5.1.ebuild
+++ b/x11-wm/spectrwm/spectrwm-3.5.1.ebuild
@@ -20,6 +20,7 @@ DEPEND="
 	x11-libs/libXcursor
 	x11-libs/libXft
 	x11-libs/libXrandr
+	x11-libs/libXt
 	x11-libs/xcb-util
 	x11-libs/xcb-util-keysyms
 	x11-libs/xcb-util-wm
diff --git a/x11-wm/spectrwm/spectrwm-3.6.0.ebuild b/x11-wm/spectrwm/spectrwm-3.6.0.ebuild
new file mode 100644
index 000000000000..40dd1a4780be
--- /dev/null
+++ b/x11-wm/spectrwm/spectrwm-3.6.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit toolchain-funcs
+
+DESCRIPTION="Small dynamic tiling window manager for X11"
+HOMEPAGE="https://github.com/conformal/spectrwm"
+SRC_URI="https://github.com/conformal/spectrwm/archive/${PN^^}_${PV//./_}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PN^^}_${PV//./_}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	elibc_musl? ( sys-libs/queue-standalone )
+	dev-libs/libbsd
+	x11-libs/libxcb
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXft
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/xcb-util
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+"
+RDEPEND="
+	${DEPEND}
+	x11-misc/dmenu
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/spectrwm-3.6.0-fix-cflags-ldflags.patch
+)
+
+src_prepare() {
+	sed -i -e '/LICENSE.md/d' linux/Makefile || die
+	default
+}
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+	emake -C linux PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	emake -C linux PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		SYSCONFDIR="${EPREFIX}/etc" DOCDIR="${EPREFIX}/usr/share/doc/${P}" \
+		DESTDIR="${D}" install
+
+	dodoc README.md ${PN}_*.conf {initscreen,screenshot}.sh
+}