gentoo auto-resync : 20:01:2025 - 06:42:03edge

525 files changed, 4912 insertions, 8058 deletions

diff --git a/Manifest b/Manifest
index 756e40222b10..e2b3ef6facf7 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 30148 BLAKE2B 63b22eebf082c6e609195fb3eb1350c82f0715f4d84a82ebd0f49d8a5229856f388cba147fcdff1b2f990b1d6131a94e2407d87f9a04b7d41ab49b23802a6eab SHA512 b1668d81bb9f27f54f6236ad7c6c9f6a59ada15ceb922b0949e0897c4845909b0adb2fbdbfafd025de51ea3b54dc2fc3f3caa71f402f7a03594d15836cc122f6
-TIMESTAMP 2025-01-19T06:10:29Z
+MANIFEST Manifest.files.gz 30152 BLAKE2B d8fe268bd7b23bc73f912a8785502976c989941c6fdec1ccacb28da11927e9b3ee4c5b377bd15ef8baa9e415cfcff5cd210e69418602bbbfc13ee953f65290fd SHA512 9947143f81789990adc7dae25fc570bf5e880a87de83751ed0bc475786bbb6d42feafe0e3c525931b9a482bd9367b8d2b8dcd8d2e687ef1d0d1056fcf5fb84c0
+TIMESTAMP 2025-01-20T06:10:30Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmeMl1VfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmeN6NZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCoUQ//Ua6q6aeneaLJqplLGkHp6WLF4NgyIkC/wmHwZFIxdHtZIDJbhOC2LKPJ
-5EGAexIroafUXTveY3uk63qAdq2i/7L6fO9wMLfX6xyH92yaJM7IHxq9xteWshvq
-i0ne/d7br1yRSSE3+LQfHSN7vpMcqCOpuqOqZLls0fgwFEdwyoQQ1ZZ0XOQR2cYZ
-FSBg01ioez3WMFpAEK+8oJm/RcuQyJLvjeKQ4z0Q0UYLzqZh0z+O0Hr/TqBw3ghd
-272GqfMedDlGwp76jFW9gaJ9KBc08i/b0uyLZyOuI0KAOC0tjcAg90MS4KAxx1TJ
-mjUIMFYZzHVuKcWl4RP9Js2G2A/QUAOPBt1JKZuL9w8itaL80F4f9QtL7jNj4IjJ
-PBDweNz951nrB2M8U0Hg1jPZM+xH7VZa6z0mnHR0l9qEqX+FELWhTA5jLYTTrZ9F
-FAp7QnzwpZ0XQt0P8dE77FIn3gJ2WtbFWU4nFa/mi4ze8EIeTYKzcbcnXM/ENVE+
-yR/dRhHOQxOgvNuIOlXmkN61K3afhqS2D3jXoTj/nyGakeOfNoMRFCiavSeuuJVc
-KKVJsArhHoUSB63Q93ZlIiMlPHWGt9rPrmWPi8B865kkptyvO1uK2UYQvXnqO2ZS
-GtAiSToRv3ue85fItbVhy7nkQlTqVUJVLtfxpN73u5djwfAcmu4=
-=EQpN
+klDlKA//aLhw0i9KJj5d7mQiq+/lqOd3IZ//Se/++a5sMJRssLITS6GxiUnYHMun
+f67UoulivtFQJUHiM9pDWRkyuPag25eXm3MOgEggfcv4Mj345iQY7QViDapzF9VY
+QZecmZdjagWu8/tA75m8/524tmstbgziQN4i99iQ4Ucqu0oiUbDCgQM4pU2WN0r4
+DYu2ECq3ofuO/IWyl7rRoOoqB99WyVz1fdkQAjzaF2bux/GZQFmdN7mVgJEg6csl
+AqQ5B0zeUGYovfa9pjkd5fW+vsVd3mtj0V0ujXzJV15b+XaCjwRfHQ78yi1oM6at
+lOjh2VHvhAiOxWG/xrpV4xWFJpPRthm6vM2KQ7+ia7BVUk1IsiFBvmQjjeBuSRFE
+NudsNifytcRq1Ks5pjsqPww8Dm692lVWWIsyX3BK0xg9lvi7PiFcIrXkiEdOcYKW
+4lT6gnQkrcuDhUAhZwCe1HPWVNa08eqClLdU368o/945pQ6ihAimccDnUorBCNC9
+FX2Kvcn+xmq0Sj3mX5Jd3ljyzYySThrIDadca3SLz8GjwXOgXww7EkN/ZddFB39Y
+/vgUv71KhuLaUtKd72Tmt9btmEy7Sms7FqgFoNqtwni4BfdkS99EsY5Unp4QRGnn
+8QA0s3349P2598Q16boS9MP5KMaF8iBmfg4vBKi6tA8rw7FtOBg=
+=y+Tx
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 98d0b8d1310e..b6d7ebf7de6b 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 208ea00b2c66..e3be4119c52b 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/restart-services/Manifest b/app-admin/restart-services/Manifest
index c21ba6391332..43862332aead 100644
--- a/app-admin/restart-services/Manifest
+++ b/app-admin/restart-services/Manifest
@@ -1,5 +1,7 @@
 DIST restart-services-1.3.tgz 27740 BLAKE2B b49fce16771c055aa93b8ac55f5eb37af18cc66b3c63152c276a34b6e8b6e953af651d190e167f036c003d9d615727b3efb382c9e770d55a8885974e9158a750 SHA512 1f45d333be5d342d2bc206380c1fbe4713d2e02d17547b7c9e648ee7be568900042b7e240c16e8d018020ecefd018a5564268c57a32fe3d9f2f660fc062bc45a
 DIST restart-services-1.4.tgz 28970 BLAKE2B d945724d86cdfc206455cd9cdf59418a8f08b8804d35cbd554e08093be76bedec07b81bf4ee34c43c2d61a75d2c89b51c3087e084f28fcbe838d2c8a5c0742fc SHA512 8dcdb3e24889fcca6bbad77e3f33b68ce84db718297f3414d0f9509f3a31f420e79078d5661704447ea80b606af3090aecc50e3ed6fd74fbb9d3539198b3cb6a
+DIST restart-services-1.5.tgz 29191 BLAKE2B 340843c448914f4775540a573346bd14c660c03eefa2250d36433b82d6fad708d3c54cb524c6cacfc40dd5b51d56584b6731b78410630450316c384461bc5956 SHA512 2b73980cc580440a6513e111d12b3955476b40eda6fea4d3e6c3d6c4393136cfb93d966123711c7b24e341ab6e8a29eb4326d6a9d982cfe362e22b9f81b74b1d
 EBUILD restart-services-1.3-r1.ebuild 1057 BLAKE2B e921bc34603b8fcd87e40411d668bb97f448ebefdc565252cd6aad647bb7669287a50635211b67bf8c190d18023736af4ba790d6a1ba2debaf2c3ae5f97ed286 SHA512 6788e4cc8b0b2ab925646ded8080dbcddc09209fc5e977e17ead4472c3c7a089a387aec69628e924add14d49d2df42c91ca9ee27da625a553627374f3b14586d
 EBUILD restart-services-1.4.ebuild 1059 BLAKE2B c93803690d84e5aad7e62c0660fd2fd1ae95c9551cf9a14c8a490f50ec682037ea91af0953a106a2da3cdb4c6cbdd358e1a563bf94b5a10f75c2be26152b5757 SHA512 a5010307eb4ac47a6e3aa982cbb272c0b6428aac7d6c7ff93aa4bfcadac4dcd7fdc1d0b4b9ee4191f035a8d614352622b420d819738a66abb1dc33cd2a6f47c5
+EBUILD restart-services-1.5.ebuild 1059 BLAKE2B 46b882db7399e55a312e41d3f5facee4486ed2b8dbef05810a059edf6587c18ccd6a7389a98349bdfebd894b174636a9908354d659133562d0098990ef4b4a9b SHA512 2ef5f94bbb0eae1188a646d4a8a934c062d1284ad07407fc092b6600c17934e488e97861a905f7d6791a208b16efe51dcfda2e3ef58de7137bb14fe7d1cb7476
 MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
diff --git a/app-admin/restart-services/restart-services-1.5.ebuild b/app-admin/restart-services/restart-services-1.5.ebuild
new file mode 100644
index 000000000000..f2506f7e2343
--- /dev/null
+++ b/app-admin/restart-services/restart-services-1.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Tool to manage OpenRC and systemd services that need to be restarted"
+HOMEPAGE="https://dev.gentoo.org/~mschiff/restart-services/"
+SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	app-admin/lib_users
+	app-portage/portage-utils
+	|| ( sys-apps/openrc sys-apps/openrc-navi sys-apps/systemd )
+"
+
+src_install() {
+	dosbin restart-services
+	doman restart-services.1
+	keepdir /etc/restart-services.d
+	insinto /etc
+	doins restart-services.conf
+	dodoc README CHANGES
+
+	sed -i -e 's/^#include/include/' "${ED}"/etc/restart-services.conf || die
+	cat > "${ED}"/etc/restart-services.d/00-local.conf <<- EOF || die
+	# You may put your local changes here or in any other *.conf file
+	# in this directory so you can leave /etc/restart-services.conf as is.
+	# Example:
+	# *extend* SV_ALWAYS to match 'myservice'
+	# SV_ALWAYS+=( myservice )
+	EOF
+}
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index a49ec107b0a1..59e63cd86f59 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index 8c3dcf4bde99..8a5659d0f6c8 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,5 +1,3 @@
-DIST dar-2.7.15.tar.gz 2443741 BLAKE2B 6af22a471dc0b5230843b73b7bddf931c281b8b3f0ea4cf1eb01f37e06651fa90a06b3e45be342ab799960f27460dfa8b95022791b9b471df2834a786784951f SHA512 c35c47c5ef307e3a36394cff44b37de0b9e7ad95d2810de476197897d368fa20401d567b18b763d39663167ec2ca093e54535fb5741c99a8e4bf9b78a460eaba
 DIST dar-2.7.16.tar.gz 2444321 BLAKE2B 019f441fe5ca951fbb43b661cbc9d6c5c1992e825005fb434579b2dedb6dc379593ffa11a1ee651da6047c16b8264a19dbbbc7e98bb2d20790890058f245a03c SHA512 bc70aecc05641314144c9a252fec1d256b3a19e38837ee2bb1320bfc7b659bc1e7399e6e1377862e25d25c798fdf90e535794d8ba68f0b9754d9e6bfb9cb50fe
-EBUILD dar-2.7.15-r1.ebuild 2651 BLAKE2B f38367b5b577fe37cc531226af6e5333f1ed1e035e53a6d594b2ad7cb3c6d510dbcaf7d1ed7ad1db71e5574c79c18384090ecc34ccabfc829160516d7a8a12e4 SHA512 a72966f35a00e15482ae3632ed3c7af4a7fa117ae441a1a8ccc949e97343323f42f94a6c063c4367cfaf772ce18d02a2567788e23f661deeead6772b33d54bf7
 EBUILD dar-2.7.16.ebuild 2321 BLAKE2B efa5622fd8d5ad244fc0bfb3c220dfbd1699f2ba630dfabbdc4d9c3215377845eed31e8d3433be66ad911b8762c0c4f8af405291593864612a4ae0f631dd09e3 SHA512 3042dcae7bf39b6873f4b13d2fa3c53ab86aa0aeef85fec861b63c11b9ce5c632f841387286be0b3a2707e5bb00eca9135f87a3fb1a65763bf22a9a2b46eab71
 MISC metadata.xml 1180 BLAKE2B d978c1b969e7aeb013862c6b76ceb7b466af7b0a16d334bfbaafcdb49e13b4f07727073ff8a24da0f0422161f48805310b8ed7c0cc97b07190b241ad77cec254 SHA512 f8107b5f81d0d00a1873089b084250c98094625274b9c01f8ca11f6dcfa890278ec89d039849c203ccccc8115d54ee3f9365d9f6afc38cb3411f6292c62c11c0
diff --git a/app-backup/dar/dar-2.7.15-r1.ebuild b/app-backup/dar/dar-2.7.15-r1.ebuild
deleted file mode 100644
index 1fb62f6efb24..000000000000
--- a/app-backup/dar/dar-2.7.15-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="A full featured backup tool, aimed for disks"
-HOMEPAGE="http://dar.linux.free.fr/"
-SRC_URI="https://downloads.sourceforge.net/project/dar/dar/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux"
-IUSE="argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync xattr"
-
-REQUIRED_USE="
-	?? ( dar32 dar64 )
-	gpg? ( gcrypt )
-"
-
-RESTRICT="test" # need to be run as root
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils
-	app-arch/zstd:=
-	dev-libs/libthreadar
-	sys-libs/libcap
-	>=sys-libs/zlib-1.2.3:=
-	argon2? ( app-crypt/argon2:= )
-	curl? ( net-misc/curl )
-	gcrypt? (
-		dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error
-	)
-	gpg? (
-		app-crypt/gpgme:=
-		dev-libs/libassuan:=
-	)
-	lz4? ( app-arch/lz4:= )
-	lzo? ( dev-libs/lzo:2 )
-	nls? ( virtual/libintl )
-	rsync? ( net-libs/librsync:= )
-	xattr? ( sys-apps/attr )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	doc? ( app-text/doxygen )
-	nls? ( sys-devel/gettext )
-"
-
-QA_PKGCONFIG_VERSION=""	# Bug #862025 - upstream has a different numbering scheme for libdar
-
-src_prepare() {
-	default
-
-	# Remove `check` subdirectory, unused because RESTRICT=test.  See bug #942752
-	sed -e 's/\<check\>//' -i src/Makefile.am
-
-	# Add gettext version so autopoint does not fail
-	# Try to keep it in sync with upstream
-	sed -e '/AM_GNU_GETTEXT_VERSION/ s/$/(0.20.2)/' -i configure.ac
-	eautoreconf
-}
-
-src_configure() {
-	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
-	# logic.
-	# For example "--enable-dar-static" causes configure to DISABLE
-	# static builds of dar.
-	# Do _not_ use $(use_enable) until you have verified that the
-	# logic has been fixed by upstream.
-	local myconf=(
-		--disable-dar-static
-		--disable-python-binding
-		--disable-upx
-		$(usev !argon2 --disable-libargon2-linking)
-		$(usev !curl --disable-libcurl-linking)
-		$(usev dar32 --enable-mode=32)
-		$(usev dar64 --enable-mode=64)
-		$(usev !doc --disable-build-html)
-		$(usev !gcrypt --disable-libgcrypt-linking)
-		$(usev !gpg --disable-gpgme-linking)
-		$(usev !lz4 --disable-liblz4-linking)
-		$(usev !lzo --disable-liblzo2-linking)
-		$(usev !nls --disable-nls)
-		$(usev !rsync --disable-librsync-linking)
-		$(usev !xattr --disable-ea-support)
-	)
-
-	# Bug 103741
-	filter-flags -fomit-frame-pointer
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
-
-	einstalldocs
-
-	find "${ED}" -name "*.la" -delete || die
-
-	# Bug 729150
-	rm "${ED}/usr/share/doc/${PF}/html/samples/MyBackup.sh.tar.gz" || die
-}
diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest
index 7a05816c2eff..a0ee02fc63bd 100644
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@@ -3,5 +3,5 @@ AUX rdiff-backup-2.0.5-py311.patch 1649 BLAKE2B 89a4885cabb8a921522ee39f96187ac8
 DIST rdiff-backup-2.0.5.tar.gz 456115 BLAKE2B 9cd51644e11af3320fa5aca7864388da4b1165a1fc9e660265445d861eb356ba32e3b148a1d8de8e702bd9a6f0276ec3a4453c85ec702d80be5839661a1a679f SHA512 59482e6d78bc887fc99efd4b4779e9b41c7e4b0427e51b80b18a550d0051e4213a0c200296154759d1734f511f7abe3175d171f018c59c55e5abdfd0a890cfbd
 DIST rdiff-backup-2.2.6.tar.gz 944414 BLAKE2B f30bc570f8e20d950e87654d195f29848b6ca39953fc418b9ff391da649fdd308bebcd0379b047a1875eb1fa9b85c294df6a0528f06d4ba27627df4e12a771a4 SHA512 7370dcbb71f087252f8c599b0fbf58260ec7e026e023648bfab63c39b062120862ab8b60173e2bf2352e16d404bb561c72fe19aa9aed9d49cff56225b91f5c63
 EBUILD rdiff-backup-2.0.5-r1.ebuild 1044 BLAKE2B f8f69f85e6b3b12e642d12c17739f63f82dd3fa6a791497440f9e6c7f1327cc7cc3a030cd7987122868c0a7bccefb59176e2fb1b3e612d5d9a8e297c999caf89 SHA512 f7cc702c8f9fbfbac4e22ee476000b4b647e8bf5c878b06f6c9f0f8e6fc25120e7708dd126085bd38433e25e4a2e29e26be6b2e307bc399f4d8a49e028ec4e4c
-EBUILD rdiff-backup-2.2.6.ebuild 886 BLAKE2B 51d768b4f08f5b7feb0a9db13a5e254923eec8de8d2f42521854a706df88a48aac122c162f0245f5a67cf6c38e3bdad2618de9d4c09d54c197c40ce2b3921375 SHA512 dc6781ed5f25f1dbd234cbf4309977e1c1c6024b0dc1f9b23cbf3063e22983ea0a70671d4828c27f9761aabea4e03be7956044c03e56182f1c8739df99e7ff05
+EBUILD rdiff-backup-2.2.6.ebuild 887 BLAKE2B 810c2bba5ff893a8eac45f43396b7deb34baa44b8a49c36de0df6414bfe72b73108b9fd3aba9bec5601ad615844a29c6209c6ae009eddeb18ea13e4b734aa408 SHA512 741d1246efa4b0750094e573a1939cfec9b57c3b5e20e280da03176a23a853e74572cf795659dc7dea17cb16a71d09c7e18515e8002f5d2871a7b485174c136e
 MISC metadata.xml 393 BLAKE2B 345d8ca991657bcc7a84568942ff68f074568c247a6b68bd650967673e1ea126045ddcd4c16d8761bfd763b6daf86856fa5e4f7c503db2417e8a5eec47d6595b SHA512 c2ac0d3e6ff267541b42dc421ffefe57b4c8b34b57123a2fa2f9c9137deffe380202b97bacb989d0b11dfdc66daf76c3f3969d6bdfec2aaaa45bc57d7f5c6491
diff --git a/app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild
index 4fe4223e7bbd..14548c8c4967 100644
--- a/app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYPI_NO_NORMALIZE=1
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 95b52b4ecfc4..9979d30bd9e8 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/amazon-ecr-credential-helper/Manifest b/app-containers/amazon-ecr-credential-helper/Manifest
new file mode 100644
index 000000000000..d7cb12721aef
--- /dev/null
+++ b/app-containers/amazon-ecr-credential-helper/Manifest
@@ -0,0 +1,4 @@
+DIST amazon-ecr-credential-helper-0.9.0-deps.tar.xz 1473848 BLAKE2B 2c16b90951eb62d272b770acf83cd317aa04823277bdce858e4a2741122750199e761cfaaf2a5e477c5ff58209d4a656790a65473400edd1086559dc24ce7c8d SHA512 9830c4eb4cd2fe80a317a09f6bbad0a40493233a49f40d382fff50c438632762f98f23cb4f16340848ae5b67c0b9d3bf569250a1077107e1ceee4afcb83bb4f9
+DIST amazon-ecr-credential-helper-0.9.0.tar.gz 1934543 BLAKE2B 75a247fa8ba395de2274fcef45344ecf9918e032ce365a00cadde17f6f306197729fc77959306ccd11ddfb02272749f42b3f15e587e0eec4772576eb0a84c183 SHA512 354be080bbe83065191efc7c2814cae739944d9405f6472ca99f2a2b00365689ef33361dc1da6ae2e816e6544beb7f8947352752568736382bfb4d976cac7a74
+EBUILD amazon-ecr-credential-helper-0.9.0.ebuild 770 BLAKE2B 7bfdaaee09426b62eb89e4a5337d9ea6c4aa8ff7abc74f66394f88918e2dcd5d1ae1035a7f72c6ab72e7bdd2da717d8e3a85ea8c115907d4ec3407f5571afa51 SHA512 bde8c3eecf00f8ea2e80ffa5a101f755713a45db88bdf50c98d8bcec10e5684c6658fa1ebfcdb2a65916ad775a9a3bed6cbe5c585a889c093489a4717c6fe5bb
+MISC metadata.xml 456 BLAKE2B e531fbcef503889e222e7c8a2732f8079d39030bac2d48c27b853db905a585f7e54cfa1e73abe0546b640475d11a0dab0701d0bb1203f839960373e0c6cabf5d SHA512 a9d4fd8de48fe7c3bebf96b3133ce5cd51ab806947fb3036d766687726c14b84067771e304aa76f1ead0b6d4de4c0e34d481826bcd76a95e96064f3a0aab1a87
diff --git a/app-containers/amazon-ecr-credential-helper/amazon-ecr-credential-helper-0.9.0.ebuild b/app-containers/amazon-ecr-credential-helper/amazon-ecr-credential-helper-0.9.0.ebuild
new file mode 100644
index 000000000000..5cab9a842201
--- /dev/null
+++ b/app-containers/amazon-ecr-credential-helper/amazon-ecr-credential-helper-0.9.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Automatically gets credentials for Amazon ECR on docker push/docker pull"
+HOMEPAGE="https://github.com/awslabs/amazon-ecr-credential-helper"
+SRC_URI="https://github.com/awslabs/amazon-ecr-credential-helper/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~arthurzam/distfiles/app-containers/${PN}/${P}-deps.tar.xz"
+S=${WORKDIR}/${P}/ecr-login
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	ego build ./cli/docker-credential-ecr-login
+}
+
+src_test() {
+	ego test ./...
+}
+
+src_install() {
+	dobin docker-credential-ecr-login
+	doman ../docs/docker-credential-ecr-login.1
+	dodoc ../README.md
+}
diff --git a/app-containers/amazon-ecr-credential-helper/metadata.xml b/app-containers/amazon-ecr-credential-helper/metadata.xml
new file mode 100644
index 000000000000..39b215f184f7
--- /dev/null
+++ b/app-containers/amazon-ecr-credential-helper/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arthurzam@gentoo.org</email>
+		<name>Arthur Zamarin</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">awslabs/amazon-ecr-credential-helper</remote-id>
+		<changelog>https://github.com/awslabs/amazon-ecr-credential-helper/blob/main/CHANGELOG.md</changelog>
+	</upstream>
+</pkgmetadata>
diff --git a/app-containers/cri-tools/Manifest b/app-containers/cri-tools/Manifest
index 9afa25632653..0d6f1432afbb 100644
--- a/app-containers/cri-tools/Manifest
+++ b/app-containers/cri-tools/Manifest
@@ -1,5 +1,5 @@
 DIST cri-tools-1.27.0.tar.gz 8465050 BLAKE2B d6c0429271ebc4085e75b54d7f3b9f75ab796e63bc9ae7562105296b13bbad8b512293a7d25abf1ab946f4bf54e672016fdb72696c12c730d21ac74724da465c SHA512 b94122e6401eb0c33b9c3d112274b7ab20cbbad05e76a54933e79d2e42ded2d684771cb9ed703a6c1afa381844142b6f1b4dc77d17e915f9a42c236fd8426b9b
 DIST cri-tools-1.32.0.tar.gz 7682096 BLAKE2B 125fc9014942e681353ef49d4d397af4fc77500c0fb37d2d1be0850839c37f51f2ef41b5c7d9ca422e814d1fe50f985bfd42d2bba11d391cea66b3bec381dc08 SHA512 654cfd4d546932d48c02e19071e137fa7565a5134ba1845498d61f2dfef45fca722a51dbadb7a467214f7424290c53cb79a2908684d1fbd3820836b55640f66d
 EBUILD cri-tools-1.27.0.ebuild 917 BLAKE2B ea1d949136eff43206b5f5d02996e96d67ee4e69c134a2cb316fb63bf4b8817834b7a9e23005306981beee6de59425ebaab08a616b59d436b6ef6cf78d38a5dd SHA512 b8f806329c303e3cddb82a2c45dc55f4aeae7ae126b6967c8d5efe394efd249f04a400fbcfbe3533805607c646bb07e5135b134f652f2ce7a089d02da127284a
-EBUILD cri-tools-1.32.0.ebuild 918 BLAKE2B 78cdba0853fcaafe0aaec933af02f078ec0422959a7e9fb9f1567ac1e744d697896728c62a4f95c268fd835ae3cd5c99f8f2cde1b20bb1ebeb14ee1863f7790d SHA512 e2eb0fb1e7a21ca16067220d465e264d2350b1f2f49a52e0b00c68419a1e85d2803abd07c43b29acce29e0f6b9dabd9ebc6adf5c0c44d61f8faeb142faed324a
+EBUILD cri-tools-1.32.0.ebuild 917 BLAKE2B 73904c4817744822cf8af65602524754809e68ab05978bb819d943d36e648fa0c6b64622f4489df6c97d7d88b9c45141813b6b9bedfef345c4a30904ac88a18c SHA512 5437a2f977f6fea75071a92a61e4476ef4013bc7117f2ea1fbda93340d2c65f8de5dd66a5e4bb31fef2bea25a0a350ab6e1d5eb08b9584e012f59a55b41903e9
 MISC metadata.xml 335 BLAKE2B 2144a466f521028b7bc93b372ec9b8f81f6ef5317285dede88a71736bff65aa0908bd1c8ed18b2b7b0563f14a24b10862efc81985e78c75b5c2a786d501331b1 SHA512 ae1cb972ec7ddc298a8e1747503400f52b27e899ed51b1aeba877a66c8f883248ca782b437ffea4d06cb1ad80ff6e8f071445ba848f98240e48ef5814c866c2e
diff --git a/app-containers/cri-tools/cri-tools-1.32.0.ebuild b/app-containers/cri-tools/cri-tools-1.32.0.ebuild
index 21381a7af4bb..ef3ccb4859b7 100644
--- a/app-containers/cri-tools/cri-tools-1.32.0.ebuild
+++ b/app-containers/cri-tools/cri-tools-1.32.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kubernetes-sigs/cri-tools/archive/v${PV}.tar.gz -> $
 
 LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 RESTRICT="test"
 
 DOCS=( docs {README,RELEASE,CHANGELOG,CONTRIBUTING}.md )
diff --git a/app-containers/docker-buildx/Manifest b/app-containers/docker-buildx/Manifest
index 8c15a76d9a26..51cd134cbfdf 100644
--- a/app-containers/docker-buildx/Manifest
+++ b/app-containers/docker-buildx/Manifest
@@ -3,6 +3,6 @@ DIST docker-buildx-0.14.0.tar.gz 11120356 BLAKE2B 01fec6b29665088a4778cb6a926f07
 DIST docker-buildx-0.19.1.tar.gz 11691424 BLAKE2B 40cc5e68eb85e8693bc6cd7bf91fe3a6300644d9934a3ff84b89c79dba31d475dce5ac4366075127391c5230905591a83bd59c762cf9f9f4bde0931834633473 SHA512 cc811eb93910bfb5a4668cc3dc59ab6c13a1308c0fa49707a81d1d733e834d209677502786e951ce3c8f098c387b559054dd3cd9933edafbecae610d1ef321e6
 EBUILD docker-buildx-0.11.2.ebuild 1541 BLAKE2B c5fc39fcf9ae1d65563f1f0009160de12444868e55dfa72f4bb3df59fb367e4f28d88513a5a7ac44ff7875317f7fd7ff8b87ab9df6733fe01e958b9da31efb2f SHA512 5ada6f9325cc7d9bff66b1ca9c0f413de23e1ac82caa1ee571ab361f909b61a3659c221a86795144e12df072d1fd7a128b87dd50ab5031601a69a4752333c6a6
 EBUILD docker-buildx-0.14.0.ebuild 1542 BLAKE2B b7460e822f99b1f5d08c713c28081fad23e58ca5958d91ebdc9ee327c791d59062b3f75f81c5707d2c55f29df4bddf884c5985231ee4ff2ac927b23dc2a1a9ee SHA512 4398055cbdb47ec0c2f15a79ed46ebb2618ee7d51b26ff2ba1af9444904b0fe30d5d2926ba38c59f2742312c1d168fcd9b09f5ef4bfa27afa7af2af47bf28c94
-EBUILD docker-buildx-0.19.1.ebuild 1545 BLAKE2B d3e6db3fee8cf75cf4bdeb84a097cfada046048326898a3799cb57234ec70279b9bcf6d13ba15e9b5a98fea3d39004d6e76167e484fbab84035785dae32298b3 SHA512 5eb4375ff570f77d1971d38c627830579e18c3774c7603ec6349760d3ed50d7b4ff105179626e8c40542ea2f123743bc757b665f8fbde3d2d3b22e41dc80edb4
+EBUILD docker-buildx-0.19.1.ebuild 1542 BLAKE2B f3c678b0b29ef3f525d945f8a9c7e1f156917d489e55c8e2a6acd0f9f6c12c7716f28a336025cd73ab777492d61d1e3d28ac596e5ba9848c20c2b94fc4f407fc SHA512 3cfe321cccae5512b424efd4a07bd7b6431005b9ff534015907aad28b602a417963caacf9ec8f6235543cf61543bc2f30d22272244e950937356d957c005bfb3
 EBUILD docker-buildx-9999.ebuild 1545 BLAKE2B d3e6db3fee8cf75cf4bdeb84a097cfada046048326898a3799cb57234ec70279b9bcf6d13ba15e9b5a98fea3d39004d6e76167e484fbab84035785dae32298b3 SHA512 5eb4375ff570f77d1971d38c627830579e18c3774c7603ec6349760d3ed50d7b4ff105179626e8c40542ea2f123743bc757b665f8fbde3d2d3b22e41dc80edb4
 MISC metadata.xml 819 BLAKE2B eabae0ff28ea1eea91dff4633ae0edee670ec5fea2615c550b80b37d71e07c311073e4c17f32b50a46a670f46d5d8c536595058cdcf485b4002aa416328663b2 SHA512 e290b4c9af65f262a654f4bb5e5c7bedd7a246dc5804387d8c4823e6c7cd2b2eff7b671cd493145a5c1a6083861c5464004a1f626b65c18e91c9b9675d3831d1
diff --git a/app-containers/docker-buildx/docker-buildx-0.19.1.ebuild b/app-containers/docker-buildx/docker-buildx-0.19.1.ebuild
index d36ee06a5456..197e965fc5e3 100644
--- a/app-containers/docker-buildx/docker-buildx-0.19.1.ebuild
+++ b/app-containers/docker-buildx/docker-buildx-0.19.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/docker/buildx.git"
 else
 	SRC_URI="https://github.com/docker/buildx/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
diff --git a/app-containers/umoci/Manifest b/app-containers/umoci/Manifest
index 2078142c384d..6bc4aea5478d 100644
--- a/app-containers/umoci/Manifest
+++ b/app-containers/umoci/Manifest
@@ -1,3 +1,5 @@
 DIST umoci-0.4.6.tar.gz 2273608 BLAKE2B d5a36c78918697b9c8f54a5c4b914a9124b5e989dff3efc81a9f64f1bd276189d15a565a6ec2e8d4021925017e9a7a17f7cc5359a552f7c57dda414c25d2fb02 SHA512 0614dd583e00b6e2e69256f1ae1d3316e5bb5989a177d18c5ceacf3af18ab82ccf8edef879b6c813855d878d5af53c541ac433d81e6c20796885a26c57564118
+DIST umoci-0.4.7.tar.gz 2515579 BLAKE2B 595fdaf8b3e8c330a2966bdb70a4915964fa6b8823572b0bc7dfc797fce47771732cdf24514f3458833a048c155155920306838eab8654a547553897458d5013 SHA512 bb76c6c74766bc6558fa414b66a626194c60a9dee49aee050ad459590675bd79032b8e8c390439c0aa74c09abc921a6789fac57fc996ef958a376bc1c675d9fc
 EBUILD umoci-0.4.6.ebuild 797 BLAKE2B b79c2ac05f6ed5ae1db9e1d04781a6f46c4f2a17ec8c70db0a3a6e7e5ec96605b480b3a5a8f5386a822b9e68d46bbce34e968dc13930147515d2d0627a9c07b8 SHA512 e3217bb2e870b11ce3ac2e7cf5341193cee6b57dae1b85a33e1ae3ba6499d6f5deb8bf2852a5c9bc92fc2a3500390c5b2dac447cdcbf88310d5e55f27fb433f2
+EBUILD umoci-0.4.7.ebuild 814 BLAKE2B e18d76d2186cdf137674e19c320ef1a1d93b5fcb029660aded4bc0d5eaed18d786fc86f0f8cb124674a3d19501b68c260e4e3b94e62cfebe249172063d72e93b SHA512 1a7074b3af1b1e9d6544d3749edc70605320a7ca04db3f5d4ced370c936617c15fae572d810248b7ae8ed5e489813504060d6f2a9c011829bea361c091a42510
 MISC metadata.xml 334 BLAKE2B 0db8c3a6f9a4370b4b95fcf130b5cd23cfe6dd430b188e4ca3c371b7ab491d88eb0036105af583ab85abbc440548f3b908885d6e9930deeac62528ed7aa6b0cc SHA512 456f9befdc8ea77ee2ee1be940ee69394384db8ef163e6f270960606c3b8295499c0e95cf9d5585f4a41065a4a7b6fc8e0476e7c8c1d31a80aadea5b22abdc42
diff --git a/app-containers/umoci/umoci-0.4.7.ebuild b/app-containers/umoci/umoci-0.4.7.ebuild
new file mode 100644
index 000000000000..691522485c5b
--- /dev/null
+++ b/app-containers/umoci/umoci-0.4.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo go-module
+
+COMMIT=17f38511d61846e2fb8ec01a1532f3ef5525e71d
+
+DESCRIPTION="Manipulation tool for OCI images"
+HOMEPAGE="https://github.com/opencontainers/umoci"
+SRC_URI="https://github.com/opencontainers/umoci/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+
+BDEPEND="dev-go/go-md2man"
+
+src_compile() {
+	ego build -buildmode=pie -mod=vendor \
+		-ldflags "-w -X main.gitCommit=${COMMIT} -X main.version=${PV}" \
+		-o "bin/${PN}" ./cmd/${PN}
+
+	cd doc/man || die
+	for f in *.1.md; do
+		edo go-md2man -in ${f} -out ${f%%.md}
+	done
+}
+
+src_install() {
+	dobin bin/${PN}
+	doman doc/man/*.1
+	local DOCS=( CHANGELOG.md README.md )
+	einstalldocs
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index bcb86b4ac9fe..2cb0bdbe1475 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 178d4001635d..fdc3b0ab41ee 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,7 +1,7 @@
 AUX 0001-Do-not-build-xpi-module.patch 1267 BLAKE2B d35ad7299e89520a085f07a5594b2dc9e97f1e91878681482978ee904ae8d62639967b33789cf0306efeed657cd531c2eac91ec7f08a1755513fc94e06fc7058 SHA512 d2f1b4c364d8a098b9afd50e2746a977330c3a7f1846ba9ec30678b3abe275840e508d60c1055cfcffd655893f8fb9b5ceb3109326f377e7fc6d80af87eb1d6f
 AUX 0001-Fix-libdir-for-manifestdir.patch 1116 BLAKE2B 39c38824a3021d88d80fe75237d73a28013b3c5c8abac4e5e80d6b9377f0e57b0899d32e725a975cfeef4bd163fe167c8c71e61bebf5e27ea7a149531ec486d9 SHA512 d513728dedd269f99afc60b12347ffe79c05963d87535835b670a93522cf904d1dd93108bbbed3ad7a7d2568ab4b548c269b6b386bd7e14eab09a4d36dc0fa65
 AUX 0001-Remove-uml-build.patch 2052 BLAKE2B 321f136a1e4bc4e43a20b10d18a5cd112fc4fc111d4d7a3b47bf19f6187b467ed81c3825672bbe4b3309ab0bbe65d60dcf7dd9dd18cbb427dec05f0c598227d2 SHA512 9fcd2d75fb9f018a4dac2e5c42fea45bbd3a33c1e52cf554871a903a36807b38381e013f65aba115e16178e5a981fb57fc9e2699c664e145301c8095ef99ae48
-DIST eid-mw-5.1.19.tar.gz 16299622 BLAKE2B a66c861c1120851ecbfd66de4b61db2c2f0951735982365ad516f2cf31249e7241180829e2992738821ecbd09c0fd83a0cba11cf34b23cdc45bfd9899072777a SHA512 9383fa4661a6e46510c3c0f1509aa9c9ee772b7222faacdad3de9433529591c9e7b102d954363f345e47104f4f0473e241c0be57d1049936842e67dac45adc2f
-EBUILD eid-mw-5.1.19.ebuild 2101 BLAKE2B 8540bacf591526fc3c8e7bd48ecb661d55ce8c0d7a139fbaa07b4d0e9d602f815d81e1e5c677e3b65f988368bf1bc6884c9cb4d4fdd50687b1b7ff639ef80623 SHA512 b78678deaecf2444a8b0eca492c1237aa0891f5c484efcf5c873d3228e8511724b988bedb75c1755829bc75af26dceb25417be30b0d0da9b43371b55fa67d543
+DIST eid-mw-5.1.21.tar.gz 16299868 BLAKE2B 9b01b25782ca8d64c1abf9beadf556f4691af5ba68deb3d0fb25a6b9ba13c845565aa5308360f3ebe69ec88871d60f3f1340178cd6133429946a5ebcdd249ad8 SHA512 f94a7c6fb6b72603adeb1e8e42bccddb0917b2597f0826736974e120d3ece6cc17242999790209d6a8e440545d8905565793f7a2ff5877ddbd788b50098248c8
+EBUILD eid-mw-5.1.21.ebuild 2101 BLAKE2B 2b5cc53999584211e00100d96b65f79e0780f645644e9c42c65ea6b4c7df84c881f88179c61c00a6c6e09189bdfe95785a541870592ffa9c62ca92ccc784c671 SHA512 04a988014300191d67d040c6b4fbd00d6dc7ae1afb5629702975f6bb180fdc20389e77d30e451e649879a15439c70b0b670f621db723dd7d6cbfddf90bba99da
 EBUILD eid-mw-9999.ebuild 1859 BLAKE2B 2e5cfc79f05f77415e9d9d2d3dd63675421a73b30c2870e204f9d6593b712596637b9fa132625276f7fb2c96bfbbe29047df8299e31531640361b4e2dc8e5dae SHA512 bc81df919a9b7b487916f026f667fa2368fa89525a8403cb922fbc5657273dc2b01f3370c1397bec14dd58a786215e74e673ad343ee6bb3f5c88820c7aba7f4d
 MISC metadata.xml 1447 BLAKE2B bf97d239f8d44f8a3bd31e35868335a6286a8ded9d6904a919a5a69eb89a61173aca5eb988455df2ca201e0d687e932a84ff8ed7012a3f9ca3e1eda0627ae9ec SHA512 6c27500bb1dd72027a540745e3916c41af548c1cd277fad02f975dd6431a22a9083bc0a7cdd00d316e2c7a536be0ac484f9b47bebb53121b7647da8699321838
diff --git a/app-crypt/eid-mw/eid-mw-5.1.19.ebuild b/app-crypt/eid-mw/eid-mw-5.1.21.ebuild
index 905a49b49f47..7b69d353e6db 100644
--- a/app-crypt/eid-mw/eid-mw-5.1.19.ebuild
+++ b/app-crypt/eid-mw/eid-mw-5.1.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 7eb411293359..5bbf3711f7b6 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/diakonos/Manifest b/app-editors/diakonos/Manifest
index 080ca2dcfbc8..0189c12ea041 100644
--- a/app-editors/diakonos/Manifest
+++ b/app-editors/diakonos/Manifest
@@ -1,3 +1,5 @@
+DIST diakonos-0.9.12.tar.gz 142840 BLAKE2B dd9d03da6ee7fc83235ca5d1041f7f3eea74febf2e5bdc32aa663939a6b79c649bb4a3457b56827a6fd362dd293500b3f2eee7045940c242654c50371031d59a SHA512 515308fccdfb7dc7915359e4f7c0911f666b9e8a4a04ba5ad00e236e0b09d8e7a4a06ddab260e74322dfb0dc5b3ce617a407df1bcea3448a04f965626afeb847
 DIST diakonos-0.9.7.tar.gz 129807 BLAKE2B 26c3a72a00e1d41b4a7b2916b37024658d7607ac657d4f71a12b939830578d7939a4f9f4c3886693eae9eeaf91bfe1abe055be7bcc7681619448e298acb5c546 SHA512 ec23d93ed6871d18b6a91e02bc6916ac667ca773be5f093a68fffa5c9cbe89b123e80b18762c8649620eda23b1b9ba582a5236eb9eaefc0e22a411390cd30c73
+EBUILD diakonos-0.9.12.ebuild 787 BLAKE2B 22922444f5d5de5d78e252153bbf1b993d15964dc267d4ba54ed99f671b731098bb888081430087f6f5d785ddcc624f944825bb5a8d5cb345102063228b1ea79 SHA512 9c86901966d452d0bdd25a084472427040a53c1b2e5f14d34ac6acb733779a139d9b0b8e6680bd4f3fc01fb80e3790066492a168accea990175b5cb5a4c433f6
 EBUILD diakonos-0.9.7.ebuild 795 BLAKE2B 7a781f326507917e152541a812caf946a64f5819b032dd3ba32519f9316ab6101e11129f7a5995826232187ff62c578d2e898297d963ed9ca38cf75498544d38 SHA512 4cd361fe47fa7e0004d34030382aff43e4ddc047b33d69b3edc822a2fe0cd323969a7e865275c880aaa84c4dbc2da636bb6c4a3c5164b4885f5f8052b1804567
 MISC metadata.xml 252 BLAKE2B 6dd94becc731f3061a05b45c9098df243d83db3a62879a08f4ba4027a2275482405a50d663ee5935653f6ee62e65cd10c99ab8ea4038b58f9d185399fab81e72 SHA512 a30553c3791eee7e53872468667b324e1b984201348ff37299d3c26b7852d2328e552b49b255e04820be69cdd0b3776c0ead4b84f30882fcd775d2e9dc6bf7bd
diff --git a/app-editors/diakonos/diakonos-0.9.12.ebuild b/app-editors/diakonos/diakonos-0.9.12.ebuild
new file mode 100644
index 000000000000..9888cc4491e2
--- /dev/null
+++ b/app-editors/diakonos/diakonos-0.9.12.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit ruby-ng
+
+DESCRIPTION="A Linux editor for the masses"
+HOMEPAGE="https://git.sr.ht/~pistos/diakonos"
+SRC_URI="https://git.sr.ht/~pistos/diakonos/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="diakonos-v${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="doc test"
+
+ruby_add_rdepend "dev-ruby/curses"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	test? ( dev-ruby/rspec )"
+
+each_ruby_test() {
+	${RUBY} -S rspec spec || die
+}
+
+each_ruby_install() {
+	${RUBY} install.rb --dest-dir "${D}" --doc-dir /usr/share/doc/${PF} || die "install failed"
+}
+
+all_ruby_install() {
+	if use doc; then
+		rake docs || die
+		dodoc -r doc/*
+	fi
+}
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index a50244ee39ba..cbde7ff3f547 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,11 +1,11 @@
-AUX gentoo.nanorc-r1 5357 BLAKE2B 8da48323666faf816b86b7b85b23d2415b4740a14efdd26384c35a1a561ebcaf30c9a488a09bbd7989f6a3942e7a670a830b127c606dc3c28e98a311cd61bc13 SHA512 f15a4c62f7af4148e6f26cb7ced8fabec159283505074e17d2d45b0fa4a515793b472926cde6555148d972655a85e461474795fe8a606088ee7bb0d849573377
+AUX gentoo.nanorc-r1 5197 BLAKE2B c862a068f09266f5961d052725c84223a1c63e542b55ea54e0dc43625a4237a13b991bcb512f3611b13904827124719b6a055c4f8b1f8da0e104c452207df554 SHA512 538206380c2f1a118d7c24d34d1a4282e1ba14bf12145d7e9eab2120e052b3e67213e7a229dc0f8a1b185ff2796939874c7b76819380bddd0660bab4f675029d
 DIST nano-8.0.tar.xz 1666272 BLAKE2B ba36182da059a3ee4c1fc60a200dee26f47cc6b1441b7ff665b82871f2f8fcac054f6adf82966d353234141bf9c521518da8fa967aca28307bccf43e015ddaea SHA512 86c484428b8805768fd580d0f62aa32ce8f588f4beedcdd35a4014506b562928c7a2fa6487aa0d853b4c9c1639a4d186f46b4e96721568ff81191d5098403ca8
 DIST nano-8.1.tar.xz 1667392 BLAKE2B e454f6e5ef86afbab3b2cf6707954d8821bf47ebc89bdad8cc6c70e2d4bb9fac27614069140f40140bca156b14605d286b0dca42469901c6559051089645cab8 SHA512 cb7d696bd18322ba1e713282e3156934e2c7f2a8abc17c99b2d5ae91fa40ea1478758853d4ad391f72039f01cfe0db79fd7302f3e67ed2afeff3a447b6f975ec
 DIST nano-8.2.tar.xz 1672076 BLAKE2B 08e078f8f5acc8d70ad50a0a402d06a12bcf836c8161f803e2b674375abaa16d663000f02cd1fa1e0b4aad2f127a85ee3b2f60d725a761ab375ae00c905408fd SHA512 07c69d6894f87cb386afa89e984ded7e11fe7575cf3af1c18237e3b2c00de371015c9ea126e505c7c0e7200f7359d5ae7c3779198e188fbbc617154d09c4ba14
 DIST nano-8.3.tar.xz 1681216 BLAKE2B 39c400483f79f11da0f959fed769462b65007f9235cb76d38e71d0a63919b659dc553d44f5d13dd13db801ec361fd7a3ad68b68bfa456ac6c169c861e80c6067 SHA512 9f57bb16a30240fdfc8fc31f5a55f681b80dd72de66fa143ef36c59ab696cc672d8fa054f5a4a547324db3deb2fe2f777cd7c1c023b571e2bb36c86a783ff1d6
 EBUILD nano-8.0.ebuild 2457 BLAKE2B daae6869b7aa4948d098ba0b7c9fe86d9337e05f960ce0cd56b4d016fc54695902c5fcd246e0f75d95ad94294eb26b7f4cea8ce00bd0dde30af982dc1b7d7b2d SHA512 b7eb5602df269b3bd8f87d38d66f33f29e9f48a3000529ffbb34c354fa40d9a76fe3f86545248799c874e470f7ee6d59145ecde9b4c5a92e23d264c5b7f78817
 EBUILD nano-8.1.ebuild 2457 BLAKE2B daae6869b7aa4948d098ba0b7c9fe86d9337e05f960ce0cd56b4d016fc54695902c5fcd246e0f75d95ad94294eb26b7f4cea8ce00bd0dde30af982dc1b7d7b2d SHA512 b7eb5602df269b3bd8f87d38d66f33f29e9f48a3000529ffbb34c354fa40d9a76fe3f86545248799c874e470f7ee6d59145ecde9b4c5a92e23d264c5b7f78817
-EBUILD nano-8.2.ebuild 2457 BLAKE2B 62b5d64d291771e021a18f309a75885720ffb42a27a99f85f9859f56456c4df0b9e3e383978ee226323d37064a9d511b01fcb6ec3d23355dc71c415e8bccf2a0 SHA512 fedc647cd39bf5b6f4c6eded457cd14588efadbdeec9457fcca51e36d5a7c6bbca47f7572ab6cc13191c2f1c5def6a5ecec43cd9c664b836476dfffb5838a924
-EBUILD nano-8.3.ebuild 2465 BLAKE2B b87c97e7c12209670f803dd882e581a1cfbc2fe5cfd4c59f746dd49ca60c9a0ff1d0c9628f83c7c45561ea49a8383e7ff21723cb290b6f3a93d610a107e20bbf SHA512 67a951d28c563a7701f347d65b66c3f39f73f45de38201143575edd69edf87a34f4e5adf65081c2986aa489cd086630297e077d9c1935a2dbcc9f3ffc83c5509
+EBUILD nano-8.2-r1.ebuild 2457 BLAKE2B 62b5d64d291771e021a18f309a75885720ffb42a27a99f85f9859f56456c4df0b9e3e383978ee226323d37064a9d511b01fcb6ec3d23355dc71c415e8bccf2a0 SHA512 fedc647cd39bf5b6f4c6eded457cd14588efadbdeec9457fcca51e36d5a7c6bbca47f7572ab6cc13191c2f1c5def6a5ecec43cd9c664b836476dfffb5838a924
+EBUILD nano-8.3-r1.ebuild 2465 BLAKE2B b87c97e7c12209670f803dd882e581a1cfbc2fe5cfd4c59f746dd49ca60c9a0ff1d0c9628f83c7c45561ea49a8383e7ff21723cb290b6f3a93d610a107e20bbf SHA512 67a951d28c563a7701f347d65b66c3f39f73f45de38201143575edd69edf87a34f4e5adf65081c2986aa489cd086630297e077d9c1935a2dbcc9f3ffc83c5509
 EBUILD nano-9999.ebuild 2465 BLAKE2B b87c97e7c12209670f803dd882e581a1cfbc2fe5cfd4c59f746dd49ca60c9a0ff1d0c9628f83c7c45561ea49a8383e7ff21723cb290b6f3a93d610a107e20bbf SHA512 67a951d28c563a7701f347d65b66c3f39f73f45de38201143575edd69edf87a34f4e5adf65081c2986aa489cd086630297e077d9c1935a2dbcc9f3ffc83c5509
 MISC metadata.xml 1580 BLAKE2B 5977013d57a99580adaf6df69a926972f430ceaec8f19f5d6ea060c5b5d066b9ac3e2fd1ca59def8266f39143b35340c6571651c90e5ef7050ec93cb58d588e3 SHA512 1533be592588e8f33c67072d14432cee0267f23d5a67626b21aa6ea8027fdce754fcd7c731645d5af7033c128b5b09af7140e15d8d5dc4e357ffa73a0428a865
diff --git a/app-editors/nano/files/gentoo.nanorc-r1 b/app-editors/nano/files/gentoo.nanorc-r1
index 100877dd16d4..1a7a86c89dac 100644
--- a/app-editors/nano/files/gentoo.nanorc-r1
+++ b/app-editors/nano/files/gentoo.nanorc-r1
@@ -31,14 +31,13 @@ color red "\<ECONF_SOURCE\>"
 
 ## Portage commands:
 color magenta "\<(use(_(with|enable|if_iuse)|x|v)?|in_iuse) [!a-zA-Z0-9_+ -]*" "inherit.*"
-color brightblue "\<e(apply(_user)?|begin|end|conf|install(docs)?|make|ninja|qmake5|ant|(qa)?warn|infon?|error|log|patch(_user)?|new(group|user))\>"
-color brightblue "\<e(pause|beep|mktemp|(cvs|svn)_clean|punt_cxx)\>" "\<e(aclocal|auto(reconf|header|conf|make)|libtoolize)\>"
-color brightblue "\<e(stack|shopts|umask)_(push|pop)\>" "\<get_libdir\>" "\<ver_(cut|rs|test)\>" "\<version_is_at_least\>"
+color brightblue "\<e(apply(_user)?|begin|end|conf|installdocs|make|ninja|qmake5|ant|(qa)?warn|infon?|error|log|patch(_user)?|new(group|user))\>"
+color brightblue "\<e(cvs|svn)_clean\>" "\<e(aclocal|auto(reconf|header|conf|make)|libtoolize)\>"
+color brightblue "\<e(stack|shopts|umask)_(push|pop)\>" "\<get_libdir\>" "\<ver_(cut|rs|test)\>"
 color brightblue "\<make_desktop_entry\>" "\<unpack(_(makeself|pdv))?\>"
 color brightblue "\<(assert|die|hasv?|inherit|nonfatal)\>" "\<(use(_(with|enable|if_iuse)|x|v)?|in_iuse)\>" "\<(has|best)_version\>"
-color brightblue "\<(do|new)(ins|s?bin|doc|header|lib(\.so|\.a)?|man|info|exe|initd|confd|envd|pam|menu|icon)\>"
-color brightblue "\<do(compress|dir|html|mo|strip|sym)\>" "\<keepdir\>"
-color brightblue "\<prepall(docs|info|man|strip)?\>" "\<prep(info|lib|lib\.(so|a)|man|strip)\>"
+color brightblue "\<(do|new)(ins|s?bin|doc|header|lib(\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)\>"
+color brightblue "\<do(compress|dir|mo|strip|sym)\>" "\<keepdir\>"
 color brightblue "\<(doc|ins|exe)?into\>" "\<f(owners|perms)\>" "\<(exe|ins|dir)opts\>"
 color brightblue "\<add(read|write|predict|deny)\>"
 ### common eclasses
diff --git a/app-editors/nano/nano-8.2.ebuild b/app-editors/nano/nano-8.2-r1.ebuild
index 087f82b40db1..087f82b40db1 100644
--- a/app-editors/nano/nano-8.2.ebuild
+++ b/app-editors/nano/nano-8.2-r1.ebuild
diff --git a/app-editors/nano/nano-8.3.ebuild b/app-editors/nano/nano-8.3-r1.ebuild
index 33dcb4d8418c..33dcb4d8418c 100644
--- a/app-editors/nano/nano-8.3.ebuild
+++ b/app-editors/nano/nano-8.3-r1.ebuild
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 51831c4d60dd..0ab745a73a00 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/node_exporter/Manifest b/app-metrics/node_exporter/Manifest
index b75ccf717a92..5dc4dfa4d6e5 100644
--- a/app-metrics/node_exporter/Manifest
+++ b/app-metrics/node_exporter/Manifest
@@ -3,17 +3,11 @@ AUX node_exporter-1.7.0.logrotate 147 BLAKE2B 4153888cc2bf626217dc998943208498de
 AUX node_exporter-1.7.0.service 518 BLAKE2B de602f92fe43955eca670e920b4a40b78e2bdfe08bccd78d7846c87eb10562fe9f53100f97e7d551fd00f021888feb92ce533f95f34dedd4f1d120594bf1d920 SHA512 6c6afe1cb7df07ff11b9b272dce5fe30f156ea71a03ccc24af07a7abd37688d642f0f435772d74c00ec14b23627a02ffac510e0338991b54754d664902d73516
 AUX node_exporter.confd 111 BLAKE2B bb40370633c41a4f1283677ed16ad9734c7f180683e4d9d82be36ea5e63d3b8fc2a861a61c62e2e899209f7293588e3e7532ffe52ecb9aab4773a3943168d5dd SHA512 cce5db8eccf2ecfe1198aa8252b04fd6a96006f707e7132c2d01c5400d175551c3b9890c4d57fec9ccbe17594dfb937e1f99ead0e1c3fd8cf22930dabd70418d
 AUX node_exporter.initd-1 674 BLAKE2B e33c8ba727f82ccdf166a836c31364a6f41f5445a05b518e92c5b4ecada75dccf97fdfc93ed4f65757f3b5d9716f650e9e5779cdb1c79d6a1a67f15f1edbced1 SHA512 6f51a4c4b1c7381fc92e47d1ca4434d1b3839ff15af1c16c47374cd2b96d615937bcd13470bff16d067b05b79bdfa94b018f5e986222dc0e5a932de765216bba
-DIST node_exporter-1.7.0-deps.tar.xz 26490120 BLAKE2B 3177aa96a50eefaeafad73b293144772443428b8c1b90210230e3e508a678f5515aebec1c51661d47a1e021cd03c8febe9aa948cc3d955eff2b2f272a539b6af SHA512 9fe19ad0fc375f4846fddb7618de5b34ddad583b5c6b09d896c099c3218976fd337c11765699a713c66bbaa834b6cfcaee960b1b1d4014be263b99b897fb1e1c
-DIST node_exporter-1.7.0.tar.gz 328830 BLAKE2B 5f6b8101637bc0df605ea84446f905fcf8abeb68d0f2eda1e172b12aae4cffcfef54996f8725ad458671947c72a48fbbd73d4d401d8fd001e9e9d75f248230fc SHA512 4cd38b81cb54ca620a57c642a88b89d6d1ae36a752fff5f065c8848ea02066a211c6feb955bea4e311f7baafffee30a74670efe1cf4dac113c9bf7d154a1067b
 DIST node_exporter-1.8.0-deps.tar.xz 1684580 BLAKE2B 0c02ca1177444885556da08676e78a413952955bfa80d9d7a9026133059594eaddd6f43fe10783701c71d0ecf2be9ac9383d019daeb287d5d016bd1188e5b37c SHA512 7268139beec7bf088ae4819809221985d1920e38b60db75cc074e92ce4dbe573c362f5227f095b4e5d1de7005b8ec2fbf96d3dcdf565eb2c9524d71676e1752e
-DIST node_exporter-1.8.0.tar.gz 335029 BLAKE2B 639edfec973e7412620da855c997e1e50ccb5fc4afc4070c44ab3fbb9b4925103719c87f813e092db3548cd55b779233fbf71bf3affc6b779ba0e45f4767ec32 SHA512 4774ff3e146665783044769235b9d4f538ba3ff1d7c9fdfb33e5546042846371c7d26efa8a6d672e6de3c5a10107c2e72e5bbf38ed2952a5c48eda81fdc1379a
 DIST node_exporter-1.8.1.tar.gz 335265 BLAKE2B a3b6262fd903373bb3690b0f051d9a4770741ba9702dca30e9de91214493026f3386b72c14d77c9254ab0c3549c3a4aa1075b3abd9516aa1c4a44bcd5c26f25f SHA512 9a715912899b7e27390f403182d8eba3a040fe0f0b6832967d131338b44d7a4f89860d1f2e4da19b8be6389fed38db1a96d803412c041b2b996cc543d1383c79
 DIST node_exporter-1.8.2-deps.tar.xz 9579024 BLAKE2B 7fb5abc6f5c0517350dce5fd9ee895ee599853804d97e1229dfcc1b2fa4a75fa900d7af6ae00558b509c798f852432515045986102a55ba4fcb43ec18af18874 SHA512 4acc939c63935191dd5b58860e1543f76ddc67abe16370d19f163c0c982fad53f05a6ffd049555c0c5475d640ca495df0696e77fa23c6dd79f314ce67d014b8f
 DIST node_exporter-1.8.2.tar.gz 335292 BLAKE2B 7aad2ac3433ba58be887c86d1cfbf0cd53d6712d171d2a928145588ea68f2839d593758254ab8742b7c27f068a75391959ea78ae768ffc1a0a1f5b08069dcf52 SHA512 68112a85a9ffde88d75893c30ab992ae3c591d44fbefa10e45cf94d228c8f8c44bb3585707521e355817c4b4276cf77eeaf4ed9d0261de02620135ad12f5e711
-EBUILD node_exporter-1.7.0-r2.ebuild 1884 BLAKE2B b446559b3c28c9a9e1dd311b0fa93a6813d632965ddbe01577b015e335e718f15f1cf406a78c020fc889c916f8e3a23cd6309cd3e88de34c18cc61deee207c4b SHA512 7b72066b5fe96dc03359ccf4fd5b8a1536846fdacbf379e7f61e34a634093f42bd6264d2e17490ddadab6d2a16b084998dd9d4011ea23e72fe55b670d428a4cb
-EBUILD node_exporter-1.7.0.ebuild 1943 BLAKE2B f4f7dd6f5b6e6eba320357442c4909f93f334d21273ae29eccc611039d4ccd8c8de960a47e8eda5d47ca031733cc7114530c50bc1a8161f37d90742e22c420cc SHA512 4357f81b0b40a88b4fb19b04340d07c9d7225cf3ff247f0ee05807ec14a7496913445354d89ea91b82041205f9f0f7ee8ed21c9eac71537990e3a00fb2b17231
-EBUILD node_exporter-1.8.0.ebuild 1787 BLAKE2B 058b9e8b6dfa75860dbf4ed4e254b34e132e111c544aed5a7fc806be0a222f0526ac442b9992620317eabcb6cb9c41c8357afb94e57efbab245b60b364a5f8e4 SHA512 c702189d230078bbe19de2b3c77b5b6d2841bc1b7fe945052b0f7122a4aa1e222a4d71e87d7334a886661bb19855c2cf1bdf8281ca0e04914f1ec37191b3af76
 EBUILD node_exporter-1.8.1.ebuild 1792 BLAKE2B 92eedb8d0ba6ac5bb596da2f13ea5fcbc568242fe9d245958d00818c55cb84b38da69455f3dd678cf59ae89d364e4962739da5e76b5bd78f5759a27de00a53c8 SHA512 a3f7cfee6db1fe19cf66b96c9767dd1754322b0e34463c35283ceb5e413ba4ca8f9be8e7e1433bf5d85343bf2d173d71d0656003c18704bb964422ad796b5124
-EBUILD node_exporter-1.8.2.ebuild 1725 BLAKE2B 8f7c7cc9c352a483b9e8b7d3b0810c428841a0e5249e49222c424461f84a533f4dcdeba4a92f2f43d1ae0d019a565d035d6e85e14e91e68ee480a66099cb0752 SHA512 eb11ebacdc9fa159aead6f145a9a62b20bc6039f31054b8ea6e26eccf8745b778993093e5e087b52ff94c1b912e1dc4f9a7c1091e704ef79a59a301b3fa89999
+EBUILD node_exporter-1.8.2.ebuild 1723 BLAKE2B 2bb4a7f48454a16b3dce5c246dbd740361c1742e58e1587a7a5f517b3599fc2b920f299f3dcfd33d53a010052413b9dd91f9970f73d7ae6e59d13eaf7ff00e9a SHA512 f54bdbd002ae1528f85b7c6d5de156128287d38e8fb43ea5863313b3ae7ec7eab08b8baf5b0270cb1d4fee6a4f78457451d14307d9e57379ffba2597e9d49472
 EBUILD node_exporter-9999.ebuild 1780 BLAKE2B abe8b6d55d125d6e51ccbe6539e503051221aa33e030474b3ea603a38e1c8a80adfec50c537ad1b754cf06ce84e634e2e268984a13016001686afdae11b5caa9 SHA512 a875c3890751233447dae348d92ad910f8f191641639a96ba51da2ec5d8320a12db9a18e28617ad60d5f7ed0649f10d67c7e5334832232bd7628eb7c6e5a8620
-MISC metadata.xml 831 BLAKE2B eba45344fe1d19be5656038d109827066f0aef5fa9f1338bca84217b98a880f232f5459bf017a661334cf8ec4221b749cd4feab8f166d027ceb77ab67a38a70c SHA512 3654c7f6cbe75997ad120d3470691125daa51d1d4be531e12026ddf1313c4cce07d05bba6d48b67ebd19931a47d5a2ec79d8f0c4c2ca8314928c32574e136747
+MISC metadata.xml 742 BLAKE2B 7c78e7ca1719a14cc7781360c1688e06fc8e9dc707494321e6bab940be52f57a278759286682e3153c0a7fadca2cd8dac309d1701fbb8ec2639c5dc64be79c7f SHA512 217e29c767ed28c4225f7d9351e88ae2b6658bd5e53c31f264d94c535370db81bd61ef322d18df0125088453fc2e30351aac37e5f21f03c4e3930f1b6c794689
diff --git a/app-metrics/node_exporter/metadata.xml b/app-metrics/node_exporter/metadata.xml
index 8e9812c67467..b4867d864edd 100644
--- a/app-metrics/node_exporter/metadata.xml
+++ b/app-metrics/node_exporter/metadata.xml
@@ -13,11 +13,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="systemd">
-			Enables systemd collector by default
-		</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">prometheus/node_exporter</remote-id>
 		<bugs-to>https://github.com/prometheus/node_exporter/issues</bugs-to>
diff --git a/app-metrics/node_exporter/node_exporter-1.7.0-r2.ebuild b/app-metrics/node_exporter/node_exporter-1.7.0-r2.ebuild
deleted file mode 100644
index 9e3f1d237576..000000000000
--- a/app-metrics/node_exporter/node_exporter-1.7.0-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Prometheus exporter for machine metrics"
-HOMEPAGE="https://github.com/prometheus/node_exporter"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/prometheus/node_exporter.git"
-else
-	SRC_URI="https://github.com/prometheus/node_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI+=" https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
-fi
-
-# main pkg
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD BSD-2 MIT"
-SLOT="0"
-IUSE="selinux systemd"
-
-COMMON_DEPEND="
-	acct-group/node_exporter
-	acct-user/node_exporter
-	selinux? ( sec-policy/selinux-node_exporter )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-util/promu-0.3.0"
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-		go-module_live_vendor
-	else
-		go-module_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-	use systemd && { sed -i -e "s|defaultDisabled|defaultEnabled|g;" collector/systemd_linux.go || die; }
-}
-
-src_compile() {
-	if use x86; then
-		#917577 pie breaks build on x86
-		GOFLAGS=${GOFLAGS//-buildmode=pie}
-	fi
-	promu build -v || die
-	./"${PN}" --help-man > "${PN}".1 || die
-}
-
-src_test() {
-	emake test-flags= test
-}
-
-src_install() {
-	dosbin "${PN}"
-	dodoc example-rules.yml *.md
-	doman "${PN}".1
-	systemd_newunit "${FILESDIR}"/node_exporter-1.7.0.service node_exporter.service
-	newinitd "${FILESDIR}"/${PN}.initd-1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/node_exporter-1.7.0.logrotate "${PN}"
-	keepdir /var/lib/node_exporter /var/log/node_exporter
-	fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
-}
diff --git a/app-metrics/node_exporter/node_exporter-1.7.0.ebuild b/app-metrics/node_exporter/node_exporter-1.7.0.ebuild
deleted file mode 100644
index 861e9355d3de..000000000000
--- a/app-metrics/node_exporter/node_exporter-1.7.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Prometheus exporter for machine metrics"
-HOMEPAGE="https://github.com/prometheus/node_exporter"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/prometheus/node_exporter.git"
-else
-	SRC_URI="https://github.com/prometheus/node_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI+=" https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz"
-	KEYWORDS="amd64 arm64 ~loong ~riscv ~x86"
-fi
-
-# main pkg
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD BSD-2 MIT"
-SLOT="0"
-IUSE="selinux systemd"
-
-COMMON_DEPEND="
-	acct-group/node_exporter
-	acct-user/node_exporter
-	selinux? ( sec-policy/selinux-node_exporter )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-util/promu-0.3.0"
-PATCHES=(
-	 "${FILESDIR}"/01-default-settings-1.7.0.patch
-)
-
-src_prepare() {
-	default
-	use !systemd && { sed -i -e "s|defaultEnabled|defaultDisabled|g;" collector/systemd_linux.go || die; }
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-		go-module_live_vendor
-	else
-		go-module_src_unpack
-	fi
-}
-
-src_compile() {
-	if use x86; then
-		#917577 pie breaks build on x86
-		GOFLAGS=${GOFLAGS//-buildmode=pie}
-	fi
-	promu build -v || die
-	./"${PN}" --help-man > "${PN}".1 || die
-}
-
-src_test() {
-	emake test-flags= test
-}
-
-src_install() {
-	dosbin "${PN}"
-	dodoc example-rules.yml *.md
-	doman "${PN}".1
-	systemd_newunit "${FILESDIR}"/node_exporter-1.7.0.service node_exporter.service
-	newinitd "${FILESDIR}"/${PN}.initd-1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/node_exporter-1.7.0.logrotate "${PN}"
-	keepdir /var/lib/node_exporter /var/log/node_exporter
-	fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
-}
diff --git a/app-metrics/node_exporter/node_exporter-1.8.0.ebuild b/app-metrics/node_exporter/node_exporter-1.8.0.ebuild
deleted file mode 100644
index 8f35f716feb4..000000000000
--- a/app-metrics/node_exporter/node_exporter-1.8.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Prometheus exporter for machine metrics"
-HOMEPAGE="https://github.com/prometheus/node_exporter"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/prometheus/node_exporter.git"
-else
-	SRC_URI="https://github.com/prometheus/node_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI+=" https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
-fi
-
-# main pkg
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD BSD-2 MIT"
-SLOT="0"
-IUSE="selinux"
-
-COMMON_DEPEND="
-	acct-group/node_exporter
-	acct-user/node_exporter
-	selinux? ( sec-policy/selinux-node_exporter )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-util/promu-0.3.0"
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-		go-module_live_vendor
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	[[ ${PV} != 9999* ]] && { ln -sv ../vendor ./ || die ; }
-	default
-}
-
-src_compile() {
-	if use x86; then
-		#917577 pie breaks build on x86
-		GOFLAGS=${GOFLAGS//-buildmode=pie}
-	fi
-	promu build -v || die
-	./"${PN}" --help-man > "${PN}".1 || die
-}
-
-src_test() {
-	emake test-flags= test
-}
-
-src_install() {
-	dosbin "${PN}"
-	dodoc example-rules.yml *.md
-	doman "${PN}".1
-	systemd_newunit "${FILESDIR}"/node_exporter-1.7.0.service node_exporter.service
-	newinitd "${FILESDIR}"/${PN}.initd-1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/node_exporter-1.7.0.logrotate "${PN}"
-	keepdir /var/lib/node_exporter /var/log/node_exporter
-	fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
-}
diff --git a/app-metrics/node_exporter/node_exporter-1.8.2.ebuild b/app-metrics/node_exporter/node_exporter-1.8.2.ebuild
index 74515ab14c73..d2235073a3a5 100644
--- a/app-metrics/node_exporter/node_exporter-1.8.2.ebuild
+++ b/app-metrics/node_exporter/node_exporter-1.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/prometheus/node_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
-	KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~loong ~riscv ~x86"
 fi
 
 # main pkg
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index bab20687e458..40dec56cb288 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/koleo-cli/Manifest b/app-misc/koleo-cli/Manifest
new file mode 100644
index 000000000000..a1738e2605f9
--- /dev/null
+++ b/app-misc/koleo-cli/Manifest
@@ -0,0 +1,3 @@
+DIST koleo_cli-0.2.137.16.tar.gz 26468 BLAKE2B 7f42691dcf32dd11b82c7664cdf1234ee21b7898857c6f44a33e66533140b055ae90f6d50b44d1bf3e7db806292eeff56dc82923d1e07d2129994355c6d7c32b SHA512 7ea6ebb84986bdcdf679b13eba625d6c1e4f07c4b706c7eb3dfb4efafae420fb414c756bcb2fcdf72cca088374be67e233a176e3bb0f6edea26d54cda79d9018
+EBUILD koleo-cli-0.2.137.16.ebuild 638 BLAKE2B cd712f8cbb3cf6e0195ca0aa2984eaad18584c522dad20436a97d49eae283cea52de86075eda7b846895e0cfac88df7a0c8725a670d01e794ea7a48bf9fb42d4 SHA512 0ed01b43a6dbc314218dd84d7ac3614e89062e89cdf29ce04d841c1a80b141051f5a3ba4982f0953998caf57498677abbcae46bd4575ac308d9112d520b4d374
+MISC metadata.xml 379 BLAKE2B 0309acfc6609f2dc9fe425b523af9ff0e33554cb5fbf24391d9a2879b0123a3afd9a0ccd4d74ac2ef7c4f5c0201b8daf223e9adf062747874114b69700a87bd0 SHA512 aa103d1550a1d28dab04bb178ca20e73c2e429cc401907ca2200165ca95ed972d0236687e412f548343c538b0d0d3671615282feed28754887d1c907346ffbdf
diff --git a/app-misc/koleo-cli/koleo-cli-0.2.137.16.ebuild b/app-misc/koleo-cli/koleo-cli-0.2.137.16.ebuild
new file mode 100644
index 000000000000..e16af26dabfe
--- /dev/null
+++ b/app-misc/koleo-cli/koleo-cli-0.2.137.16.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{12..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A simple CLI for koleo.pl railway planner"
+HOMEPAGE="
+	https://github.com/lzgirlcat/koleo-cli/
+	https://pypi.org/project/koleo-cli/
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/rich-13.7[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.32[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests import-check
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unpin deps
+	sed -i -e 's:~=:>=:' requirements.txt || die
+}
diff --git a/app-misc/koleo-cli/metadata.xml b/app-misc/koleo-cli/metadata.xml
new file mode 100644
index 000000000000..13868aaf6846
--- /dev/null
+++ b/app-misc/koleo-cli/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lzgirlcat/koleo-cli</remote-id>
+		<remote-id type="pypi">koleo-cli</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 2a5b6fc5c9bf..f36755b42112 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest
index 3e552fea3327..f4c55a3338c7 100644
--- a/app-portage/metagen/Manifest
+++ b/app-portage/metagen/Manifest
@@ -2,6 +2,6 @@ DIST metagen-0.7.3.tar.gz 9607 BLAKE2B 3c5b9debf10b0a6dda9bdf0e45e157c80019d0496
 DIST metagen-0.7.4.tar.gz 9291 BLAKE2B a1ad7267202f8bc477002a4c9deeb0cd26c8f2163f4fb3a0bf74e39b46448f3ba29dcec1201f41a0e98af8780b219102f3733b957a4e87293cc5e04486e39755 SHA512 e3d37cbe32fabbc980185d9948f6a38dfca756f727d86c26f7f5bd92e768bc034bffa14995844347bb3e19fe2d8757dcb45a3cab5b9e58d97c9c562b75a90d26
 EBUILD metagen-0.7.3-r2.ebuild 899 BLAKE2B 9d33b8c980dae96f6a694f4644b51b8832b2e5ef8d9e92b85e392b3bbbddb72c94eb22c47087bf47cb6f87d4c28c2dd29e3a11bc76ab0f2051d370aa18e5b7f4 SHA512 3ed3643eb354e5701ce2f8912c5237c65401aca45dc4cb7efecb928120f87f172c62bbfab7c5305a814254dd44c79c37c8fe77f2f1685c3a7a79948e79550c30
 EBUILD metagen-0.7.3-r3.ebuild 902 BLAKE2B 2473c96154267e7f565e4f75fbe042aef7126b51e528d33ba7eed7dafa722c431a1e1264700d04c238c44b4bb832d11a19c836886f02f2a91ef6b6c61c8e3ac2 SHA512 ea68677556cd63627b5df01f9196961778468ba02052e0bc5304c614603088a50123e27c55e93e002417e68849d10981b38fed0e4681bf720b5ecf7dc4906424
-EBUILD metagen-0.7.4.ebuild 818 BLAKE2B 9f18e205124a1854448e5a1533e13080e8b79f78b4ddb18bbc08538605a9e8133d0dc807ac66da88df1ec2a6904920844635afac574a1447e2c8d9664a22ab73 SHA512 80ed6d6ba41180f7a32a380fc40dfd115a3faa56b0a2e84a6b7d8a295679f13b47fc2bea2401bdb72bfbf8204cc9b19d898e2af0f5cb02c9374e5deecee77e77
-EBUILD metagen-9999.ebuild 887 BLAKE2B 52445c7c1be5a8cc80efba1173e54789cfd24d4d3ddeebfd219549a1c5dcd4341804bd747c33e5c6f8469153667b816fe47533dd07a582e8f4fc63627777ebd0 SHA512 66377e9c163c8ed600dee4a377ee24572861eb9fcd800562b71edc5dbfc0bb6bead7e8aafef5a82240ae14bf080ea5cd039fd7139262a3358af284a468e70b2a
+EBUILD metagen-0.7.4.ebuild 819 BLAKE2B 08c2ed87eda65c167c979a8b5d4079ae19a89a8769087077fbc009686bbcaf9e0956b844870ea5cddd6c502456ac7c8a7d2901e31bbe2c06e6961e3cf229410f SHA512 94c82df203c88a659d8867c59238e84e6d8d8048714ee8dee9e987d2c89fcd358e515eb623fbce20c829f37518c9608c6ae56885290d97ed35edf2f5975460a9
+EBUILD metagen-9999.ebuild 807 BLAKE2B 2bda502f33e5e23a878b693806a733e8e559e86f8facf336220570a75c3f8921f52e2d192796165620747490612887058bd849539afc23f3074d4d423ecae287 SHA512 e056427c67e9f6ba31824c7fca3d41c421884f0b5e31e568a1e1b5d1e10759d3e2e587a2f8b8ce578bc43ebf17c22aaac8487c7625d1671151da9e3177bd039e
 MISC metadata.xml 320 BLAKE2B 4321891734786ba01e58321578aa81d5b67a974a24c743003a206c82762f3e8d0582f3f8177ce11b29eae18017d301d5a7b3a9e5048dda134077d66dfdbf3401 SHA512 842f0f4e3ee5e995d504c35bdd1aa00a9b923a916b7395edbfa9134190bc36afef608fb3967deb7d83be2467cc15ec3a677d6bcba5f3aa9c7920d9e9a8816f31
diff --git a/app-portage/metagen/metagen-0.7.4.ebuild b/app-portage/metagen/metagen-0.7.4.ebuild
index 3a735ec891c4..d1b37a4c8a24 100644
--- a/app-portage/metagen/metagen-0.7.4.ebuild
+++ b/app-portage/metagen/metagen-0.7.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1 pypi
 
diff --git a/app-portage/metagen/metagen-9999.ebuild b/app-portage/metagen/metagen-9999.ebuild
index af57fda6c7ea..a77c916e9302 100644
--- a/app-portage/metagen/metagen-9999.ebuild
+++ b/app-portage/metagen/metagen-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1 git-r3
 
@@ -15,11 +15,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 
-IUSE=""
 DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
 	sys-apps/portage[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
 
+distutils_enable_tests pytest
+
 python_install_all() {
 	distutils-r1_python_install_all
 	doman docs/metagen.1
@@ -28,7 +29,3 @@ python_install_all() {
 	mv "${ED}"/usr/share/doc/metagen-{*.*.*/*,${PV}/} || die
 	rmdir "${ED}"/usr/share/doc/metagen-*.*.*/ || die
 }
-
-python_test() {
-	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index f0f0c6625226..b9b285dac0fb 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/hyperestraier/Manifest b/app-text/hyperestraier/Manifest
index b4c7fa8a7d0c..3824b3d77347 100644
--- a/app-text/hyperestraier/Manifest
+++ b/app-text/hyperestraier/Manifest
@@ -1,7 +1,8 @@
 AUX hyperestraier-configure.patch 12359 BLAKE2B 52fb2210ee4945c07fcd4e9812be052a748eed64ab323bbfc33feec828d56bb9243f64ec800e9750b094e84c6347ee6c25e74d6881ab2f9b012e13f6b28a06b6 SHA512 db0496b6e826ece8db2d9bae4758134b56204982e07783986cf0406df7a3c7006a39ccb56dcd4b303bf1b1227acc43b98533546dd5957ae6334fe56e3ad63378
 AUX hyperestraier-java-11.patch 2602 BLAKE2B 718462095f4ff2746b2193cddd366de547591047eba53fc855c48be7d90069284771b2c007e4d13c80e7d11a74ae3c9ab7ffec6dcb1b86739fc81b2d1a0ffc04 SHA512 81077f319830d6ab28164cfbd5e57d89a0ddf0197135dbf71b3d33f1edc2b21e253431604122f1f82e718dae125228da57a93585d2ce9bce478ddcb8dceb17d8
 AUX hyperestraier-perl.patch 844 BLAKE2B fd221a027e47ed7582e697a8104d1ef82d66b87919f20c82f185b9167ad03ae6b9f0b6996b47a99e58fb42443f1c1b1c9f53a6badab935361b26f8693b680694 SHA512 73c7bd659d80464baf1d28a0eed69c9fdb3052a62aa46dc0b56f2ba6f75d458531dc6023684bd92b22b7fc4b79869ccd82e835827096b163faee0f94b0615465
+AUX hyperestraier-ruby-varargs.patch 563 BLAKE2B c20af35842e46c899a0473f4319a5d44c18e78f752444fadf5c6109070b0b90587fad3377eb49f15065a1069a2262c692f95753c34f160cd9ac2dba6a24b45fd SHA512 21b847654cf2527fae5772c5cd67b67dd5c4285bc28786764ad19d3e97b815870af103f5afd726eaefc55874c215dc13aac08facdb2246e86c3f07c4679e0640
 AUX hyperestraier-ruby19.patch 5143 BLAKE2B c9ea3c9e045583dee3ca119ebea07946522c50b00aba4d94fc40f7172925b9aedb8cbdc88e087a87590422566b12269641511c2c1c0a484390b1c2fa8bd1fecc SHA512 fcae611f594eeb35b6aca6eb1139304538793afc6b794e8dee1a59243d5da216f364165c90e7cf7691ed9a7f38a610ba27f37c2eef2baa4042c4a993cbfefb2a
 DIST hyperestraier-1.4.13.tar.gz 1014600 BLAKE2B 02be7cd374c47094dedd239e967dbbe5045a77302125861541dbf4d5fc60d488968718fd6b9ca57b88aac96cf2cfe73397af6bbc3d53ff6e983063ed98748e70 SHA512 ec97f487bb0e085f74222106fc5fab227c8c02ee8d736c0b4adef57ec0e4310f829ac59fff5a1c92321786e89bbc2a059a0acff6ab0e5844b83627567bb265fc
-EBUILD hyperestraier-1.4.13-r2.ebuild 3619 BLAKE2B cd4374914774a416efe33b1e596785073c4545042dc5160109389116849c0dd8f7da8e74c68f43ae93fd0cc66ef8ea7a334297948c93e92775877a1ae49f2a52 SHA512 c82cb4e4011aba6eb9da0373a3d7bb88bb1e8e5494712a580cd70b4723df08e859d892cdc3f0af0f6fbdebf582ec49d8cc4aac727057a4736995d4f7eb8a3836
+EBUILD hyperestraier-1.4.13-r2.ebuild 3652 BLAKE2B 8819fb063d31926b36295b919122963b4f42f429e5be511ec71c3522f4c96db1f7ad0ebd0e4faed7731e9b1a0864694a8ed857f5bab0fd7d9ca1785edcc7ed74 SHA512 f4c7bf76ecd11621e90b45d44e5adc483150a17c61f60673d8a75a76b2a1539ea1824cca728f9eb7044dabadf0608bb4862fcf83edf35f35f5d7f6f368bc2ebe
 MISC metadata.xml 441 BLAKE2B d0c43a24b0a988b9b5d30a7c0d002ca45587c13f166dc2b43cfabac3b4c73f78a57cbee98d5967609dcaff3bb8e25b6be2df2f6328fb6b441e5b15d3dc0ce9bf SHA512 aab164bf0b80548a5867b8347963f9bc8dde159e879fc464e8b12e9a1f7bfa0dad572d453a28ab5d0fb6169cc6238f9a2f79016ee835b0560396f1631b3f3e85
diff --git a/app-text/hyperestraier/files/hyperestraier-ruby-varargs.patch b/app-text/hyperestraier/files/hyperestraier-ruby-varargs.patch
new file mode 100644
index 000000000000..bcf2753f3a0a
--- /dev/null
+++ b/app-text/hyperestraier/files/hyperestraier-ruby-varargs.patch
@@ -0,0 +1,20 @@
+--- a/rubynative/src/estraier.c	2025-01-19 09:16:41.340299738 +0100
++++ b/rubynative/src/estraier.c	2025-01-19 09:17:18.404701204 +0100
+@@ -125,7 +125,7 @@
+ static CBMAP *objtocbmap(VALUE obj);
+ static void db_informer(const char *message, void *opaque);
+ static VALUE db_informer_process(VALUE arg);
+-static VALUE db_informer_resque(VALUE arg);
++static VALUE db_informer_resque(VALUE arg1, VALUE arg2);
+ 
+ 
+ 
+@@ -1259,7 +1259,7 @@
+ }
+ 
+ 
+-static VALUE db_informer_resque(VALUE arg){
++static VALUE db_informer_resque(VALUE arg1, VALUE arg2){
+   return Qnil;
+ }
+ 
diff --git a/app-text/hyperestraier/hyperestraier-1.4.13-r2.ebuild b/app-text/hyperestraier/hyperestraier-1.4.13-r2.ebuild
index c5934ea45287..537b033d18db 100644
--- a/app-text/hyperestraier/hyperestraier-1.4.13-r2.ebuild
+++ b/app-text/hyperestraier/hyperestraier-1.4.13-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32"
 RUBY_OPTIONAL="yes"
 
 inherit autotools java-pkg-opt-2 perl-functions ruby-ng
@@ -34,6 +34,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-java-11.patch
 	"${FILESDIR}"/${PN}-perl.patch
 	"${FILESDIR}"/${PN}-ruby19.patch
+	"${FILESDIR}"/${PN}-ruby-varargs.patch
 )
 HTML_DOCS=( doc/. )
 
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 6a4e087c46f3..7e103d9bae76 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -2,5 +2,5 @@ DIST Sigil_User_Guide_2024.08.15.epub 12641984 BLAKE2B feaa8a4f6b64786d5cbf494a6
 DIST sigil-2.3.1.tar.gz 17475697 BLAKE2B 668d02f941c900921224977bc2d8edeb6a21cf7985d1f7980ffc6b8ecc6627fe5a29f71ea75e12d1f54c2b1959afa7323dda807b1189e4189a996e98c90bdea2 SHA512 da0433882040212a8385c1b872b568ef39660b6c0127d64d9fc4cdd4f3939c2e14f3d08056ab1b405142e012caf363ebfe170761a74e684590c1a358e1115d09
 DIST sigil-2.4.0.tar.gz 19135045 BLAKE2B 311fe0894818c08fc5ecee8b29b04e24aa8f13d4f28b1011f455fcf7944561e68832ddd36885f69f794333bb790b7b84c49bc6d3d2367772150e936708916d0c SHA512 1c5687f31494ea5f1c8e3ac5fe3c3892ee68a0645795c57f10802d4e579c95a4ef5e3cb0fedc598f647282b3fe7b56e1a3efd547e08a44fea4619ae5b9581c20
 EBUILD sigil-2.3.1.ebuild 2239 BLAKE2B b65ea5a5e057f828cb5f8a092de01b2d05d70112c51f3279254ecf8066169c02ac7719ff5cc90465a62a90e07407bc161499622284da8939ec3ddf44094597dc SHA512 ceec367745e5ff537ded0bbc84bdc44b91bcc27d451ebe751dd91e5b547e58ed7835d965584e1fd6eebedf2dcd9c8d8a8267807fb37bfc911c30804609963f5f
-EBUILD sigil-2.4.0.ebuild 2258 BLAKE2B 85f7058dc2c33a9277c4704f1653c24dd649ff78b672025cb1d84e79e53aa0abf0825269b490104a8e670da90732a793ea56ced344b3df08fa0489b302961d5b SHA512 5bfd21c58859fb93c8c09e72e093cd8d34b506ffbd8b9142649f351f6f9a97e4b182c21c43ad1b667afe94caac15d93265fbb7eed0007ac331bbfe053d6b84ee
+EBUILD sigil-2.4.0.ebuild 2257 BLAKE2B 5b93eac3bb8ceb6c857e06807a23da009b03c34d836cf53f2eda33a44676f1c9dc46c2884816ebe0a91c56c33ec429f9d05b26414a6bb479fe04706d61ceee48 SHA512 71654f5193d0829b03f30639506c13ca9d32358e6749df1e00e6d5c3262520e86e0b1750e8945f42cc1ea4c478cba8e5d14c18156d852faa03d45a08563ddf3e
 MISC metadata.xml 810 BLAKE2B 9790a33fa436de084e57410b5fea4fc477bef40dafbc9b0467b0b01a27dfcb9b6874df529f5e0ecc1aca5e48fb07adde0b3a8c99fdd1ff1bd14f6877ecfedc98 SHA512 8b0c12e38cf8516e139bc1277062f0499148b6eba417e9c65389dd5aa8fdae9b967cffbe066f5e3bee5ed11d2eac2d909c782dc3b3f1432b3f4515adb04acaf2
diff --git a/app-text/sigil/sigil-2.4.0.ebuild b/app-text/sigil/sigil-2.4.0.ebuild
index c071247e701b..c8972858090d 100644
--- a/app-text/sigil/sigil-2.4.0.ebuild
+++ b/app-text/sigil/sigil-2.4.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${P^}
 
 LICENSE="GPL-3+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc +plugins +system-mathjax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-text/zeal/Manifest b/app-text/zeal/Manifest
index 20fb9233fead..fb87bc26a6b5 100644
--- a/app-text/zeal/Manifest
+++ b/app-text/zeal/Manifest
@@ -1,9 +1,4 @@
-AUX add-missing-qt-components.patch 532 BLAKE2B 278d3ff4d5833d4b5e63be4fe8bb9942fa764aa97426d415793436b431d8ecd3cc44b687d2b594ec5eedcf44661174d15283b4d2f7a235278c499ec64c97c446 SHA512 3dbaf47a8d197f6892a430bba0f8e89410923fe405a1d5318c0081e66784fc125e29254f81a0da4fba31a38f60858dde35309ec7e3fa0f8f64423631f8fa6fa5
 AUX disable-werror-0.7.2.patch 349 BLAKE2B 716370eff9708efe384e8c119bd4580a85820d8d3cfe4d725fca9e44708132b71d234abdf6516899b9f978b312799af84538375f25e1a568ca1ad03ad6138672 SHA512 33fe55a13d64ff4a466eb495acdf0a7b7e02737c187ed9c41ae735e0ec35d7bcc9da45baaeac7deff6ac6f4f58f72fa56270c7efaa3fa758098047d0853ae469
-AUX disable-werror.patch 245 BLAKE2B 187197e65082ce3724569fde73a4d737ff24881cf80d9383d4c83e17c2c8d23667bdf4fabcc12eb5e65186896e1cb66123fa1704299ef3eecf5288e64a4ef900 SHA512 de53fecba780c088e3dc0dc2d69a2e1a48cade216b048b55078eb4dd6758962aa2a353f7981bcd21a6f117de6c0d233dae438c157d0eff129e93669acaa42f84
-AUX qt6.patch 404 BLAKE2B bc757d9ee15e4a85750bc6762107bcce5b7bfd71988738ef08120744d0c9d846bf8dc97946bb76e7439dde49ce6ad4150bfa96b66e0f7a406000caf9eaf43437 SHA512 5fc4ebeedcba98aec13e150eb1a3a1ba82490537431ab765944ee323ae243ec94fa7cc451fa4aeb86edc8892f4a796cff1bb2fb21083cf1902b84ad11fde43e4
-DIST zeal-0.7.1.tar.gz 1195333 BLAKE2B 56e6d56e152ed94559d15ba4a5dd7972466db75a4d760640b55b532ba3ed325a429e8e03f450efaa3e24f09af68ff5b43463d9b8f21b8a9bd11e23a3841780c4 SHA512 bf2b5e2878b349ec4e5e74377a2a74e263d5f20649f152f194375547c5e69b3e6115c9d0f103acad7f087b20456d888a3be9f7ce1aa232206bba7e0ed38d252b
 DIST zeal-0.7.2.tar.gz 1217853 BLAKE2B e82c3a977375317cfb4d5ad32f577f668f38cfc1d3a2685d44c96814817623001a8fff848a04acf07d3ab942bee9a0c6801dfadad3fceaf24d55beb5a78a9522 SHA512 41f79f4c441938a60f80796376de31643ad1b80d989c6452653647be533b6e4e23d96b556895c457d574e00d75a57e4b2ef2a77096fa1d120e0c2e5b511366fb
-EBUILD zeal-0.7.1.ebuild 1139 BLAKE2B 9352a25414edd8c98c0286f4a29679e9c1d9ea317903ba3dbbbab0e501365ede3e7887aa4a63fe4fbf15f511bd72ff596a4ccecf15321a9dfac272c5cb6a2a96 SHA512 d2d3e7df26792245772cce9cf758eca010da301c5f495bc21548b38233bce474cf66b3995c1ea028feb5a03fc02450eada7cb4c705ab87e2cac125677f459e38
 EBUILD zeal-0.7.2.ebuild 1059 BLAKE2B d54945df5e7c40d8c2ae0094d7712d9b76ace693219a269b6b3473fafe0a673f4cf8968ee49909a48da88a6b77c9f438448cc814d3b88f9644528bb444809baf SHA512 0f598896376ffe35da63dd7c6dcc7ac1cf8af7a7d66b922c0b40445b6d17ea82ceec2e0700fc240d8f04ea58f0eb4e839d96b84d4100b3fe6b0c6a397bc85e24
 MISC metadata.xml 417 BLAKE2B 50581ec25cc6d51691295bab1d4e8b8351bb396dacbaed3f9a7db94ef01b6174705173db502faaf3130f7d0b6dabb7d3e7f20b7f19a0d92623338b1eaa7e3fb8 SHA512 3722502b6bb659f808866f3a04b02d8f5f6eb337e20c321baf863b52ccec0da99a62647c32e3472fcb05defe83b33de35bc2c472f8baa640f1db9f9380c52d4e
diff --git a/app-text/zeal/files/add-missing-qt-components.patch b/app-text/zeal/files/add-missing-qt-components.patch
deleted file mode 100644
index 423bfed0b081..000000000000
--- a/app-text/zeal/files/add-missing-qt-components.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Backport of https://github.com/zealdocs/zeal/pull/1644
-Done manually because CMakeLists.txt has CRLF line endings in release tarball.
---- a/src/app/CMakeLists.txt
-+++ b/src/app/CMakeLists.txt
-@@ -1,4 +1,4 @@
--find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets REQUIRED)

-+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Concurrent WebEngineWidgets Widgets REQUIRED)

- if (Qt${QT_VERSION_MAJOR}Widgets_VERSION VERSION_LESS QT_MINIMUM_VERSION)

-     message(FATAL_ERROR "Qt version >= ${QT_MINIMUM_VERSION} is required.")

- endif()

diff --git a/app-text/zeal/files/disable-werror.patch b/app-text/zeal/files/disable-werror.patch
deleted file mode 100644
index e1811d3098de..000000000000
--- a/app-text/zeal/files/disable-werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -59,9 +59,5 @@
-     VERBATIM

- )

- 

--if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.24.0")

--    set(CMAKE_COMPILE_WARNING_AS_ERROR ON)

--endif()

--

- add_subdirectory(assets)

- add_subdirectory(src)

diff --git a/app-text/zeal/files/qt6.patch b/app-text/zeal/files/qt6.patch
deleted file mode 100644
index 1312d63abb6f..000000000000
--- a/app-text/zeal/files/qt6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -22,7 +22,7 @@
- set(PROJECT_COPYRIGHT "© 2013-2024 Oleg Shparber and other contributors")

- 

- # Find available major Qt version. It will be stored in QT_VERSION_MAJOR.

--find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)

-+find_package(QT NAMES Qt6 REQUIRED COMPONENTS Core)

- if(QT_VERSION_MAJOR EQUAL 6)

-     set(QT_MINIMUM_VERSION 6.2.0)

- else()

diff --git a/app-text/zeal/zeal-0.7.1.ebuild b/app-text/zeal/zeal-0.7.1.ebuild
deleted file mode 100644
index 4705da258387..000000000000
--- a/app-text/zeal/zeal-0.7.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake edos2unix xdg-utils
-
-DESCRIPTION="Offline documentation browser inspired by Dash"
-HOMEPAGE="https://zealdocs.org/"
-SRC_URI="https://github.com/zealdocs/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	app-arch/libarchive:=
-	dev-db/sqlite:3
-	dev-qt/qtbase:6[concurrent,gui,network,widgets]
-	dev-qt/qtwebchannel:6
-	dev-qt/qtwebengine:6[widgets]
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	x11-libs/xcb-util-keysyms
-"
-RDEPEND="${DEPEND}
-	x11-themes/hicolor-icon-theme
-"
-BDEPEND="kde-frameworks/extra-cmake-modules"
-
-PATCHES=(
-	"${FILESDIR}/disable-werror.patch"
-	"${FILESDIR}/qt6.patch"
-	"${FILESDIR}/add-missing-qt-components.patch"
-)
-
-src_prepare() {
-	edos2unix "${S}/assets/freedesktop/org.zealdocs.zeal.desktop"
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DZEAL_RELEASE_BUILD=ON
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index dea2505f79a1..993dfcd7e721 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
diff --git a/dev-build/cmake/Manifest b/dev-build/cmake/Manifest
index 1d25f4e666d3..11df2ef78c64 100644
--- a/dev-build/cmake/Manifest
+++ b/dev-build/cmake/Manifest
@@ -27,7 +27,7 @@ DIST cmake-3.31.4-SHA-256.txt.asc 833 BLAKE2B 934ed510e0c8e5b49d5ae57bae1bc32cda
 DIST cmake-3.31.4.tar.gz 11708192 BLAKE2B 7b51c138fdabec174de74319fa9cc5920973e96f46b8fa9859c95763180c3f29c8ba9401936afd23ccf72790bd0fa12c4236eff1c487e78898442c7dd0a295d6 SHA512 86fef54e3c60a2d050bad97968a76f9c2a663fbd0be433fe3ecbb3268e3ef8243dfcb52f0d7ba9d8b03341c142ee02b33d367dd56597e1af79f6efb553b9eb82
 EBUILD cmake-3.28.5.ebuild 8722 BLAKE2B f6e341a4652c2a42cd495a670c19ed03520d609ca9df03f0b9c79934f34e7e54af3419758bdcc5fc0963c3046660d116aaf6c5a156c3bfe046e8924b17fc7478 SHA512 03f33e94c1fe7dfc53bba884f901cfeecf6f3dc60606f8e0c45814838f309e950d9239d49c62dc0079ec126dce600033d54acf4439193cb0a6e7e5186a64a2d0
 EBUILD cmake-3.30.5.ebuild 9177 BLAKE2B 19559d4c111e459929fbe5a59c730222468ab8fbead975782e3d5dbe5ca1e830415fcd1940bfc40c90e6334f827db3a7fce80d8298fb86cb81300b0a5f92387e SHA512 c40e018c4822014b840ce0097af17f1a0c580c4cf55b3584565a646e802e8f37bc17959325847ccb9ebf0306035a1a6d9443a93cd7aad8807da84bc62b61d959
-EBUILD cmake-3.30.6.ebuild 9179 BLAKE2B 1043cbade235c151cb58ed6e1931bac34f5f1d66965ba5e1e7a16b53aebc28a499e4819d4c0a3b64a04c234a83afb88fc8541cacc07d04b2d9bfa8e23bef10d2 SHA512 2b9dbb7eaa4712599b7d9f1322cb02997d610373418b457b4dfa3d186240db519be6ef43f94962962eae2aa4d76d9cba6c03a79c42e0730d5e3030d102ef2cf8
+EBUILD cmake-3.30.6.ebuild 9178 BLAKE2B 56a8101652aecb0687b770339dac6bca0331965cd5688f5b7f59c8e479c33bca9c4e4d5609471b1db94233e98786904f304cd53f9dafdc5520f2820739d64e95 SHA512 ac3a52e8bec3985b476c3603e2dd026fc552a92f670ccfa48f4411dcbf480737d85d6c0c0b7b6d61d4bfe9a9f1752b59c964928ad450219bef830ce5c803b792
 EBUILD cmake-3.31.3.ebuild 9854 BLAKE2B e96779d56bb03bd5b540365194d6f802cebd7ffef03e60f6617aa6e10141f879e3165ce7d1fdf731cfdd25aa48fdba0a6dd286e475e0da909bce16227b895ea8 SHA512 6ee346cdb4cc6a1b48ef87073eb6ee4a754b73cc8dc0965b4e18f2fa5a39d3f75e28c81556f7b1d969ffcf7c6da670d428dd3deccfe20c4dae3ce27c74ecc93a
 EBUILD cmake-3.31.4-r1.ebuild 9754 BLAKE2B 9b2365cd3b55a528bf73c605aedd86b1c0adbd9b92affde31a799c1592f368691b27155ca103677a780e914d9d4ed61d8a53ab38c93c0ca657b7ea4d09f45d4c SHA512 bd75f924fee400676141fc3d7d415a7282f4e4aee5ef66a11cb13f36c57d5377fd4334ac8f2d1853b32a29ef622b8d569da8b3dd9ccbb2a970d7283046150d4d
 EBUILD cmake-9999.ebuild 9823 BLAKE2B ad6c17d49ab8b6cce09488dca06ddad3fe8dc3904070c5ff2aea1cd83b55a6fee8bd579247a43959783ee885e7c2cf1eddfe9cb1002c29225ae7c42bd36ad4de SHA512 b467c07ec58780d59db1bd8848394a23c02690ece1725ff0bd97d848a7bf741cbeafb92dbbf65b7861daf84218881bab44ee367a547f411d08fdeb7329045158
diff --git a/dev-build/cmake/cmake-3.30.6.ebuild b/dev-build/cmake/cmake-3.30.6.ebuild
index 0f4b409229a0..bd15542a54d7 100644
--- a/dev-build/cmake/cmake-3.30.6.ebuild
+++ b/dev-build/cmake/cmake-3.30.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,7 +47,7 @@ else
 			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
 		)"
 
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 		BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20230817 )"
 	fi
diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index 92eab3199ca5..d209377f635c 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -31,9 +31,9 @@ EBUILD meson-1.2.3.ebuild 3279 BLAKE2B faf4ee6ad678f436ce37af1ec074207eee2f2033c
 EBUILD meson-1.3.2.ebuild 3411 BLAKE2B 71d25e070379acab0e87c57fab8226afb5f7939e7761317f4351a3f3fa6b47fba484c08cc33ca63eaec3e070d7b4760a4c6fc0bcf1370002c35926c73f339e78 SHA512 c2e470732e9b2598f8c9ce30d635e17b4cacfc2ce1be280c0d5f1ece91ec392078f6ab2f50e09e228b28cc2d3ce7cae7c98b20b9f4f3fe68713b162be8dc9c4f
 EBUILD meson-1.4.2.ebuild 5079 BLAKE2B 71538d46f5f2d0f34ae4ae2082ff5fa1d37413b769642aa577211502792a234fbdda2c119adcc4e2bab81c64b86bdb9721050c64d2cb3db4083bf403d1e38354 SHA512 d19349b37b49c7c131e89ed3c6f17c52be298295cf9d99d2245cc50dc4d51707fe738b96bea13411f3c4b553c84c6af685c978377526ff3aab4c5706b9e06b3b
 EBUILD meson-1.5.1.ebuild 4924 BLAKE2B 47ed021c4efbd4192172b27ae7dba70df733f426d068e774e9b0552d26c5c8e6e41fb3e97d1282c3b3543e59225a18a468fb9902bae96efa329ec34955288612 SHA512 597247bf8102f8b8891e17a565c67a9edcb379b8db6bc05f097ae934d27342622474e2ae77ff26306684e7caec487429e57a4c236721dab000afeca7b21fde83
-EBUILD meson-1.5.2.ebuild 4927 BLAKE2B 187df2e74851a788fcda20d5d23751287644b3fcccd583101ce5fb2ce65757ad44d90766ee43781332517d6b4f7c6051068044871984262d3bd9aea68c7909f7 SHA512 03e0c192979ddbbbca9d43f6bcfb1cda6e6c1c81c8a50bb41b7468e107de2e66635176708a5b0962cd77c7b3bade9c37a14d5196d0f5cfd2b55b3dcb7a83da2c
+EBUILD meson-1.5.2.ebuild 4924 BLAKE2B a3598d55c0e9b01de353d65c3ad38b6eaf24fa925d63cf5a139384110fc51166f7e7775bd28f0c0744aa24b02f832d28622f66cb0c4240862db9fa5dc38bbe11 SHA512 8454f814170720760d82d0e3ad9e6b23932f011518e53ad3f6da19d17007a2e7437d0c75339c0dc811dc699987d588f35d8be5d717f5853ae8d1202200e16a83
 EBUILD meson-1.6.0-r1.ebuild 4986 BLAKE2B ed603f35e0b81a00cbde98062752c4850590271d7543d96685e8764460b94379e7c79c87f6f4116dd6625a63c39a4a8bb69a98a3ea5d06196a2961d3b31861d3 SHA512 b8e71c9ed86f82de2645ccee830bb2b076f89d53dacfe58ad68f3f1c803b873f141e00b835099f38139290807efa5b4fa8bc48de52cf7a3a68a24554a32e8443
-EBUILD meson-1.6.1.ebuild 4932 BLAKE2B bf5e036f3addab796648e9bdf5c7062103962530d10cd584a626a915ac10a32d12139504b47daf5e87e3bf7b63e7ded742f8cca0b4b01ec1e702c8ba41cd51e9 SHA512 80cff3afa1c0735ab06bc0747eace6d166286330fb599a090fc64397f772593df0f73540079170bc7956cab7795c696a1debcb7dd5adbb4ca37180c71fb6bdcc
+EBUILD meson-1.6.1.ebuild 4929 BLAKE2B fcaa2e459c363ac655ea46afe21ac5029eb2e1267aa5ce440119603ad55b9cb2a7e2155541310ef8debed77b1c64791939e4ffd2fad52cb79e9e4715635a0634 SHA512 5ee34f2eb8d2b3ca97603610e9b6096e748002cbcee044f7b04c2ffd63ee259ed420ab0c2851a3833ab359dc6edef8c32e806915609ca85229e6b76cd8903cec
 EBUILD meson-1.7.0_rc1.ebuild 4932 BLAKE2B d93dfea08ab31608f0754a25a6241eeeaeaff2bc51ad48c7d61f4db06017bee76bc56275af22791a0e4b20f7c8c8db2abe0f9cf09e0931801769b942c631f1ce SHA512 71dbaedf371cd419ed69455c6efd6f77b3da7c90ff2f4a17e505b7e53e64eda0c17f77ba10a9682e0fba83fa0f0392203a6848f450771b6e2bd3dea72fa6b1bd
 EBUILD meson-9999.ebuild 4932 BLAKE2B bf5e036f3addab796648e9bdf5c7062103962530d10cd584a626a915ac10a32d12139504b47daf5e87e3bf7b63e7ded742f8cca0b4b01ec1e702c8ba41cd51e9 SHA512 80cff3afa1c0735ab06bc0747eace6d166286330fb599a090fc64397f772593df0f73540079170bc7956cab7795c696a1debcb7dd5adbb4ca37180c71fb6bdcc
 MISC metadata.xml 457 BLAKE2B 65bcd07bc76772c13ef3f5cf602206330c3b7456180d140b82ee1ad759762a9d0066b4c60001862ce8e2f99150bea411eb804e5df65ef3f7824dc790626319f3 SHA512 aacb863efe3f8548eb8e97a4be3c013ad8d351c0a6173f6204ac4df46054bddf934bdd6ea5673fbf4671b7aa83405847626393ac012c0db3bbc062c234eec1f3
diff --git a/dev-build/meson/meson-1.5.2.ebuild b/dev-build/meson/meson-1.5.2.ebuild
index 9f62c49303a5..7fa68e621475 100644
--- a/dev-build/meson/meson-1.5.2.ebuild
+++ b/dev-build/meson/meson-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2024 Gentoo Authors
+# Copyright 2016-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,7 +33,7 @@ else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-build/meson/meson-1.6.1.ebuild b/dev-build/meson/meson-1.6.1.ebuild
index 70a2f51176dd..bac7abfbfca0 100644
--- a/dev-build/meson/meson-1.6.1.ebuild
+++ b/dev-build/meson/meson-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2024 Gentoo Authors
+# Copyright 2016-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,7 +33,7 @@ else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 8d57053b3c2e..5a3455b86511 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/dbeaver-bin/Manifest b/dev-db/dbeaver-bin/Manifest
index ae7bf050af43..627c1480c30c 100644
--- a/dev-db/dbeaver-bin/Manifest
+++ b/dev-db/dbeaver-bin/Manifest
@@ -1,4 +1,4 @@
 DIST dbeaver-ce-24.3.2-linux.gtk.aarch64-nojdk.tar.gz 88491639 BLAKE2B 4d5332e9a885ff6caf0cafefc7a5f76990e87639e7838fecb1b30415ee1ddd45b95d3dd605308ed81a77987ac631668b3bfb83597e62ca2370761a0614c8e80e SHA512 2e441ea51f25124f56e5b2a0d06f146a323a038c838db4be90b3822f06cdf9c004f4b67c756f293d7cc10cd38184ad99881193c9863d743da4ca902526d97246
 DIST dbeaver-ce-24.3.2-linux.gtk.x86_64-nojdk.tar.gz 88525311 BLAKE2B fc4dd9c803d76042cc0ccc9f2af1387846b72f6e485986bb2df3748ea6a6d6bdaef0a94b06bd86e4d931f1b840371a238c0b1077860ec83faf62c65a9d106703 SHA512 7525c5a0288e0a5df068d91a99d471cab64525f9aa1e623564a1a668cc9a9a0bf22833c8b3f540c657953c23f8c1f066b7d8a349c7facfd3ff29d9d3e6c36307
-EBUILD dbeaver-bin-24.3.2.ebuild 1311 BLAKE2B 5e616ed8456eadf8a1a75593016456fc386e3bb71eef819ae1712efa9e66175e139ea68fa7d4b9124798a97f80d9dde068b7bf24fec1a9b5ddce0323644381c6 SHA512 89303c6049607c64e14b26a0b0bb12c21bb5a6a78f004cd4309c345bf56c60309bd83e7a404f5331faf195dc0e7dd282f64f6ed0c2031458bec158edfc793372
+EBUILD dbeaver-bin-24.3.2.ebuild 1347 BLAKE2B 01478ada7aeded7d676cbf06adb46e916794c89d3bd870fb01393a62d35fbdb0570917030da9c840d77f231fae57b07cc9d464284e11f2cd07fbd12986a537d7 SHA512 5e1d108d48417cb3fda5e27be9c7e9b9c121ec1d36450c411994c59b73500bd4b2370f2a5316b90ead620334c5a8cf1ab494ad56bcb7c2026a681a80de7ae499
 MISC metadata.xml 444 BLAKE2B d614defd513043df0e48068edb26a12e87836aeb5147088e7d6133a7a1c0082ed2ba21019c0685a8a445f914e489e3dc6a1f26117ea9d186991bc7dd9f2db495 SHA512 731b4bc1af75124f7e1e78870c9f689acebf36960a741b1f4be24b5179de19b26fc982276bc115216c40d0789b048e6db900ad33e945ec2b94b471366f13db22
diff --git a/dev-db/dbeaver-bin/dbeaver-bin-24.3.2.ebuild b/dev-db/dbeaver-bin/dbeaver-bin-24.3.2.ebuild
index ec6564b41605..6884c8f5a48a 100644
--- a/dev-db/dbeaver-bin/dbeaver-bin-24.3.2.ebuild
+++ b/dev-db/dbeaver-bin/dbeaver-bin-24.3.2.ebuild
@@ -21,6 +21,10 @@ KEYWORDS="-* ~amd64 ~arm64"
 
 RDEPEND=">=virtual/jre-17:*"
 
+QA_PREBUILT="
+	opt/${MY_PN}-ce.*
+"
+
 src_prepare() {
 	sed -e "s/^Icon=.*/Icon=${MY_PN}/" \
 		-e 's:/usr/share/dbeaver:/opt/dbeaver:g' \
diff --git a/dev-db/mongodb-compass-bin/Manifest b/dev-db/mongodb-compass-bin/Manifest
new file mode 100644
index 000000000000..b70ad5664cb9
--- /dev/null
+++ b/dev-db/mongodb-compass-bin/Manifest
@@ -0,0 +1,3 @@
+DIST mongodb-compass_1.45.1_amd64.deb 114196516 BLAKE2B ce79b13a9e590cb305e8bbc88d5838b67805d207d09f1bf6ac99cde96f5b7c3549c8d53d0cb7fee082878e2ef0d12da5cadaf6c238eebd2f3c48ad7f963b5d82 SHA512 98989fdebee1e526276d7b35c3fac4d541c740c3beb3e71321672a225a0881465a15f1c179b7546f46a75f06fd7d739e19f849d2b5d5b661298258f1543d8074
+EBUILD mongodb-compass-bin-1.45.1.ebuild 865 BLAKE2B 84c360766335aca90d5a6e718569fb29ab8d8ce9df1331bc2961e5f29f41d690faed027c9482de6120268b868825342949c0edaee99d9714143e514e1e28069c SHA512 1482c6948db7d0fba85c0ef70e542c06d78bca8ba402a06dfb76fe0c1f0fed7cd19ef0b0ce41de03ef01413a54c7d1fc7231fcb36db2791770f0f1bca1249dfe
+MISC metadata.xml 334 BLAKE2B eab2f1899e5f4a2848417001fc41857c70844a4cbb01eea892f8a23b324c7faf0a11aa6066582add9e8493238728b3a4f6a3e57b676c7dd6a07484bb15c79909 SHA512 95bd0e74a4188839c2dcde628bd4635e6f216ffd1b54825571045c2199d8ae6e0a9fcaf93edfdf3506bb5b297fa720339b85780f8f910eb567e8e555004d0d5c
diff --git a/dev-db/mongodb-compass-bin/metadata.xml b/dev-db/mongodb-compass-bin/metadata.xml
new file mode 100644
index 000000000000..46a639b29964
--- /dev/null
+++ b/dev-db/mongodb-compass-bin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arthurzam@gentoo.org</email>
+		<name>Arthur Zamarin</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mongodb-js/compass</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-db/mongodb-compass-bin/mongodb-compass-bin-1.45.1.ebuild b/dev-db/mongodb-compass-bin/mongodb-compass-bin-1.45.1.ebuild
new file mode 100644
index 000000000000..019ffd14325c
--- /dev/null
+++ b/dev-db/mongodb-compass-bin/mongodb-compass-bin-1.45.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop unpacker wrapper xdg
+
+DESCRIPTION="GUI for MongoDB"
+HOMEPAGE="https://mongodb.com/compass https://github.com/mongodb-js/compass"
+SRC_URI="https://github.com/mongodb-js/compass/releases/download/v${PV}/mongodb-compass_${PV}_amd64.deb"
+S=${WORKDIR}
+
+LICENSE="SSPL-1"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+QA_PREBUILT="
+	usr/lib/mongodb-compass/.*
+"
+
+src_install() {
+	insinto /usr/lib/mongodb-compass
+	doins -r usr/lib/mongodb-compass/.
+
+	fperms +x "/usr/lib/mongodb-compass/MongoDB Compass"
+	fperms 4755 /usr/lib/mongodb-compass/{chrome_crashpad_handler,chrome-sandbox}
+
+	domenu usr/share/applications/mongodb-compass.desktop
+	doicon usr/share/pixmaps/mongodb-compass.png
+
+	make_wrapper mongodb-compass "'/usr/lib/mongodb-compass/MongoDB Compass'"
+}
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 4a52cf485557..06f2d9a9b3ce 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -7,10 +7,12 @@ DIST postgis-3.4.3.tar.gz 14957514 BLAKE2B 2c472a66d6063c70a2a5b7d42953233c9d24e
 DIST postgis-3.4.4.tar.gz 14960460 BLAKE2B bf0a8f905dfde7023f48340dfc812ffd5651d9d909a684d445ed6401db7afa18a13045a3e8341946b8fc2ee302fe4b60afb52092d653705995346279cafc32cc SHA512 e561fba5d4eb3a8fb96d9e517a04de007aa1780990d1ba78a2ed25ea27245f46e60257280b3d0fb1ba4164beea798db8858c24193bb2925619cf5f024f8043dc
 DIST postgis-3.5.0.tar.gz 15031829 BLAKE2B a641eaa7b0407108e332bf6f244fef0d22d21ed34c16c2f3cb718f49acf9a0bb3b1bf8b1ec3d7eb4f731beeb652f37f666ff4b8d44c5a66db7da4a9a555caa38 SHA512 baf81b9133db34c87ecb5e019497df89fba9faf293ae2f2e4fa5578dbe608ff5310b5ca718a7bf94e76af51bf7b8ec4b1f69fad91412017d70cdcd70492ae9e5
 DIST postgis-3.5.1.tar.gz 15044755 BLAKE2B 98c56eaab63f000bc74500c36b923196d54183237b726117add1f13f0aec37926506bcdc5233d87427d948a3edea081e84327ad9eeec3e6b87d5b5bbb20359b2 SHA512 72d60b9cbb9652555f70e86b18d32a578799f4dff8749bfc91f91c2d32142b7c85bf2d50a1ea5effbc25f84b1cbdcaf4586400af89b5ab37e5c03a87e0d20a6c
+DIST postgis-3.5.2.tar.gz 15045553 BLAKE2B 48a43c483a3a36decd3c3bb1b482f0079daacc030788fc58de17ffa91ecd46286de1112604230e0a594e44ba4c6bfa00a31a0241e0c07ce8f52cdd8fd94883d7 SHA512 fcad74289d03bfe9d6eb6f0f5682c9cb03a90ba9c377e39727df85f5d66fa8f51ddb9a9bc7302612d13576cca92bff3717ed965d513ededfe8cf1627c1e2f92d
 EBUILD postgis-3.3.7-r1.ebuild 3359 BLAKE2B 8da9966c9ba7ac89cca4433789bfc4f688e1eaeb10420099ae1ce0861e87a4605fd6a671391468e3b8c7ff8c3508679a55cf2aa36ac1e5bf505f6fbc9b61498b SHA512 5da987d8b77958a7691e7ef4a6985efe902b4aaa785e89ab6b39098fa1cbcb59787c7e4381baa22ac9632ef90ddf71ff0acc1d19cc573ea21f908dd6ed466607
 EBUILD postgis-3.3.8.ebuild 3361 BLAKE2B 0d4834acb8c9d7a7193f8ae520543c240e1a135aaee704f45ab8e589aeae980fbc17fa114c4d0972a9df907bb2ddabf01b18dede0165ea3aedb4f44e1d97b576 SHA512 3d1cba1fcfe8c25c10d9cb85f62241ec6831bc219239063a841576519a79ddbfa53006645ad281a447903b26e01435bf21fb0b0a6b1c2eeff6298da633117c68
 EBUILD postgis-3.4.3-r1.ebuild 3488 BLAKE2B 310e350b28326a97de239e67f27e74f671976b589793186891e588f582eb8c14c0cd81ca5ca0cec44f3910327e994e17c772787a34c20e6cdce430099ac3c2f6 SHA512 6dbfd7ca11f73a27971ca90997ada88ece7ebe8c86cb477337a4b786724537a995da6503b5ce93911ad5669e4c7be7d5fe2704a37ce3b07cfed7a88238feb768
 EBUILD postgis-3.4.4.ebuild 3488 BLAKE2B 310e350b28326a97de239e67f27e74f671976b589793186891e588f582eb8c14c0cd81ca5ca0cec44f3910327e994e17c772787a34c20e6cdce430099ac3c2f6 SHA512 6dbfd7ca11f73a27971ca90997ada88ece7ebe8c86cb477337a4b786724537a995da6503b5ce93911ad5669e4c7be7d5fe2704a37ce3b07cfed7a88238feb768
 EBUILD postgis-3.5.0-r1.ebuild 3311 BLAKE2B 11230c62f2f51508b4de36ce5669f9821a0bf92b87ec032557adc93a04338c9a146e11c6eb851a18b08b6ebc1363a2edb18ef23cd0b70c9c940e795e98860d61 SHA512 834eb1e461bade89bc0de3122d2a96272ea89ec418ee042c4c99b7a033b20305b3a6c89fd0b114bb58a13a4782adb7aa556e4be7785d460ff4233682068e39ef
 EBUILD postgis-3.5.1.ebuild 3313 BLAKE2B 4febe29a6c803ca272fd64a937ecbd1419d14d92be64cf39a369407dcf897c12a4faa736e58256093a92e1b79db498967d80b8f988f4782148e7cc7232bdd2bc SHA512 ae94efb65c5d23c8afb4372630106321a614cc940e7a96699dafe81efaf60bbae4fa8c1d70f13732d1654cfbffc16f502c49af59e52134f3d925c56781c2921a
+EBUILD postgis-3.5.2.ebuild 3313 BLAKE2B c673b59e69706def3bc4f66388057dfb7e33b02295438b0a21b797e3bd57d9756467dd536e6d2a1915d2e3d3b3f30ab94958614b66cfab21601194cf9e499404 SHA512 518cd9548d0bd1c126a75e7d144f5008f44fa311098d6ff8d25f308ab8079e5f72f821b32a1b8147a5162507e4cf0728adadb997da63602c7ac16db4134027f1
 MISC metadata.xml 818 BLAKE2B 1f49aad6ae27cc838c1eb0908eaec3eda84400174b0ef20a7afd828a3212b0215761e3c6d8dcdb2b62cbb8c7bda7266854d93b02f121c253ae8618cb917e39ce SHA512 c344b128ea11c07a098bb5cf6f6cdf67677a43a6d40222e74258b26951774cf59ec9ad61b515cc6f5abaf5eb99593b38c66fbeabe3f7fafa52e16e055cb7f119
diff --git a/dev-db/postgis/postgis-3.5.2.ebuild b/dev-db/postgis/postgis-3.5.2.ebuild
new file mode 100644
index 000000000000..32c7b3420d1e
--- /dev/null
+++ b/dev-db/postgis/postgis-3.5.2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+POSTGRES_COMPAT=( {12..17} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi toolchain-funcs
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git"
+else
+	PGIS="$(ver_cut 1-2)"
+	SRC_URI="https://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk static-libs topology"
+
+REQUIRED_USE="${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+	dev-libs/json-c:=
+	dev-libs/libxml2:2
+	dev-libs/protobuf-c:=
+	>=sci-libs/geos-3.9.0
+	>=sci-libs/proj-6.1.0:=
+	>=sci-libs/gdal-1.10.0:=
+	address-standardizer? ( dev-libs/libpcre2 )
+	gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		app-text/docbook-xml-dtd:4.5
+		dev-libs/libxslt
+		virtual/imagemagick-tools[png]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
+)
+
+src_prepare() {
+	default
+
+	if [[ ${PV} = *9999* ]] ; then
+		source "${S}"/Version.config
+		PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+	fi
+
+	# These modules are built using the same *FLAGS that were used to build
+	# dev-db/postgresql. The right thing to do is to ignore the current
+	# *FLAGS settings.
+	QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+	# bug #775968
+	touch build-aux/ar-lib || die
+
+	# eautoheader MUST be disabled as upstream manually modify its output
+	# rather than using it directly. The version at runtime at least is
+	# broken otherwise. See bug #912275.
+	AT_M4DIR="macros" AT_NOEAUTOHEADER="yes" eautoreconf
+
+	postgres-multi_src_prepare
+}
+
+src_configure() {
+	export CPP=$(tc-getCPP)
+
+	local myeconfargs=(
+		$(use_with address-standardizer)
+		$(use_with gtk gui)
+		$(use_with topology)
+	)
+	postgres-multi_foreach econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	postgres-multi_foreach emake
+	postgres-multi_foreach emake -C topology
+
+	if use doc ; then
+		postgres-multi_foreach emake comments
+		postgres-multi_forbest emake cheatsheets
+		postgres-multi_forbest emake -C doc html
+	fi
+}
+
+src_install() {
+	postgres-multi_foreach emake DESTDIR="${D}" install
+	postgres-multi_foreach emake -C topology DESTDIR="${D}" install
+	postgres-multi_forbest dobin ./utils/postgis_restore.pl
+
+	dodoc CREDITS TODO loader/README.* doc/*txt
+
+	docinto topology
+	dodoc topology/{TODO,README}
+
+	if use doc ; then
+		postgres-multi_foreach emake DESTDIR="${D}" comments-install
+		postgres-multi_forbest emake DESTDIR="${D}" -C doc cheatsheet-install html-install html-assets-install
+	fi
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+}
+
+pkg_postinst() {
+	ebegin "Refreshing PostgreSQL symlinks"
+	postgresql-config update
+	eend $?
+
+	local base_uri="https://postgis.net/docs/manual-"
+	if [[ ${PV} = *9999* ]] ; then
+		base_uri+="dev"
+	else
+		base_uri+="${PGIS}"
+	fi
+
+	elog "To finish installing PostGIS, follow the directions detailed at:"
+	elog "${base_uri}/postgis_installation.html#create_new_db_extensions"
+}
diff --git a/dev-db/qdbm/Manifest b/dev-db/qdbm/Manifest
index 99fdb2774eec..04f08cb95664 100644
--- a/dev-db/qdbm/Manifest
+++ b/dev-db/qdbm/Manifest
@@ -5,5 +5,5 @@ AUX qdbm-ruby.patch 2517 BLAKE2B 504437bdb8858e8970ddcd61b05903de5aa1b0bc3c6139c
 AUX qdbm-ruby19.patch 10116 BLAKE2B 9a15c5d2e0cf8237edb78e68b2f9fde4868841bcca6abc08a33d110b9f25283e37fcb306c18bcca5495c7e5cedc778e3a2de2fe8414ce46c661a7c40d517cddc SHA512 f3e6c320a600ad3355fc74a333c28fc2dd904a2a52ca91a51f21b3dd14c7527bf312f5040dbc3e4f61d2dbcc0ade185e226333c79f9a04fc05437a156befc0e7
 AUX qdbm-runpath.patch 1133 BLAKE2B 9b1c8c211d8e4075a77a34f3d79ca15cb3d833801777bdb328293047539bdd1a51c08031b3400c11d10732aa7864078ca8db02713a95cd90704e1a9e26f5bd10 SHA512 de8bde4a614617d742131e8025fd661019ec81b803817ef32ffca461b2c8b60c20756f6e6f84d6f23124eed3947ab3573b8c4a05b254f8b4d3e53f0cf7bc8452
 DIST qdbm-1.8.78.tar.gz 1015429 BLAKE2B 1b985d856ff18ddfeb2d779694ba9a76006908b4b2a7509d4e3668aded80e08bbde28bcc24762ec27048cdc01dc84f9872dbfc221e8eea6f1c68f5e81cdc69d3 SHA512 480549c56071bf82edf714a611aef863599c858ed63702820ae0890fd2c0029d1a231ed94a8090c74420dd648bd3625d270a5c078b113cbb86a12ef509e19037
-EBUILD qdbm-1.8.78-r5.ebuild 3533 BLAKE2B 66b573965cd7119294452e0e6579cd5b5e347f54799bfb319ac78aaa59bfd4bafa8def12f858f1816061544fac42267909393590468fb6dcd6408cdfe8592bf1 SHA512 9d180284a26e8650327063126f58a754d4726b55554fa9c899988beec849a2eef84c62328f7197023eba244b11ba730ca48487f51c61e4de2dcf1e42969814b5
+EBUILD qdbm-1.8.78-r5.ebuild 3540 BLAKE2B 668c9653dc0eb5f9b9eb9523d51697e14487e08c9793c1f64c382686d2135efa5360e90354121fcfb8a1924917e2083fc3f80b278b07460020b770a9a5471913 SHA512 94d1a0ed8614704102c379ae9b191d4f6d5b8ef66c4b32dd04cb15448980675c058c6362c741137557c77aadfb64ace57ae5d2c49a9079d02b56db3eb3889879
 MISC metadata.xml 249 BLAKE2B a37da98d387308dab889eab2665b67e4176707f3c115a7a69cb7f4b19f9864b96bc2fe70efa105e627c4b57a7d626f6b23dc2709a225a9debada3356f3cf32a0 SHA512 a5095fb01e05f24583a962e36131b2f02cf2d1dd7a97051200e465ad97db014721de7c1857f5eb736cb0290682e8de833cb4c735f7de8d98cdfae1aed6d3d549
diff --git a/dev-db/qdbm/qdbm-1.8.78-r5.ebuild b/dev-db/qdbm/qdbm-1.8.78-r5.ebuild
index 3a9ba0524bf8..b5b013773bc0 100644
--- a/dev-db/qdbm/qdbm-1.8.78-r5.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.78-r5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
-USE_RUBY="ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 RUBY_OPTIONAL="yes"
 
 inherit autotools flag-o-matic java-pkg-opt-2 perl-functions ruby-ng
diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index 391a38633af2..0829f083dfcf 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/delve/Manifest b/dev-go/delve/Manifest
index b29b12d4b86f..3d7d0e33cc22 100644
--- a/dev-go/delve/Manifest
+++ b/dev-go/delve/Manifest
@@ -2,8 +2,10 @@ DIST delve-1.20.2.tar.gz 9198885 BLAKE2B 16cb8d5ec8c83082c6d61e0c5235597e46a3ff2
 DIST delve-1.21.2.tar.gz 9430716 BLAKE2B 4fe7e53791aa96284cea0ce614a066c15a9e15894c0fb84993f3405b4a5cd6abd1d88a912408912757de931fdc2ab4f73227d2bce1e58859b3336dd21698d75d SHA512 78953099b1ba79d04136b037d1fd45dc2f9013428a9eed77bb0bba7c43a00370d701d0576e9c1367e5e45f236ceb4bcdfc1c3366db95999dbe9e758e54225541
 DIST delve-1.22.1.tar.gz 9565782 BLAKE2B 51945229974adf0bd0addcfb07439964c02b658b2b330a03a01fe3abfc7b451c77d427e1234fc650ece9ec37b4f4d222091b41dfb24ee19b342bb6a7a4515f01 SHA512 73b6e7f5c88ffe3c3197a33106c2d10349bb622f10ec54e3dd0b045ed5717a341d48c5415f6b56b3a927afa6d994ff30dced802f82ed14d149f202f46c7a6b44
 DIST delve-1.23.1.tar.gz 9532112 BLAKE2B 5d617fe6664b25629004f7088b53ba103832ddc07345e75ca95c9a4b41075c05aa885c3a3edb1794585ff7e3f5fd3cd517aaefb86c6a656f17698cf1fec8ec5f SHA512 1f88b5aa7d0442b5c4f79be5cf465d76bc3849e849f36677f36735a57b117db0a3cdecc2bbc215573d9fcdae724e6f50b792550b6188e844e392d9a659281dfe
+DIST delve-1.24.0.tar.gz 9694472 BLAKE2B 481eacece39f72a8eee4d4c8ce2b5f1b75ae06944be586011e92bbdb3d4a3ac45966ab820a46be4cac12691b21f045bee150e8cfbbff0854d88197cd463207cf SHA512 aee968e3b8ad408297f192df0c3e3ca4bd5ecdd5e8eff71ae7c5e143400a2693310ff094e3916c688ce610327eacd6a982c7637b58d7e20636dd18311950e974
 EBUILD delve-1.20.2.ebuild 893 BLAKE2B 81d316d575ede7be44656de9ddd558af739e18296b7f8e21ef98975cad619bb9e47f7f19119c1a5e76c91cbfe38448540d7c9263098957b2e40e8a41b4e3626e SHA512 3c102a6501cfca3a42eecc4c8b0c21544ffafa67fdc071860f81d186b4e97a0621f0332d37f95ace695efb17d2747bde9f41db052f0aa9af2b87607dcaf431a2
 EBUILD delve-1.21.2.ebuild 893 BLAKE2B 81d316d575ede7be44656de9ddd558af739e18296b7f8e21ef98975cad619bb9e47f7f19119c1a5e76c91cbfe38448540d7c9263098957b2e40e8a41b4e3626e SHA512 3c102a6501cfca3a42eecc4c8b0c21544ffafa67fdc071860f81d186b4e97a0621f0332d37f95ace695efb17d2747bde9f41db052f0aa9af2b87607dcaf431a2
 EBUILD delve-1.22.1.ebuild 859 BLAKE2B 75262368a74828a9490f8064768d6db23656a07ccee902673f9aaafd8b80705221ac89ccf0be528d8d86b77095e4599b61c2147149135431ea2c6145e9271732 SHA512 cfdc1547593d658ca03570a05662cd62b31ab4bf698eafa2ec974ff74b9bfaf0e275b8294cbe87db101e89047cf987c3191bc9346d174614988f62477580b8c8
 EBUILD delve-1.23.1.ebuild 859 BLAKE2B 8613e5f4fce0f58feaf264e7968674cffc353ff39e8f32b0d29cd517aa5e4c816b8ff592a8ab7deb7254c5eadaf1090430a69598e23b470e7c1837b720a2aedf SHA512 2d38909a206faf976bba743913e365651a805bf37ed46e16787e13f255417c13cbe3189b5992f1e06a0c1dc994bf802738c6db22fb83f6bd01ad9b1403be3a8e
+EBUILD delve-1.24.0.ebuild 1264 BLAKE2B 9264ebb903b171ab814b2ef596519f375ca265bb4972c9db7448711f5283803aa8546add3f0bdffabd509b6a43e4dee0b99d8b9c351ececba2f779d72f6f635f SHA512 89ca9fa73a6afa6a4890c9de78aa8ed1f574f0b4444a089be075bc4cc88091946477ab7870e787efc281e67b4cdd84892cdb76f53b9c4ace242b2d85fa3de0fc
 MISC metadata.xml 487 BLAKE2B ab662da8edd1670e9c0ceae94a35c930c9125cce89a5bd9a86aafa1fd2df5d0b28ee2c89e6b1b6ab5b07d0f12e3d186b30f15aa30479fe283d15dacbd03da87a SHA512 a68530071f066c07dc57783cbedfe6e97ca39de9bad7cde5ffffdafb7a81a95350ec0e1e27323d5d87f1eaa87573e7028ff23fb1e6853c91e6e1f3414e3cade6
diff --git a/dev-go/delve/delve-1.24.0.ebuild b/dev-go/delve/delve-1.24.0.ebuild
new file mode 100644
index 000000000000..f33bfabd721d
--- /dev/null
+++ b/dev-go/delve/delve-1.24.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="A source-level debugger for the Go programming language"
+HOMEPAGE="https://github.com/go-delve/delve"
+SRC_URI="https://github.com/go-delve/delve/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT BSD BSD-2 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_prepare() {
+	default
+
+	# disable failing tests
+	sed -e 's/TestDebugger_LaunchWithTTY/_&/' -i service/debugger/debugger_unix_test.go || die
+	sed -e 's/TestDump/_&/' -i pkg/proc/proc_test.go || die
+	rm cmd/dlv/dlv_test.go || die
+}
+
+src_compile() {
+	ego build -mod=vendor -ldflags="-X main.Build=${PV}" -o "${S}/dlv" ./cmd/dlv
+}
+
+src_test() {
+	ego test -count 1 -p 1 -ldflags="-X main.Build=${PV}" ./...
+}
+
+src_install() {
+	dobin dlv
+	dodoc README.md CHANGELOG.md
+}
+
+pkg_postinst() {
+	elog "Telemetry notice:"
+	elog "Starting with version 1.24.0, Delve will begin collecting opt-in telemetry"
+	elog "data using the same mechanism used by the Go toolchain."
+	elog
+	elog "For more information, please see:"
+	elog "  * https://github.com/golang/go/issues/68384"
+	elog "  * https://go.dev/doc/telemetry#background"
+	elog "  * https://github.com/go-delve/delve/issues/3815"
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 0f3de85f9d17..ada23d1a25a5 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/checker-framework-qual/Manifest b/dev-java/checker-framework-qual/Manifest
index 4916375989ac..2ec83fbe94a2 100644
--- a/dev-java/checker-framework-qual/Manifest
+++ b/dev-java/checker-framework-qual/Manifest
@@ -1,7 +1,5 @@
-DIST checker-framework-3.47.0.tar.gz 8335232 BLAKE2B 4b6d8f5bb055402e6b368640eb42e4e13173dc847a4b8145e7c306856cab2151c17bfbd2c3a645708e9b7525a1e3f73d4c28c3ae24d038ac0c3119d8fcf671df SHA512 17188ab83ee8c91fb112ed0f750611c7fb5fc17f80a0bbd9b19f1514902770c2a227cf879fb581c8c915fa9827febaa8e67a0188c70df625268118344a281fbd
 DIST checker-framework-3.48.3.tar.gz 8345833 BLAKE2B 6c3f2c641414a7cb388ee2ed672a572ca40157e89976f472c58d1a04d74ec2e24893421757fea1bbaee9791e7fbb6d617cba1c5cdda284debd87250299820518 SHA512 a0a41e7bd70d85b8dcb23d358c0a6f10884f4e119e5ae5e1d17c283beab02ba4183f56b4a07d88e9e30bb4b25ebbd003bde2ecf399bf647d23e46869d414e2d6
 DIST checker-framework-3.48.4.tar.gz 8347976 BLAKE2B 29a874f406ca20d12563950e6f7603c94e8c0672871ec8c3f05bc7f37629cc7fc26ae8743283e55cc69f4eb8c40e1e8fc123ba636d19bba3084cd9f1b36a8b0c SHA512 6495e328c041e0b5fc0fddfc4e5811171531933e7154f95eb39113d7aaa78b08a83860426406f66461614f53c024a55a9486a3dd736bc04fb9c306ab3349157f
-EBUILD checker-framework-qual-3.47.0.ebuild 660 BLAKE2B 14490f050de37909cfb5c89273f4e40b0529bf6bc091edbcbfbd63d7f504db85a4b7329ce9be7ebb8245210c31030cb4cdc054e84be5bcf5b8f639627ddddd66 SHA512 6b9b6103eccc354fc015e98add9caf9a00ebcf6120071d5cd454d1e9ff39a15c7ba0b980f43176a5f655102c64c127a8f17201fd71fe28e80f1e55c4cc086527
-EBUILD checker-framework-qual-3.48.3.ebuild 662 BLAKE2B 51e0c7cb16c0a4186a6d71c3854b495748ce6cfefbc2d29a50f097b30698d7a65740904f4234e4e9d0c59d3c58516b7e3d476d72fc723e430ada29ea9970e89e SHA512 3279d8b00b676fa8ddb5cd4d88a896a57f209a450097813e6d21fa11aa7f54902ea3049a53b4dfe7e36aae7df3cb1460f4db4656cc8ea37b9df6b5d2419a2f0f
+EBUILD checker-framework-qual-3.48.3.ebuild 660 BLAKE2B 39df7c4201f3f082ce1fcf51852cb45cee043c45f2f2c7f3f480d6924139fdfa103f73feab472166549b22ccaff8a07a8e8257b037e84f32129bc07ddab43b0d SHA512 718e88c2f817f6015a329d6c46376bbb4eba5701ce1f87f5f904a984990ab43b5dd0e8c3b993184d004ee8138328917203f01dbd9e22ae0ae9486c01274e69f2
 EBUILD checker-framework-qual-3.48.4.ebuild 663 BLAKE2B a6322f138048a38d0c5a751dedfe0b8006d4a6f90d7dd8adf4a7ae9f9f2d13863e83e915560e9e9fb53a6e02422fde1b8abf202709378795cecfafd1175a3f25 SHA512 9efacb612f612dcaac2b4ad15882e3153270f06fa5e4ed5a44961f9e973b99c7e6fdca432054894fcaaece89b69c93df6afc59f4a7010d5d3ee6ed129814f190
 MISC metadata.xml 651 BLAKE2B 2c53d072eaaaa7d09e5d185281efc9c897d1c8008dcbeb791c6b737614aa13f1091bda90b7fea33ff083c32dbd60dec180414af016af94850dee8b2bda8e865a SHA512 3428b96b3eac8b7416aabe2201af09c9bc4c444240ae682750573187a5ba137644aed7cfbcacb3a1162780a9eeb8544b0d6500cefc8f6e62f700271fe185a4d1
diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.47.0.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.47.0.ebuild
deleted file mode 100644
index d56fc74e5026..000000000000
--- a/dev-java/checker-framework-qual/checker-framework-qual-3.47.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.checkerframework:checker-qual:${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Annotations for type-checking by the Checker Framework"
-HOMEPAGE="https://checkerframework.org/"
-SRC_URI="https://github.com/typetools/checker-framework/archive/checker-framework-${PV}.tar.gz"
-S="${WORKDIR}/checker-framework-checker-framework-${PV}/checker-qual"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-DEPEND=">=virtual/jdk-11:*"	# module-info
-RDEPEND=">=virtual/jre-1.8:*"
-
-JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.48.3.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.48.3.ebuild
index cfcc7c1b8c23..8e40a3b41ebf 100644
--- a/dev-java/checker-framework-qual/checker-framework-qual-3.48.3.ebuild
+++ b/dev-java/checker-framework-qual/checker-framework-qual-3.48.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/checker-framework-checker-framework-${PV}/checker-qual"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND=">=virtual/jdk-11:*"	# module-info
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/error-prone-annotations/Manifest b/dev-java/error-prone-annotations/Manifest
index c937de94df0d..b34b0fec8655 100644
--- a/dev-java/error-prone-annotations/Manifest
+++ b/dev-java/error-prone-annotations/Manifest
@@ -1,5 +1,3 @@
-DIST error-prone-2.32.0.tar.gz 2856245 BLAKE2B 129347be0a1e9ae450c03b47c088962efd7f156dfd5f7343fc17837cb4b64e1787c325ea4d6021570559a09310688a378555c5ab0e1df4996f21e88a73487212 SHA512 ae6286f9cd4d75fb0165d9788a7a2c588a05eef5a4f714a6deb9623d6d8cf4a2173bb44a8faee058f2496dd31124b40570a91a359a8f735a88abf59eea05f39e
 DIST error-prone-2.36.0.tar.gz 2887918 BLAKE2B 8478d23214681f887607c10339a554f839f84a1f6c80d2fda0c35463c405673e50301a0fb2f450a22ee12ef1b8c84ff904721f4184004bb35e28f567df760a0f SHA512 a9e8c78119ecfc99d064ed1a1748a7ca9931a9391f241b0d36886268dd1294623368a5f703bee5b5008fb4f20008be5a0073f2c1078a7086bc34adb4c6cdf5bd
-EBUILD error-prone-annotations-2.32.0.ebuild 653 BLAKE2B 68ec32a8b6f23664b0689909a4db6f010892a6fe647ecb5c5f3e1d9372dcff6bd9d87f970e84565c5cc87f2e9fe40ec3a99d43db56c17dd5256c68b338d5dc3a SHA512 dbfeb7ef52b3c5749dadda69885c38db74580f7d05fe9bf7c3fd096a50220812d76789b7df548f4c4e7647cf31b6366f479fa66aa34ff2301f829b99ac4197ca
-EBUILD error-prone-annotations-2.36.0.ebuild 655 BLAKE2B a82099a2d1a99403bf34ef321022b39b5174fcd4207f5b0bb42acf60216e6db9bc6839e42add5f3a4f1904380ee3ef081721a383e452314479f8833efafada95 SHA512 96af0c7ba4ca5a41e946625a1abdec30e6e5184941b53f3f73e9fcc55d1914304cf2c9fd809745eadb5a0826d619432d2a45075b750da04d11807f3a7215afc9
+EBUILD error-prone-annotations-2.36.0.ebuild 653 BLAKE2B a8901ca8c6f6939ea02c9ff475f1cb193b168a7704438d3c188cb898c111fb4cefe751f1299076561be6935aef968b66bb28499e0e33f539a5a2d5917acf2940 SHA512 2c10b9d7631b0787ec92c6d64d4a5a634b779341d49f5bd909ed9eac788ff30021274a1fe36c796936dc33f9544bd3e0e1e5c61c774a7dd1d4d742acb0acc756
 MISC metadata.xml 320 BLAKE2B 2e99f822caa8b83ed1ababb800cd9d3b1c8027e5623bc4498a475b7e0e72943c2140ec07c42a1d967472186094a0933fcc82b5cbfe45d1111f0fec9924e161dc SHA512 c47744406f133d3553b5982f0a7f690ca4bb360e76e633c30015489bb6489ee74629f4d6cd1986558932acc7b18449cd9840f9080f71d682cc6fbf97981cbf21
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.32.0.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.32.0.ebuild
deleted file mode 100644
index 914659fb4271..000000000000
--- a/dev-java/error-prone-annotations/error-prone-annotations-2.32.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="com.google.errorprone:error_prone_annotations:${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java annotations for the Error Prone static analysis tool"
-HOMEPAGE="https://errorprone.info"
-SRC_URI="https://github.com/google/error-prone/archive/v${PV}.tar.gz -> error-prone-${PV}.tar.gz"
-S="${WORKDIR}/error-prone-${PV}/annotations"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-DEPEND=">=virtual/jdk-11:*"	# module-info
-RDEPEND=">=virtual/jre-1.8:*"
-
-JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.36.0.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.36.0.ebuild
index d33f4e2fe4b2..507148bbf55a 100644
--- a/dev-java/error-prone-annotations/error-prone-annotations-2.36.0.ebuild
+++ b/dev-java/error-prone-annotations/error-prone-annotations-2.36.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/error-prone-${PV}/annotations"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND=">=virtual/jdk-11:*"	# module-info
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/guava-testlib/Manifest b/dev-java/guava-testlib/Manifest
index a999542db287..2e4fc50a2cad 100644
--- a/dev-java/guava-testlib/Manifest
+++ b/dev-java/guava-testlib/Manifest
@@ -1,8 +1,4 @@
-DIST guava-33.3.0.tar.gz 5819234 BLAKE2B 26c5f97b927f4afeb8c5d68714a54ef62bfc3995da8cf98d2022edd93054bb7e0bd38598adcefc209d04a246e3da50346e213ad49152e1fc0c91463cd8f0dea3 SHA512 122a10c98820443cbfc5769e1aaa5843becfc0e2e7119d0f2544d86bd265da1fc48c4113cb706f92d84ab896fc58583b80e7dc91b6cd13f9ee9996ae8457f02c
-DIST guava-33.3.1.tar.gz 5827149 BLAKE2B f8ad29e921d7de7d4eeb65812a24dec9ee27feab7d8294ac037ac526c8069a652d7381af92afd457339ff394488d7c56d562e116b2508f105ced32080f727d78 SHA512 d357953607266b844d5711821a261b110bf44c32713a7c889aebc32e7a8e63aaa8126f1f1aee7c6ad3cf44830bd231a19fc09d802f1abeaff42096470214b0c3
 DIST guava-33.4.0.tar.gz 5900161 BLAKE2B 85201845218bfba9150e1190259588d46113c5267bf492f54a7d789e8ba7e890fa79e44a0fdf378949899b93f7df12d7480a38ccec4bc756b581f5b6529318a2 SHA512 6534867f40e2a63e7268e3dec1bc3ee0caafb89c77abc2fa2527b2612ecae17d01803f3968bee9844b3948cdb039b9c61ffdbba5309841c9a6a8d14118af970d
 DIST truth-1.4.2.jar 275487 BLAKE2B 9c0dce92648f734ab88a0faf1a1e5328d747efffd29aa8f12b7ed2b2c87036ce18bf3195348f9ffce848842a240179fa60e9625c6997439a4cedce6aac6c2b77 SHA512 5f29cb259f2cf63e8a908061d2a58b28ecf12366a03564c8e63c33cdbdb21935ac95ed7b68437b015a2bd055732c88ec8ca1e55b45b99a2cb3e9dd53cb0b87cc
-EBUILD guava-testlib-33.3.0.ebuild 1563 BLAKE2B 88a95dd25f1b09b46ea7749f25b42a3433900eea274043d119372f5da66bf8289079079060960d8dcbec3c71455bd5f516a2618ee64159648890547362b01b53 SHA512 1c07e250ee7668207d742a4e3ded30c26eb48928b079092d8557ff53e9c14afe977c7075db3e2199ea490f13935cdef2c4232774cf9bd624c6c3070c06ba9d9b
-EBUILD guava-testlib-33.3.1.ebuild 1565 BLAKE2B 3be237c7e4917f76bf10fbb648a6517267028c8257a6dae1cd8cf8f6a62ed5b0c4436debae881c5b70f67c43c1db60c31039e5dcbeed31dca7b1cd8b73379c61 SHA512 e6acbb781de5044f22f28461974ebb5f03b5a1e4e4f3f349d52579e32689470feddc39c9940ef00455d46982132f076986f8d0b6231c071a6d5123e5b8e86589
-EBUILD guava-testlib-33.4.0.ebuild 1572 BLAKE2B 275b538418e8157eace8b06114076fb993ddaaecef334bd504840b7087adc7e75c30ebe93ea4592c63b35498f64d30ab012d0e8ee1972789ae3a8c493e22bec8 SHA512 07ffcc5d72f7945eec84d901d1a95ebf30c1822fcc05fbb882036b657c343f26b35de1cbe844259d19716a82371aacd81b9329d4c30bd0749685fcb31e624a22
+EBUILD guava-testlib-33.4.0.ebuild 1569 BLAKE2B 4a5d7b9ccc9d816a578a85260bc7a4fe47b79bc9a835cd540d8d07463b9132550ecd5f30edd084458121be7ecbc72baa3a89114ca5069c55155ec59d3f6d7530 SHA512 3ede2513a961253ccd4cde0203e2cccaf6b8a9c6ca83bebe90378c1698e8c410a04549437af4744cc170ae5d6bb72aacd1346bf46963cb6d3291815b04ff763f
 MISC metadata.xml 465 BLAKE2B 4219510a2bd85c049ada17dd780de974e3a972df9992cd693b52ae2b2d325342a8e70e233b2b884f8a07243da1abe0a1dc3affe1700f30b4093feb0e9ab07e95 SHA512 f7098be969eae6b094e54df6f05735dd6becf0dcdb19f28c5f7a675fe699e988655991f1846c9cb599b8932bfa1365e739ae762e8a0be8a83536e7fbbfa5e3e9
diff --git a/dev-java/guava-testlib/guava-testlib-33.3.0.ebuild b/dev-java/guava-testlib/guava-testlib-33.3.0.ebuild
deleted file mode 100644
index 99cd78d75489..000000000000
--- a/dev-java/guava-testlib/guava-testlib-33.3.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.guava:guava-testlib:${PV}-jre"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple check-reqs
-
-DESCRIPTION="A set of java classes to assist the tests for Guava itself"
-HOMEPAGE="https://github.com/google/guava"
-# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
-SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> guava-${PV}.tar.gz
-	test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.4.2/truth-1.4.2.jar )"
-S="${WORKDIR}/guava-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-CP_DEPEND="
-	>=dev-java/error-prone-annotations-2.32.0:0
-	~dev-java/guava-${PV}:0
-	dev-java/jsr305:0
-	dev-java/junit:4
-"
-
-DEPEND="${CP_DEPEND}
-	>=dev-java/checker-framework-qual-3.47.0:0
-	dev-java/j2objc-annotations:0
-	>=virtual/jdk-1.8:*"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-JAVA_CLASSPATH_EXTRA="checker-framework-qual j2objc-annotations"
-JAVA_SRC_DIR="${PN}/src"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="${PN}/test"
-
-check_env() {
-	if use test; then
-		# this is needed only for tests
-		CHECKREQS_MEMORY="1024M"
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	check_env
-}
-
-pkg_setup() {
-	check_env
-	java-pkg-2_pkg_setup
-}
-
-src_test() {
-	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.4.2.jar:testdata.jar"
-	JAVA_TEST_EXTRA_ARGS="-Xmx${CHECKREQS_MEMORY}"
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/guava-testlib/guava-testlib-33.3.1.ebuild b/dev-java/guava-testlib/guava-testlib-33.3.1.ebuild
deleted file mode 100644
index 143739c0474f..000000000000
--- a/dev-java/guava-testlib/guava-testlib-33.3.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.guava:guava-testlib:${PV}-jre"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple check-reqs
-
-DESCRIPTION="A set of java classes to assist the tests for Guava itself"
-HOMEPAGE="https://github.com/google/guava"
-# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
-SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> guava-${PV}.tar.gz
-	test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.4.2/truth-1.4.2.jar )"
-S="${WORKDIR}/guava-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 arm64 ~ppc64"
-
-CP_DEPEND="
-	>=dev-java/error-prone-annotations-2.36.0:0
-	~dev-java/guava-${PV}:0
-	dev-java/jsr305:0
-	dev-java/junit:4
-"
-
-DEPEND="${CP_DEPEND}
-	>=dev-java/checker-framework-qual-3.48.2:0
-	dev-java/j2objc-annotations:0
-	>=virtual/jdk-1.8:*"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-JAVA_CLASSPATH_EXTRA="checker-framework-qual j2objc-annotations"
-JAVA_SRC_DIR="${PN}/src"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="${PN}/test"
-
-check_env() {
-	if use test; then
-		# this is needed only for tests
-		CHECKREQS_MEMORY="1024M"
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	check_env
-}
-
-pkg_setup() {
-	check_env
-	java-pkg-2_pkg_setup
-}
-
-src_test() {
-	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.4.2.jar:testdata.jar"
-	JAVA_TEST_EXTRA_ARGS="-Xmx${CHECKREQS_MEMORY}"
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/guava-testlib/guava-testlib-33.4.0.ebuild b/dev-java/guava-testlib/guava-testlib-33.4.0.ebuild
index ef9546542cd9..a982d4ec0609 100644
--- a/dev-java/guava-testlib/guava-testlib-33.4.0.ebuild
+++ b/dev-java/guava-testlib/guava-testlib-33.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ S="${WORKDIR}/guava-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 CP_DEPEND="
 	>=dev-java/error-prone-annotations-2.36.0:0
diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest
index 431fcac4cb81..eeed91795555 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1,7 +1,3 @@
-DIST guava-33.3.0.tar.gz 5819234 BLAKE2B 26c5f97b927f4afeb8c5d68714a54ef62bfc3995da8cf98d2022edd93054bb7e0bd38598adcefc209d04a246e3da50346e213ad49152e1fc0c91463cd8f0dea3 SHA512 122a10c98820443cbfc5769e1aaa5843becfc0e2e7119d0f2544d86bd265da1fc48c4113cb706f92d84ab896fc58583b80e7dc91b6cd13f9ee9996ae8457f02c
-DIST guava-33.3.1.tar.gz 5827149 BLAKE2B f8ad29e921d7de7d4eeb65812a24dec9ee27feab7d8294ac037ac526c8069a652d7381af92afd457339ff394488d7c56d562e116b2508f105ced32080f727d78 SHA512 d357953607266b844d5711821a261b110bf44c32713a7c889aebc32e7a8e63aaa8126f1f1aee7c6ad3cf44830bd231a19fc09d802f1abeaff42096470214b0c3
 DIST guava-33.4.0.tar.gz 5900161 BLAKE2B 85201845218bfba9150e1190259588d46113c5267bf492f54a7d789e8ba7e890fa79e44a0fdf378949899b93f7df12d7480a38ccec4bc756b581f5b6529318a2 SHA512 6534867f40e2a63e7268e3dec1bc3ee0caafb89c77abc2fa2527b2612ecae17d01803f3968bee9844b3948cdb039b9c61ffdbba5309841c9a6a8d14118af970d
-EBUILD guava-33.3.0.ebuild 900 BLAKE2B 8af41b5a562ba16e6557a841fb91e559c5142174780cc5232ec0f301899b416a5efbf6750d8983388d7866ac1a34403da4ec891f567788f44770bfbe7aeb415c SHA512 ea4918f9b0c4a2964aaf14109ff5a7ae8795a6dfdb438a7ff8a776340ea4b12a27d9738adee82c2d7bb9acba1cd366aada382e325cd612af579ac8abf9ecf87e
-EBUILD guava-33.3.1.ebuild 902 BLAKE2B 877f560efbf89d15097d7cf1143d322b5d8388aeec4ee52e14d69b0cafbc5864a5071b92dea0628ea8b53f22ad8e386ce449579d588ceefc53348419d6890831 SHA512 877971bd8612721bf44b50c9ca9d0894e9da6e54f5f642a9aed04327b8527e303df0d9e97fa1f014ab0448ecffa6a7c1f73497858c526b0efe62b0e8791cb382
-EBUILD guava-33.4.0.ebuild 910 BLAKE2B 8b112a39d3a1b592cc0102287e05c0c4fc15e0e0510f96d14b63dddbb14d1d8dc2abcb63f6a58d488b936aafae787c89e73acb5ee7a020ae89381f05b2303539 SHA512 abf04c266caf6320fd8d63d4d1db2e4e85d79309cf243cc4cd1ecbafe5ece49964de87ed4183a2f057bb24b88496ae3943631aa5e2dd3033088572f8c41b2bf0
+EBUILD guava-33.4.0.ebuild 907 BLAKE2B 5faad314dbc12ed7c5e0d336eb43f5dbb6af30d37b1fc73c9bbb8ceeb6238b3ecbc2632a8c30ea8efef0aead0af4808a2eaeaf04df3bc7d6e889125d07c7d019 SHA512 42544263dc37d54eb7648c293f7ebbbf0dc9cb31cb31e8712e69782647012a9f461cd7ca2943a299e16b628891ae082e9e190e526ec4e5d9656fc34b89884e4f
 MISC metadata.xml 589 BLAKE2B 36b17e71aeb533194b87a9101d730b3f233c23b175b65216bdeecfcbf1bc7ac0936b7b284cdb40a30573d630d34a9bf7c2ca966b26bef4a3e7c5d6e90a1075a5 SHA512 0b8556db4fe43dc25f7604dd98ebb01fb4318c8a861ca25a5d7db76fef4b076c2eb2a67b801807233ad950cfb0d70b438af3f9e84f408060a168d9897158c6eb
diff --git a/dev-java/guava/guava-33.3.0.ebuild b/dev-java/guava/guava-33.3.0.ebuild
deleted file mode 100644
index f30fc400b280..000000000000
--- a/dev-java/guava/guava-33.3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="com.google.guava:guava:${PV}-jre"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A collection of Google's core Java libraries"
-HOMEPAGE="https://github.com/google/guava"
-SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-CP_DEPEND="
-	>=dev-java/error-prone-annotations-2.32.0:0
-	dev-java/j2objc-annotations:0
-	dev-java/jsr305:0
-"
-
-DEPEND="${CP_DEPEND}
-	>=dev-java/checker-framework-qual-3.47.0:0
-	>=virtual/jdk-1.8:*"
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-JAVA_AUTOMATIC_MODULE_NAME="com.google.common"
-JAVA_CLASSPATH_EXTRA="checker-framework-qual"
-JAVA_GENTOO_CLASSPATH_EXTRA=":futures/failureaccess/src"
-JAVA_SRC_DIR="guava/src"
diff --git a/dev-java/guava/guava-33.3.1.ebuild b/dev-java/guava/guava-33.3.1.ebuild
deleted file mode 100644
index ae156ec16168..000000000000
--- a/dev-java/guava/guava-33.3.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="com.google.guava:guava:${PV}-jre"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A collection of Google's core Java libraries"
-HOMEPAGE="https://github.com/google/guava"
-SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 arm64 ~ppc64"
-
-CP_DEPEND="
-	>=dev-java/error-prone-annotations-2.36.0:0
-	dev-java/j2objc-annotations:0
-	dev-java/jsr305:0
-"
-
-DEPEND="${CP_DEPEND}
-	>=dev-java/checker-framework-qual-3.48.2:0
-	>=virtual/jdk-1.8:*"
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-JAVA_AUTOMATIC_MODULE_NAME="com.google.common"
-JAVA_CLASSPATH_EXTRA="checker-framework-qual"
-JAVA_GENTOO_CLASSPATH_EXTRA=":futures/failureaccess/src"
-JAVA_SRC_DIR="guava/src"
diff --git a/dev-java/guava/guava-33.4.0.ebuild b/dev-java/guava/guava-33.4.0.ebuild
index c4fdbeb247cb..10bcd701371b 100644
--- a/dev-java/guava/guava-33.4.0.ebuild
+++ b/dev-java/guava/guava-33.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 CP_DEPEND="
 	>=dev-java/error-prone-annotations-2.36.0:0
diff --git a/dev-java/java-diff-utils/Manifest b/dev-java/java-diff-utils/Manifest
index faac50a38b11..775b3da6d62d 100644
--- a/dev-java/java-diff-utils/Manifest
+++ b/dev-java/java-diff-utils/Manifest
@@ -3,5 +3,5 @@ DIST java-diff-utils-parent-4.12.tar.gz 2080632 BLAKE2B 36cb824bd00e946484dc62b3
 DIST java-diff-utils-parent-4.15.tar.gz 2132869 BLAKE2B 53caeadae5a87bcedd4e1e5aaa6990f89ca144d75027b16b93e019f119d13dc5d9ee5bf398b47e45b041e86505f72f8b017f56f3650e6ad0b828aece36fa2a36 SHA512 d722687708515bea791c753981857293a58bed9cfd9eca5575b77b22919ab1167ffc55fc87f3f825b5686cff27f4fa68841eae4514baef73f6bf5b2d7a1a9c95
 EBUILD java-diff-utils-1.3.0-r1.ebuild 658 BLAKE2B 09c8caaeb7bfa1ba1314a9cf7347a4c78d71a368034dbd1a5def9a86e7be69873f80bb4326c261ee5b30f288f518950b815f64c21faf894d25ddfb0d3ef499cb SHA512 788cc882c2e9063f3f4e0ed0f28e8fde6348ded30e4cfa3147c496a4660424899eac5cf16d84987f5a54d4958b4df089b5d5e8d42030f4cb90654d38e917932e
 EBUILD java-diff-utils-4.12.ebuild 996 BLAKE2B 30cb16e29c33e093b01e1dad16c91a30e97b12e2757d1be85c23262a8ae540da9a26bb4ea5fe2a22efb9fd13e145c3a1dc159031b8154cba36890b83647118ee SHA512 c9a60bf8c68ea33531cb58799079ca7929144cc1a3cb58e7d8f4476a2d0f1af14c42e0565117945c28704719fdda986e5d999fe13a3ce40a4be7da1c8c20946d
-EBUILD java-diff-utils-4.15.ebuild 973 BLAKE2B da638c8fd42b4b730de82e3a5a09d9b503a9b38d13a9a15a366c38e408e53678e7b0c0d20d9ae9593b4e5dbdcfae9e7a526c3b066bfdb9266d05eddb64122031 SHA512 bfa3437f8cbf49fe8bf1906f9945bd23694bde28e63f7fc35e2b714d4b17cf89a4cb0f17501a704e264a0126e7e23d14fc9802201ef1b2351aa9aadfbb926625
+EBUILD java-diff-utils-4.15.ebuild 971 BLAKE2B 14c7ba6e0548b56f055d872322c6f39ad04afa7f34c1e8dd6978d2524812f83ef156ca193a26897b3d90a6c16009fb40a3c92f992e50f154ef7618f9e05e2851 SHA512 2cac86e948c316476cdf6fd7abed67662d7f5c72f21071bdedd2c2f6fb96050464d2786ae717f7c2b55d80c315c3f9947aebfa7ea81262d57a9a6d50a8b601a4
 MISC metadata.xml 313 BLAKE2B d36ca69273ccafdd633c6f869c19781c4cef27c2947c7461b4c5285cb4f4f68d5896e63e2e12d069a6123b8ede70b891fd55fa583ff9aced04a1672c03a1982d SHA512 071ee6a67e35fc932046c8d22fdd7ba058bcb0630bb528ea8eab675b1df314635e9c8671313c1fef2139cb505f7fb6be2f229643f8833938dd86463fcaa7a056
diff --git a/dev-java/java-diff-utils/java-diff-utils-4.15.ebuild b/dev-java/java-diff-utils/java-diff-utils-4.15.ebuild
index df0d2ec686f0..810091be3fd1 100644
--- a/dev-java/java-diff-utils/java-diff-utils-4.15.ebuild
+++ b/dev-java/java-diff-utils/java-diff-utils-4.15.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/java-diff-utils-java-diff-utils-parent-${PV}/java-diff-utils"
 
 LICENSE="Apache-2.0"
 SLOT="4"
-KEYWORDS="~amd64 arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 RESTRICT="test" #839681
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index bb8e7d0aea5c..02ba8508ab40 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,10 +1,8 @@
 DIST protobuf-28.3.tar.gz 9256608 BLAKE2B 05162124676abe18300481e9f985fd2cfb09b052d06670a993e79ef02f3daf0d5380b521977ebc2362d4094486151ea285fe1c98a1d2f3799b18a1fa422fdc13 SHA512 a91e175fed7eb01c4240842a5af73a7d3cefccbb10885434bceeb7bc89ab6c56a74912cee290bf46e81d4026f3c9c2b10faad5545816064e215c4bae7908263d
-DIST protobuf-29.1.tar.gz 9363710 BLAKE2B 8d43358c17f14a807391f37796226b9cedef3ef27ef536a6cb50a7a336a80fe221777ba669f3cee7e6a33a4decfc64e3b091d658de73e24a708297e2a539322c SHA512 eb604b473e09a5a001bf451ccd417cdb8732ebd3c2075fa46f3d0e48b7ed4d458f05d2e09eedc71c0f4252ba18d3161837efb7a2eed46d78b9eb3cc9b45f96ff
 DIST protobuf-29.2.tar.gz 9348408 BLAKE2B 847798474bc6a76b9badfdbf605e118dece5e321e81242d7fa1bf5f5d17ee05a3d365ec112dc6d861cade97efff8be1d5d04006a5144f613bdb3ff5eacc63b99 SHA512 aeb21773edc3dd92a6c1ba6ccd721cc8a20d61230a5309c75ee3ef19baa554c228a6d1095f191ccc18f10183b646f3140dfe6526f5812bcaa64b7d5260572643
 DIST protobuf-29.3.tar.gz 9348951 BLAKE2B 8d37daac6f0d832e5bff5c56b9be73fce1fe016ca4e905f4c66d8fea20fabbee54a6be2c824f503d40f8492a4ec6280a539c454de9a118b69ebc57f2afe3d965 SHA512 0c776133f5789d21baa8860cb41e7926a162d74810a01722b762a78f93e559494e903fcaa092515bfe2ce057fd065a5dd000b316edb1af32c2ef9dbadf02b4c6
 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
 EBUILD protobuf-java-4.28.3.ebuild 4753 BLAKE2B 75888b86b796bba01583c86a21d5401daf8569750892ab844870ca1eeaa3c57e61850bfc92403937de948ec5e1b0be6967556cde14d83fd6447eddd1f0256cd0 SHA512 5e6b5a03122df4e0dd2e00c9fc4ca1e7045760577db50ec67e846bedaba5c58c3b191b1f8fc30d34a2ec59dc78183b9da483f36a166e87e2146c6874d6ea8429
-EBUILD protobuf-java-4.29.1.ebuild 4653 BLAKE2B fd5c47a1ad85822957fe692d4ce476d187b2bd387d7495e9d784bc6592ce4e35ee489b35762df3f23f678ad143dfacf83d88bc3a6947083da7580d62b53f771b SHA512 82398ab2b92fd3a75728af96dafeadc0a914b9992a0d1868a34307689fd3f3fca1f59a94fa3f697554cc14f728d0cce38afa3a87ab44e6043c01760b8aebe05e
-EBUILD protobuf-java-4.29.2.ebuild 4654 BLAKE2B d61a3cb0c0041b5d8cd1836d84a6e29f3e2c88e0853c241dae3b0410d11743370f0b280e6874a9250718c2cc92c4c8d05b108c5ddad44915ef261876ff6fbadf SHA512 13a19dc4ecb9399f6c989ece9597647634c90d7574e057b0ad940d356fca44e5d4f40f596777c01b1848694dca1a58af1ea9d3c2fba0216ae9fafe9ea15ef48f
+EBUILD protobuf-java-4.29.2.ebuild 4653 BLAKE2B acf9e6a664b8ae569a247ba83424b56c4248e5612d435c46e5eb954cb72ebc6afa1edb41aa347af57802282cd874570ac611f56ebc21f1a045eafa458e6ce2fe SHA512 70bee8ca5569ee462474089a3ddd2be02d43a5dffc393b225e47cf81922fc201455537da037a269b54d24fbfc39c6ede32bcf56fc4a6369617b5b2c4f544f46f
 EBUILD protobuf-java-4.29.3.ebuild 4654 BLAKE2B 081d919b2b16db71a80cdd48b0a4aac0ab6d655b4d2c059b9759d40e21f848fbb709fafb53e0a0644939e45084c6ba9c604e71bec7b7be1906a19e844002c337 SHA512 6a37a4f0050839629816b7ad1aa55b734579c738360b4156ea0bacfbb95e6e0450cc3114573a79d857a7c9e699172117373069f42951bab2550df99400fa9284
 MISC metadata.xml 534 BLAKE2B aa3ede54aa4e1479f977cecb9dace36fa5db7025a5d45d142cde5ea2ede794f721abf0ced139b24d4c2c1aac3631ee43f15b4d74850abc56c1fbafb8736adebc SHA512 11f7b1fca223910cd42be952760e32d98a553fd660e1da66542a722eb1e3296c79e702f899dc36ab0e794a19014ede3738fc0959b04a9d44910e9e0068f3feb7
diff --git a/dev-java/protobuf-java/protobuf-java-4.29.1.ebuild b/dev-java/protobuf-java/protobuf-java-4.29.1.ebuild
deleted file mode 100644
index dba71ddc49ae..000000000000
--- a/dev-java/protobuf-java/protobuf-java-4.29.1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 2008-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.protobuf:protobuf-java:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple cmake
-
-DESCRIPTION="Core Protocol Buffers library"
-HOMEPAGE="https://protobuf.dev"
-# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
-# And we build artifact 4.29.1 from the 29.1 tarball in order to allow sharing the tarball with
-# dev-libs/protobuf.
-MY_PV4="${PV#4.}"
-MY_PV="${MY_PV4/_rc/-rc}"
-MY_P="protobuf-${MY_PV}.tar.gz"
-TV="1.1.3"
-SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${MY_PV}/${MY_P}
-	test? ( https://repo1.maven.org/maven2/com/google/truth/truth/${TV}/truth-${TV}.jar )"
-S="${WORKDIR}/protobuf-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="system-protoc"
-
-BDEPEND="
-	system-protoc? ( ~dev-libs/protobuf-${MY_PV4}:0[protoc] )
-	!system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 )
-"
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/guava:0
-		dev-java/mockito:4
-	)
-"
-RDEPEND=">=virtual/jre-1.8:*"
-
-JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
-JAVA_JAR_FILENAME="protobuf.jar"
-JAVA_RESOURCE_DIRS="java/core/src/main/resources"
-JAVA_SRC_DIR="java/core/src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
-JAVA_TEST_SRC_DIR="java/core/src/test/java"
-
-run-protoc() {
-	if use system-protoc; then
-		protoc $1
-	else
-		"${BUILD_DIR}"/protoc $1
-	fi
-}
-
-src_prepare() {
-	# If the corrsponding version of system-protoc is not available we build protoc locally
-	if ! use system-protoc; then
-		cmake_src_prepare
-	fi
-	java-pkg-2_src_prepare
-
-	# ${S}/java/core/generate-sources-build.xml
-	einfo "Replace variables in generate-sources-build.xml"
-	sed \
-		-e 's:${generated.sources.dir}:java/core/src/main/java:' \
-		-e 's:${protobuf.java_source.dir}:java/core/src/main/resources:' \
-		-e 's:${protobuf.source.dir}:src:' \
-		-e 's:^.*value="::' -e 's:\"/>::' \
-		-e '/project\|echo\|mkdir\|exec/d' \
-		-i java/core/generate-sources-build.xml || die "sed to sources failed"
-
-	# ${S}/java/core/generate-test-sources-build.xml
-	einfo "Replace variables in generate-test-sources-build.xml"
-	sed \
-		-e 's:${generated.testsources.dir}:java/core/src/test/java:' \
-		-e 's:${protobuf.source.dir}:src:' \
-		-e 's:${test.proto.dir}:java/core/src/test/proto:' \
-		-e 's:^.*value="::' -e 's:\"/>::' \
-		-e '/project\|mkdir\|exec\|Also generate/d' \
-		-i java/core/generate-test-sources-build.xml || die "sed to test sources failed"
-
-	# Split the file in two parts, one for each run-protoc call
-	awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \
-		java/core/generate-test-sources-build.xml || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Dprotobuf_BUILD_TESTS=OFF
-		-Dprotobuf_ABSL_PROVIDER=package
-	)
-	if ! use system-protoc; then
-		cmake_src_configure
-	fi
-}
-
-src_compile() {
-	if ! use system-protoc; then
-		cmake_src_compile
-	fi
-
-	einfo "Run protoc to generate sources"
-	run-protoc \
-		@java/core/generate-sources-build.xml \
-		|| die "protoc sources failed"
-
-	java-pkg-simple_src_compile
-}
-
-src_test() {
-	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-${TV}.jar"
-
-	# google/protobuf/java_features.proto: File not found.
-	cp {java/core/src/main/resources,src}/google/protobuf/java_features.proto || die
-
-	einfo "Running protoc on first part of generate-test-sources-build.xml"
-	run-protoc @test-sources-build-1 \
-		|| die "run-protoc test-sources-build-1 failed"
-
-	einfo "Running protoc on second part of generate-test-sources-build.xml"
-	run-protoc @test-sources-build-2 \
-		|| die "run-protoc test-sources-build-2 failed"
-
-	# java/core/src/test/java/editions_unittest/TestDelimited.java:2867:
-	# error: package editions_unittest.MessageImport does not exist
-	rm java/core/src/test/java/com/google/protobuf/TextFormatTest.java || die
-
-	einfo "Running tests"
-	# Invalid test class 'map_test.MapInitializationOrderTest':
-	# 1. Test class should have exactly one public constructor
-	# Invalid test class 'protobuf_unittest.CachedFieldSizeTest':
-	# 1. Test class should have exactly one public constructor
-	pushd "${JAVA_TEST_SRC_DIR}" || die
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			-path "**/*Test.java" \
-			! -path "**/Abstract*Test.java" \
-			! -name "MapInitializationOrderTest.java" \
-			! -path '*protobuf_unittest/CachedFieldSizeTest.java'
-			)
-	popd
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-4.29.2.ebuild b/dev-java/protobuf-java/protobuf-java-4.29.2.ebuild
index 494374fa8dcd..5083579e3032 100644
--- a/dev-java/protobuf-java/protobuf-java-4.29.2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-4.29.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2024 Gentoo Authors
+# Copyright 2008-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ S="${WORKDIR}/protobuf-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="system-protoc"
 
 BDEPEND="
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 16bcc2d37e25..409de192f98b 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -29,5 +29,5 @@ EBUILD swt-4.31-r1.ebuild 3597 BLAKE2B 3ebfa0ada9993a92ee67868ee6070b0a4812b455e
 EBUILD swt-4.32.ebuild 3597 BLAKE2B 6f6b08425ff52668c342394c50437397eeec8621d766f67d8a90999e2e659919da3837cc987f5166a268016351176406e7bbafa7b74cf59176c276bb5eca5402 SHA512 e9b246638d08f0d415f8412913b9369d9ce257f2a4e43e0741f2e5b989aac31d091d5c4f533a7a6ea50a3ea2cd73ee21728ec7e44a4ed7715aab6fe09a2f554c
 EBUILD swt-4.33.ebuild 3597 BLAKE2B c078bc253f2c56298421dc2c59efb9928b2ee058bf95929d847d52e113f488e1799a6cd56be0a38c802fa6450a3a353c518e5f13104eb174295cc218f65b1358 SHA512 c331378ea4954e967c83ced0cbb3cd1d24e16a75a3b972ae707860efd240ec001818e961fe92f733b5826e95a0142b0bf0807b6a9b32c997d97bd62d1df4eedb
 EBUILD swt-4.34-r1.ebuild 3652 BLAKE2B 245aaaf87401e7ea5f8719f3ac221599c7826e313c206a8f579efa5fe9a56b8de76e36b931ffc70d94f790f8d0217fdaecec26895153fe225483e468812b624e SHA512 25b28ce7af6079c58b9c0bd23bb3808b432845b0c0511dc8d695a89a8b4d48edbd11ae26e2d47cee7e24c6bce0033095da78bb7247de2b1332ab40d93762f4d9
-EBUILD swt-4.34.ebuild 3599 BLAKE2B c3436d90ef7496df47eb26be2770c0e39f269792096e671aee488f8104fdbff9a3ab43a1964d1618d661673e37b52c3d4656e08a47ec0e271504296afdfcc737 SHA512 d4b093e57dd915ff081d3ccbd8d46bc351cb8445eb737b6511a583bfc9a0660996aa965b0ce5dd1013344b44df801336ea5e346ea0121e7efe02e438881d8615
+EBUILD swt-4.34.ebuild 3597 BLAKE2B dd43a181f04b8b527c538c3791539e7020b7eac607f2760298dbccbbd1fc69b8a99c53cc828be5c82c48d036b9ab002eed71bb84aa235bf93ff5fcbbd5677f63 SHA512 c97527fd5307d75583091c75e5dde1b761b7d184197256fae954df409bf3d4d495a2001d5ad4659321cca2c5ab431f4c1a3d480d9304044b1fca6417df6860cf
 MISC metadata.xml 762 BLAKE2B 6d1ffda9ea96f50b3e4736513ca9a3af4e7e9d3cd59a3f8ff8efcae118d290d141ffa90181fb1669f9a4380c6e4c618d780b459ada909c5dd5aa4f5fc1865b7d SHA512 5c50e0d80478a6af08886d9b65230fc161a000a7ea39d0ffa873114e13fd1fb9bcbcc554df41eebd63ee60dd9ed14e6f19110e71a49bd32adef6c43051c2c380
diff --git a/dev-java/swt/swt-4.34.ebuild b/dev-java/swt/swt-4.34.ebuild
index 33b2ac1eeb71..c76cb74b5474 100644
--- a/dev-java/swt/swt-4.34.ebuild
+++ b/dev-java/swt/swt-4.34.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/library"
 
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 SLOT="4.34"
-KEYWORDS="~amd64 arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 IUSE="cairo opengl webkit"
 
 BDEPEND="
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index b5478694635a..6925e9e864af 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/mrustc/Manifest b/dev-lang/mrustc/Manifest
new file mode 100644
index 000000000000..b583dbdd89c7
--- /dev/null
+++ b/dev-lang/mrustc/Manifest
@@ -0,0 +1,10 @@
+AUX mrustc-0.10.1-git-be-gone.patch 1223 BLAKE2B 35cdec27655b39ba80fc73766b2c1d883abe0fa2ea8744312c3d093b184e42e10a2bfdec7e9d6ea11d550e9cf9b75b36a63a6cc869c5084f7af1db8c062ef8b1 SHA512 5e5fcb0fdff5a412ac0c06e4709312041bb2d47155f0de195821c47aae3fb98a9d0c9a22189a2940e77b6eb6188a79e8d92feecd3e9dccecadb4761885e8293a
+AUX mrustc-0.11.0-RUSTC_SRC_PROVIDED.patch 12164 BLAKE2B 213e8eceefaab33d99fdcf6bf6f391971b5c5ffefa76402840d593b850d4a1c5cae1660e81de426333e817633063aa164ec73b4dfe43f63cc39dbc456e3bba8c SHA512 6dbda716d24e86ff35760a338669b6a8f5729224d1a57d33e030b0dc4c4c1886c1976100d38eeef31b24aae9fba337f789b5f82f2401eab9e8ac156c3964fa50
+AUX mrustc-0.11.0-default-to-rust-1_74.patch 419 BLAKE2B c727c94edef6cca8b719f1c1246a24834cc1b3bf44015094ddfc24f2174075a437ceb14b70612ab04d9db4c0e009f43e2fd458702e89752f4ae8e6578c992430 SHA512 9dfa01ae8958f9c07b8830639dfd43b2cd3efb51097dd010d4241d0e0c0a56d8405ff1a362e8ab61364cb0c9372221c741392f96ce3dc37427a6a5091a9eaa3b
+AUX mrustc-0.11.2-dont-strip-bins.patch 818 BLAKE2B 0da4dc48da58b9e3cb58594c4fb0392d8c3cc04a2b0f38bd28fc8a9468bffd888774f183ddadfe8290039363d1a1247171768d711af555444bcbf62e01356b26 SHA512 1024e384a8ef231017fe1b2407e1bf38b5af009a77b9bd04ec7d449922d45b6eecef1678b70931fe350b7ed95020429e959ef11971b9ccb99eaf1d72dd766ad7
+AUX mrustc-0.11.2-gcc15.patch 577 BLAKE2B b65dfa58abe5fe660f2c895425d311c8cd2951d40fbd2ee013f0022859a710c69a24a2e612dc994fae0e6e189e337205455ca89bd84722517e2d7feffb94e660 SHA512 cf08e0a12f96724e42f578c485701507bcabc5eb0d10f78c0bceeda46f40fc93d6b12ac56622c4147e959ca002ec2e1f30e7060355a5d3e4f6a2b430aae6a370
+DIST mrustc-0.11.2.tar.gz 1364024 BLAKE2B e68178d952b3afef526f99dda24def646ebefbf661200e7b57a7ea054c511075a1455e6456f3fbb0e4c1042660f716f92bcee990054dbe7c1ebc4185ce0e3899 SHA512 9a39249c38eee109c4f60af051df89aa5ab1e3408761d67d3ee8ae05cded03b9e4fd36b554a470e35c77d214bf02d39f172ab04fdcb8b03fac068d8af268ebf5
+DIST rustc-1.74.1-src.tar.xz 155968724 BLAKE2B e05f2379ac94b286f85791a138e1928e5b5b5a7749f0981d82c40c2a12860f55bf96bb2f0e924e35a0f8b2447b13052d38adea909aaa3199105787bb5a4861b3 SHA512 14c7e7ed2f38ab60299d8c7d41d78f042b6b57ef822d577b5138e60bdde31cf141eccd4332a25bc5da3d58eb5313d63c1448b5dfe9e11b8055bb8ea133a9038d
+EBUILD mrustc-0.11.2.ebuild 3410 BLAKE2B 673b73aef3d9b51e7db11c51acb9ef14c1fc5c913f13352f1607d77f4499d3bc956e8dee9b377f7bf66390eca71153a558e9274343aac0a0a915d3566cfd2353 SHA512 0702489c7065e229aae6fc9e8b7a351519d3d7f60334c3ec6ebef6e3c1c0f25603b373094fc0d0a2e69f92db30d3a9c232901411e600ff04aa9b4e8395a2d4d1
+EBUILD mrustc-9999.ebuild 3274 BLAKE2B 5de926a9c79d70550daf554b94245e5aa4cedc5f747941fc1f52dfee8166ff247a55c510010909ce81c7cdad3cb7e7cf5975b03cbf39107fec3011ce2da16fc6 SHA512 ce9fd58a0f9a3e40927fdcc048cc9afc131de6ec06f783b2a6381914e30a3a7e6b0662e8105d6facc9a54e2e4c75c9d0c4891c896de4f04cbb9bf11740a67c3c
+MISC metadata.xml 638 BLAKE2B f15f072927ead8d1219d81b0d0ed5aaae2eeae47b5ec5e4f2858b44da869d8ed6fa8d6c1284ab65010d26800d46a8c2e77a73caeea282129cd4503b2e7190a24 SHA512 5fb75bdae1886e7cf28d856aec25c3fa37661db24d5d7c487e238a2b671fefb43f03e40209cf0f559b2cf0bd22d6ffaa0f917d27cab976422883405b18a9da81
diff --git a/dev-lang/mrustc/files/mrustc-0.10.1-git-be-gone.patch b/dev-lang/mrustc/files/mrustc-0.10.1-git-be-gone.patch
new file mode 100644
index 000000000000..3323b4c88b4c
--- /dev/null
+++ b/dev-lang/mrustc/files/mrustc-0.10.1-git-be-gone.patch
@@ -0,0 +1,23 @@
+From 0615d38df2c47fa7dc3f64ca54fd35e70e75ee59 Mon Sep 17 00:00:00 2001
+From: Matt Jolly <kangie@gentoo.org>
+Date: Thu, 5 Dec 2024 17:18:29 +1000
+Subject: [PATCH] git-be-gone
+
+--- a/Makefile
++++ b/Makefile
+@@ -178,7 +178,7 @@ $(OBJDIR)%.o: src/%.cpp
+ $(OBJDIR)version.o: $(OBJDIR)%.o: src/%.cpp $(filter-out $(OBJDIR)version.o,$(OBJ)) Makefile
+ 	@+mkdir -p $(dir $@)
+ 	@echo [CXX] -o $@
+-	$V$(CXX) -o $@ -c $< $(CXXFLAGS) $(CPPFLAGS) -MMD -MP -MF $@.dep -D VERSION_GIT_FULLHASH=\"$(shell git show --pretty=%H -s --no-show-signature)\" -D VERSION_GIT_BRANCH="\"$(shell git symbolic-ref -q --short HEAD || git describe --tags --exact-match)\"" -D VERSION_GIT_SHORTHASH=\"$(shell git show -s --pretty=%h --no-show-signature)\" -D VERSION_BUILDTIME="\"$(shell date -uR)\"" -D VERSION_GIT_ISDIRTY=$(shell git diff-index --quiet HEAD; echo $$?)
++	$V$(CXX) -o $@ -c $< $(CXXFLAGS) $(CPPFLAGS) -MMD -MP -MF $@.dep -D VERSION_GIT_FULLHASH=\"gentoo\" -D VERSION_GIT_BRANCH=\"gentoo\" -D VERSION_GIT_SHORTHASH=\"gentoo\" -D VERSION_BUILDTIME="\"$(shell date -uR)\"" -D VERSION_GIT_ISDIRTY="0"
+ 
+ src/main.cpp: $(PCHS:%=src/%.gch)
+ 
+@@ -192,4 +192,3 @@ bin/common_lib.a:
+ -include $(OBJ:%=%.dep)
+ 
+ # vim: noexpandtab ts=4
+-
+-- 
+2.47.0
diff --git a/dev-lang/mrustc/files/mrustc-0.11.0-RUSTC_SRC_PROVIDED.patch b/dev-lang/mrustc/files/mrustc-0.11.0-RUSTC_SRC_PROVIDED.patch
new file mode 100644
index 000000000000..c72f4ae40950
--- /dev/null
+++ b/dev-lang/mrustc/files/mrustc-0.11.0-RUSTC_SRC_PROVIDED.patch
@@ -0,0 +1,222 @@
+From 3881d541d0934bd35f26ef7b74672e755061efef Mon Sep 17 00:00:00 2001
+From: Matt Jolly <kangie@gentoo.org>
+Date: Mon, 9 Dec 2024 13:05:44 +1000
+Subject: [PATCH] Add `RUSTC_SRC_PROVIDED` for sandboxed installs
+
+Allows package managers to provide an extracted rustc
+source to patch and build against. This effictively no-ops
+the fetch and unpack steps of minicargo.mk entirely, and
+adds some sanity checks to ensure that `RUSTCSRC` comes
+from the environment and contains a `Cargo.toml`.
+
+we also add a `/` after every `$(RUSTCSRC)` path fragment
+just in case the path from the environment does not have one.
+
+Signed-off-by: Matt Jolly <kangie@gentoo.org>
+--- a/minicargo.mk
++++ b/minicargo.mk
+@@ -16,6 +16,9 @@ endif
+ RUSTC_VERSION_DEF := $(shell cat rust-version)
+ RUSTC_VERSION ?= $(RUSTC_VERSION_DEF)
+ 
++# Distros may want to sandbox the build and provide the source themselves
++RUSTC_SRC_PROVIDED := 0
++
+ # OUTDIR_SUF : Output directory suffix
+ ifeq ($(RUSTC_VERSION),$(RUSTC_VERSION_DEF))
+   OUTDIR_SUF_DEF :=
+@@ -91,18 +94,26 @@ else
+   RUSTC_OUT_BIN := rustc_main
+ endif
+ 
+-ifeq ($(RUSTC_CHANNEL),nightly)
+-  RUSTCSRC := rustc-nightly-src/
++ifeq ($(RUSTC_SRC_PROVIDED),0)
++  ifeq ($(RUSTC_CHANNEL),nightly)
++    RUSTCSRC := rustc-nightly-src
++  else
++    RUSTCSRC := rustc-$(RUSTC_VERSION)-src
++  endif
+ else
+-  RUSTCSRC := rustc-$(RUSTC_VERSION)-src/
++  # Strip trailing slash from rustcsrc if present
++  RUSTCSRC := $(RUSTCSRC:/=)
++  ifeq ($(wildcard $(RUSTCSRC)/Cargo.toml),)
++    $(error "RUSTCSRC is not set to a valid directory: $(RUSTCSRC)/")
++  endif
+ endif
+ RUSTC_SRC_DL := $(RUSTCSRC)/dl-version
+ ifeq ($(RUSTC_VERSION),1.19.0)
+-  VENDOR_DIR := $(RUSTCSRC)src/vendor
++  VENDOR_DIR := $(RUSTCSRC)/src/vendor
+ else ifeq ($(RUSTC_VERSION),1.29.0)
+-  VENDOR_DIR := $(RUSTCSRC)src/vendor
++  VENDOR_DIR := $(RUSTCSRC)/src/vendor
+ else
+-  VENDOR_DIR := $(RUSTCSRC)vendor
++  VENDOR_DIR := $(RUSTCSRC)/vendor
+   MINICARGO_FLAGS += --manifest-overrides rustc-$(RUSTC_VERSION)-overrides.toml
+ endif
+ ifeq ($(RUSTC_VERSION),1.54.0)
+@@ -132,12 +143,12 @@ ifeq ($(RUSTC_VERSION),1.74.0)
+   SRCDIR_RUSTC_DRIVER := compiler/rustc_driver
+ endif
+ 
+-SRCDIR_RUST_TESTS := $(RUSTCSRC)src/test/
++SRCDIR_RUST_TESTS := $(RUSTCSRC)/src/test/
+ ifeq ($(RUSTC_VERSION),1.74.0)
+-SRCDIR_RUST_TESTS := $(RUSTCSRC)tests/
++SRCDIR_RUST_TESTS := $(RUSTCSRC)/tests/
+ endif
+ 
+-LLVM_CONFIG := $(RUSTCSRC)build/bin/llvm-config
++LLVM_CONFIG := $(RUSTCSRC)/build/bin/llvm-config
+ ifeq ($(shell uname -s || echo not),Darwin)
+  # /usr/bin/uname because uname might call coreutils
+  # which can make the arm64 uname called when
+@@ -205,6 +216,7 @@ bin/testrunner$(EXESUF):
+ # rustc (with std/cargo) source download
+ #
+ RUSTC_SRC_TARBALL := rustc-$(RUSTC_VERSION)-src.tar.gz
++ifeq ($(RUSTC_SRC_PROVIDED),0)
+ $(RUSTC_SRC_TARBALL):
+ 	@echo [CURL] $@
+ 	@rm -f $@
+@@ -212,15 +224,23 @@ $(RUSTC_SRC_TARBALL):
+ rustc-$(RUSTC_VERSION)-src/extracted: $(RUSTC_SRC_TARBALL)
+ 	tar -xf $(RUSTC_SRC_TARBALL)
+ 	touch $@
+-$(RUSTC_SRC_DL): rustc-$(RUSTC_VERSION)-src/extracted rustc-$(RUSTC_VERSION)-src.patch
+-	cd $(RUSTCSRC) && patch -p0 < ../rustc-$(RUSTC_VERSION)-src.patch;
++else
++$(RUSTC_SRC_TARBALL):
++	@echo "RUSTC_SRC_PROVIDED is set, no need to fetch source"
++rustc-$(RUSTC_VERSION)-src/extracted: $(RUSTC_SRC_TARBALL)
++	touch $(RUSTCSRC)/extracted
++endif
++
++$(RUSTC_SRC_DL): $(RUSTC_SRC_TARBALL) rustc-$(RUSTC_VERSION)-src/extracted rustc-$(RUSTC_VERSION)-src.patch
++	PATCH_FILE=$(abspath rustc-$(RUSTC_VERSION)-src.patch); \
++	cd $(RUSTCSRC) && patch -p0 < $$PATCH_FILE;
+ 	touch $@
+ 
+ # Standard library crates
+ # - libstd, libpanic_unwind, libtest and libgetopts
+ # - libproc_macro (mrustc)
+ ifeq ($(USE_MERGED_BUILD),1)
+-$(RUSTCSRC)mrustc-stdlib/Cargo.toml: $(RUSTC_SRC_DL) minicargo.mk
++$(RUSTCSRC)/mrustc-stdlib/Cargo.toml: $(RUSTC_SRC_DL) minicargo.mk
+ 	@mkdir -p $(dir $@)
+ 	@echo "#![no_core]" > $(dir $@)/lib.rs
+ 	@echo "[package]" > $@
+@@ -232,23 +252,23 @@ $(RUSTCSRC)mrustc-stdlib/Cargo.toml: $(RUSTC_SRC_DL) minicargo.mk
+ 	@echo "std = { path = \"../$(RUST_LIB_PREFIX)std\" }" >> $@
+ 	@echo "panic_unwind = { path = \"../$(RUST_LIB_PREFIX)panic_unwind\" }" >> $@
+ 	@echo "test = { path = \"../$(RUST_LIB_PREFIX)test\" }" >> $@
+-LIBS: $(RUSTCSRC)mrustc-stdlib/Cargo.toml $(MRUSTC) $(MINICARGO)
+-	+$(MINICARGO) --vendor-dir $(VENDOR_DIR) --script-overrides $(OVERRIDE_DIR) --output-dir $(OUTDIR) $(MINICARGO_FLAGS) $(RUSTCSRC)mrustc-stdlib/
++LIBS: $(RUSTCSRC)/mrustc-stdlib/Cargo.toml $(MRUSTC) $(MINICARGO)
++	+$(MINICARGO) --vendor-dir $(VENDOR_DIR) --script-overrides $(OVERRIDE_DIR) --output-dir $(OUTDIR) $(MINICARGO_FLAGS) $(RUSTCSRC)/mrustc-stdlib/
+ 	+$(MINICARGO) --output-dir $(OUTDIR) $(MINICARGO_FLAGS) lib/libproc_macro
+ else
+ LIBS: $(MRUSTC) $(MINICARGO) $(RUSTC_SRC_DL)
+-	+$(MINICARGO) --vendor-dir $(VENDOR_DIR) --script-overrides $(OVERRIDE_DIR) --output-dir $(OUTDIR) $(MINICARGO_FLAGS) $(RUSTCSRC)$(RUST_LIB_PREFIX)std
+-	+$(MINICARGO) --vendor-dir $(VENDOR_DIR) --script-overrides $(OVERRIDE_DIR) --output-dir $(OUTDIR) $(MINICARGO_FLAGS) $(RUSTCSRC)$(RUST_LIB_PREFIX)panic_unwind
+-	+$(MINICARGO) --vendor-dir $(VENDOR_DIR) --script-overrides $(OVERRIDE_DIR) --output-dir $(OUTDIR) $(MINICARGO_FLAGS) $(RUSTCSRC)$(RUST_LIB_PREFIX)test
++	+$(MINICARGO) --vendor-dir $(VENDOR_DIR) --script-overrides $(OVERRIDE_DIR) --output-dir $(OUTDIR) $(MINICARGO_FLAGS) $(RUSTCSRC)/$(RUST_LIB_PREFIX)std
++	+$(MINICARGO) --vendor-dir $(VENDOR_DIR) --script-overrides $(OVERRIDE_DIR) --output-dir $(OUTDIR) $(MINICARGO_FLAGS) $(RUSTCSRC)/$(RUST_LIB_PREFIX)panic_unwind
++	+$(MINICARGO) --vendor-dir $(VENDOR_DIR) --script-overrides $(OVERRIDE_DIR) --output-dir $(OUTDIR) $(MINICARGO_FLAGS) $(RUSTCSRC)/$(RUST_LIB_PREFIX)test
+ 	+$(MINICARGO) --output-dir $(OUTDIR) $(MINICARGO_FLAGS) lib/libproc_macro
+ endif
+ 
+ # Dynamically linked version of the standard library
+ $(OUTDIR)test/libtest.so: $(RUSTC_SRC_DL)
+ 	mkdir -p $(dir $@)
+-	+MINICARGO_DYLIB=1 $(MINICARGO) $(RUSTCSRC)$(RUST_LIB_PREFIX)std          --vendor-dir $(VENDOR_DIR) --script-overrides $(OVERRIDE_DIR) --output-dir $(dir $@) $(MINICARGO_FLAGS)
+-	+MINICARGO_DYLIB=1 $(MINICARGO) $(RUSTCSRC)$(RUST_LIB_PREFIX)panic_unwind --vendor-dir $(VENDOR_DIR) --script-overrides $(OVERRIDE_DIR) --output-dir $(dir $@) $(MINICARGO_FLAGS)
+-	+MINICARGO_DYLIB=1 $(MINICARGO) $(RUSTCSRC)$(RUST_LIB_PREFIX)test         --vendor-dir $(VENDOR_DIR) --output-dir $(dir $@) $(MINICARGO_FLAGS)
++	+MINICARGO_DYLIB=1 $(MINICARGO) $(RUSTCSRC)/$(RUST_LIB_PREFIX)std          --vendor-dir $(VENDOR_DIR) --script-overrides $(OVERRIDE_DIR) --output-dir $(dir $@) $(MINICARGO_FLAGS)
++	+MINICARGO_DYLIB=1 $(MINICARGO) $(RUSTCSRC)/$(RUST_LIB_PREFIX)panic_unwind --vendor-dir $(VENDOR_DIR) --script-overrides $(OVERRIDE_DIR) --output-dir $(dir $@) $(MINICARGO_FLAGS)
++	+MINICARGO_DYLIB=1 $(MINICARGO) $(RUSTCSRC)/$(RUST_LIB_PREFIX)test         --vendor-dir $(VENDOR_DIR) --output-dir $(dir $@) $(MINICARGO_FLAGS)
+ 	test -e $@
+ 
+ RUSTC_ENV_VARS := CFG_COMPILER_HOST_TRIPLE=$(RUSTC_TARGET)
+@@ -264,17 +284,17 @@ RUSTC_ENV_VARS += RUSTC_INSTALL_BINDIR=bin
+ 
+ $(OUTDIR)rustc: $(MRUSTC) $(MINICARGO) LIBS $(LLVM_CONFIG)
+ 	mkdir -p $(OUTDIR)rustc-build
+-	+$(RUSTC_ENV_VARS) $(MINICARGO) $(RUSTCSRC)$(SRCDIR_RUSTC) --vendor-dir $(VENDOR_DIR) --output-dir $(OUTDIR)rustc-build -L $(OUTDIR) $(MINICARGO_FLAGS) $(MINICARGO_FLAGS_$@)
++	+$(RUSTC_ENV_VARS) $(MINICARGO) $(RUSTCSRC)/$(SRCDIR_RUSTC) --vendor-dir $(VENDOR_DIR) --output-dir $(OUTDIR)rustc-build -L $(OUTDIR) $(MINICARGO_FLAGS) $(MINICARGO_FLAGS_$@)
+ 	test -e $@ -a ! $(OUTDIR)rustc-build/$(RUSTC_OUT_BIN) -nt $@ || cp $(OUTDIR)rustc-build/$(RUSTC_OUT_BIN) $@
+ $(OUTDIR)rustc-build/librustc_driver.rlib: $(MRUSTC) $(MINICARGO) LIBS
+ 	mkdir -p $(OUTDIR)rustc-build
+-	+$(RUSTC_ENV_VARS) $(MINICARGO) $(RUSTCSRC)$(SRCDIR_RUSTC_DRIVER) --vendor-dir $(VENDOR_DIR) --output-dir $(OUTDIR)rustc-build -L $(OUTDIR) $(MINICARGO_FLAGS) $(MINICARGO_FLAGS_$(OUTDIR)rustc)
++	+$(RUSTC_ENV_VARS) $(MINICARGO) $(RUSTCSRC)/$(SRCDIR_RUSTC_DRIVER) --vendor-dir $(VENDOR_DIR) --output-dir $(OUTDIR)rustc-build -L $(OUTDIR) $(MINICARGO_FLAGS) $(MINICARGO_FLAGS_$(OUTDIR)rustc)
+ $(OUTDIR)cargo: $(MRUSTC) LIBS
+ 	mkdir -p $(OUTDIR)cargo-build
+-	+$(CARGO_ENV_VARS) $(MINICARGO) $(RUSTCSRC)src/tools/cargo --vendor-dir $(VENDOR_DIR) --output-dir $(OUTDIR)cargo-build -L $(OUTDIR) $(MINICARGO_FLAGS) $(MINICARGO_FLAGS_$@)
++	+$(CARGO_ENV_VARS) $(MINICARGO) $(RUSTCSRC)/src/tools/cargo --vendor-dir $(VENDOR_DIR) --output-dir $(OUTDIR)cargo-build -L $(OUTDIR) $(MINICARGO_FLAGS) $(MINICARGO_FLAGS_$@)
+ 	test -e $@ -a ! $(OUTDIR)cargo-build/cargo -nt $@ || cp $(OUTDIR)cargo-build/cargo $@
+ 
+-# Reference $(RUSTCSRC)src/bootstrap/native.rs for these values
++# Reference $(RUSTCSRC)/src/bootstrap/native.rs for these values
+ LLVM_CMAKE_OPTS := LLVM_TARGET_ARCH=$(firstword $(subst -, ,$(RUSTC_TARGET))) LLVM_DEFAULT_TARGET_TRIPLE=$(RUSTC_TARGET)
+ LLVM_CMAKE_OPTS += LLVM_TARGETS_TO_BUILD="$(LLVM_TARGETS)"
+ LLVM_CMAKE_OPTS += LLVM_ENABLE_ASSERTIONS=OFF
+@@ -286,22 +306,22 @@ LLVM_CMAKE_OPTS += CMAKE_BUILD_TYPE=Release
+ LLVM_CMAKE_OPTS += $(LLVM_CMAKE_OPTS_EXTRA)
+ 
+ 
+-$(RUSTCSRC)build/bin/llvm-config: $(RUSTCSRC)build/Makefile
+-	$Vcd $(RUSTCSRC)build && $(MAKE) -j $(PARLEVEL)
++$(RUSTCSRC)/build/bin/llvm-config: $(RUSTCSRC)/build/Makefile
++	$Vcd $(RUSTCSRC)/build && $(MAKE) -j $(PARLEVEL)
+ 
+-$(RUSTCSRC)build/Makefile: $(RUSTCSRC)$(LLVM_DIR)/CMakeLists.txt
+-	@mkdir -p $(RUSTCSRC)build
+-	$Vcd $(RUSTCSRC)build && cmake $(addprefix -D , $(LLVM_CMAKE_OPTS)) ../$(LLVM_DIR)
++$(RUSTCSRC)/build/Makefile: $(RUSTCSRC)/$(LLVM_DIR)/CMakeLists.txt
++	@mkdir -p $(RUSTCSRC)/build
++	$Vcd $(RUSTCSRC)/build && cmake $(addprefix -D , $(LLVM_CMAKE_OPTS)) ../$(LLVM_DIR)
+ 
+ #
+ # Developement-only targets
+ #
+ $(OUTDIR)libcore.rlib: $(MRUSTC) $(MINICARGO)
+-	$(MINICARGO) $(RUSTCSRC)src/libcore --script-overrides $(OVERRIDE_DIR) --output-dir $(OUTDIR) $(MINICARGO_FLAGS)
++	$(MINICARGO) $(RUSTCSRC)/src/libcore --script-overrides $(OVERRIDE_DIR) --output-dir $(OUTDIR) $(MINICARGO_FLAGS)
+ $(OUTDIR)liballoc.rlib: $(MRUSTC) $(MINICARGO)
+-	$(MINICARGO) $(RUSTCSRC)src/liballoc --vendor-dir $(VENDOR_DIR) --script-overrides $(OVERRIDE_DIR) --output-dir $(OUTDIR) $(MINICARGO_FLAGS)
++	$(MINICARGO) $(RUSTCSRC)/src/liballoc --vendor-dir $(VENDOR_DIR) --script-overrides $(OVERRIDE_DIR) --output-dir $(OUTDIR) $(MINICARGO_FLAGS)
+ $(OUTDIR)rustc-build/librustdoc.rlib: $(MRUSTC) LIBS
+-	$(MINICARGO) $(RUSTCSRC)src/librustdoc --vendor-dir $(VENDOR_DIR) --output-dir $(dir $@) -L $(OUTDIR) $(MINICARGO_FLAGS)
++	$(MINICARGO) $(RUSTCSRC)/src/librustdoc --vendor-dir $(VENDOR_DIR) --output-dir $(dir $@) -L $(OUTDIR) $(MINICARGO_FLAGS)
+ #$(OUTDIR)cargo-build/libserde-1_0_6.rlib: $(MRUSTC) LIBS
+ #	$(MINICARGO) $(VENDOR_DIR)/serde --vendor-dir $(VENDOR_DIR) --output-dir $(dir $@) -L $(OUTDIR) $(MINICARGO_FLAGS)
+ $(OUTDIR)cargo-build/libgit2-0_6_6.rlib: $(MRUSTC) LIBS
+@@ -349,9 +369,9 @@ $(OUTDIR)test/librust_test_helpers.a: $(OUTDIR)test/rust_test_helpers.o
+ 	@mkdir -p $(dir $@)
+ 	ar cur $@ $<
+ ifeq ($(RUSTC_VERSION),1.19.0)
+-RUST_TEST_HELPERS_C := $(RUSTCSRC)src/rt/rust_test_helpers.c
++RUST_TEST_HELPERS_C := $(RUSTCSRC)/src/rt/rust_test_helpers.c
+ else
+-RUST_TEST_HELPERS_C := $(RUSTCSRC)src/test/auxiliary/rust_test_helpers.c
++RUST_TEST_HELPERS_C := $(RUSTCSRC)/src/test/auxiliary/rust_test_helpers.c
+ endif
+ output$(OUTDIR_SUF)/test/rust_test_helpers.o: $(RUST_TEST_HELPERS_C)
+ 	@mkdir -p $(dir $@)
+@@ -424,8 +444,8 @@ RUNTIME_ARGS_$(OUTDIR)stdtest/collectionstests += --skip ::vec::overaligned_allo
+ #ENV_$(OUTDIR)stdtest/rustc-test := 
+ #ENV_$(OUTDIR)stdtest/rustc-test += CFG_COMPILER_HOST_TRIPLE=$(RUSTC_TARGET)
+ 
+-$(OUTDIR)stdtest/%-test: $(RUSTCSRC)src/lib%/lib.rs LIBS
+-	+MRUSTC_LIBDIR=$(abspath $(OUTDIR)) $(MINICARGO) --test $(RUSTCSRC)src/lib$* --vendor-dir $(VENDOR_DIR) --output-dir $(dir $@) -L $(OUTDIR)
++$(OUTDIR)stdtest/%-test: $(RUSTCSRC)/src/lib%/lib.rs LIBS
++	+MRUSTC_LIBDIR=$(abspath $(OUTDIR)) $(MINICARGO) --test $(RUSTCSRC)/src/lib$* --vendor-dir $(VENDOR_DIR) --output-dir $(dir $@) -L $(OUTDIR)
+ $(OUTDIR)stdtest/collectionstests: $(OUTDIR)stdtest/alloc-test
+ 	test -e $@
+ $(OUTDIR)collectionstest_out.txt: $(OUTDIR)%
+-- 
+2.47.1
+
diff --git a/dev-lang/mrustc/files/mrustc-0.11.0-default-to-rust-1_74.patch b/dev-lang/mrustc/files/mrustc-0.11.0-default-to-rust-1_74.patch
new file mode 100644
index 000000000000..ed459819b301
--- /dev/null
+++ b/dev-lang/mrustc/files/mrustc-0.11.0-default-to-rust-1_74.patch
@@ -0,0 +1,19 @@
+From f422e43cc314e4cfda059ddb63d31973c9e8b5b7 Mon Sep 17 00:00:00 2001
+From: Matt Jolly <kangie@gentoo.org>
+Date: Tue, 17 Dec 2024 17:55:59 +1000
+Subject: [PATCH] default to Rust 1_74
+
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -39,7 +39,7 @@
+ # undef max
+ #endif
+ 
+-TargetVersion	gTargetVersion = TargetVersion::Rustc1_29;
++TargetVersion	gTargetVersion = TargetVersion::Rustc1_74;
+ 
+ struct ProgramParams
+ {
+-- 
+2.47.1
+
diff --git a/dev-lang/mrustc/files/mrustc-0.11.2-dont-strip-bins.patch b/dev-lang/mrustc/files/mrustc-0.11.2-dont-strip-bins.patch
new file mode 100644
index 000000000000..23eb40dbeeba
--- /dev/null
+++ b/dev-lang/mrustc/files/mrustc-0.11.2-dont-strip-bins.patch
@@ -0,0 +1,28 @@
+From e14e4e2e49d32827729bf41e08db1902fdf26911 Mon Sep 17 00:00:00 2001
+From: Matt Jolly <kangie@gentoo.org>
+Date: Fri, 17 Jan 2025 10:39:02 +1000
+Subject: [PATCH] don't strip bins
+
+--- a/Makefile
++++ b/Makefile
+@@ -176,7 +176,6 @@ else
+ 	$V$(CXX) -o $@ $(LINKFLAGS) $(OBJDIR)main.o -Wl,--whole-archive bin/mrustc.a -Wl,--no-whole-archive bin/common_lib.a $(LIBS)
+ 	$(OBJCOPY) --only-keep-debug $(BIN) $(BIN).debug
+ 	$(OBJCOPY) --add-gnu-debuglink=$(BIN).debug $(BIN)
+-	$(STRIP) $(BIN)
+ endif
+ 
+ $(OBJDIR)%.o: src/%.cpp
+--- a/tools/minicargo/Makefile
++++ b/tools/minicargo/Makefile
+@@ -46,7 +46,6 @@ else ifeq ($(shell uname -s || echo not),Darwin)
+ else
+ 	$(OBJCOPY) --only-keep-debug $(BIN) $(BIN).debug
+ 	$(OBJCOPY) --add-gnu-debuglink=$(BIN).debug $(BIN)
+-	$(STRIP) $(BIN)
+ endif
+ 
+ $(OBJDIR)%.o: %.cpp
+-- 
+2.48.0
+
diff --git a/dev-lang/mrustc/files/mrustc-0.11.2-gcc15.patch b/dev-lang/mrustc/files/mrustc-0.11.2-gcc15.patch
new file mode 100644
index 000000000000..fd2e8f307872
--- /dev/null
+++ b/dev-lang/mrustc/files/mrustc-0.11.2-gcc15.patch
@@ -0,0 +1,28 @@
+From 3df8e7e14485c7f11da4d90dac02aa061f5e1f1a Mon Sep 17 00:00:00 2001
+From: Matt Jolly <kangie@gentoo.org>
+Date: Sun, 19 Jan 2025 14:07:47 +1000
+Subject: [PATCH] gcc15 includes
+
+--- a/src/common.hpp
++++ b/src/common.hpp
+@@ -13,6 +13,7 @@
+ #include <map>
+ #include <set>
+ #include <cassert>
++#include <cstdint>
+ #include <sstream>
+ #include <memory>
+ 
+--- a/tools/minicargo/build.cpp
++++ b/tools/minicargo/build.cpp
+@@ -20,6 +20,7 @@
+ #include <fstream>
+ #include <cassert>
+ 
++#include <cstdint>
+ #include <unordered_map>
+ #include <algorithm>    // sort/find_if
+ 
+-- 
+2.48.0
+
diff --git a/dev-lang/mrustc/metadata.xml b/dev-lang/mrustc/metadata.xml
new file mode 100644
index 000000000000..814630c987d4
--- /dev/null
+++ b/dev-lang/mrustc/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>Kangie@gentoo.org</email>
+    <name>Matt Jolly</name>
+    <description>Primary maintainer</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>rust@gentoo.org</email>
+    <name>Gentoo Rust Project</name>
+  </maintainer>
+  <longdescription>
+     A "simple" rust compiler written in C++ that is able to bootstrap a "recent" rustc.
+  </longdescription>
+  <upstream>
+     <remote-id type="github">thepowersgang/mrustc</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-lang/mrustc/mrustc-0.11.2.ebuild b/dev-lang/mrustc/mrustc-0.11.2.ebuild
new file mode 100644
index 000000000000..da872f594ddc
--- /dev/null
+++ b/dev-lang/mrustc/mrustc-0.11.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo multiprocessing rust-toolchain toolchain-funcs
+
+# The makefile needs to know the version of rust to build
+RUST_VERSION=1.74.1
+# We need to pretend to be this version of Rust for mrustc build and outputs
+MRUSTC_RUST_VER=1.74.0
+
+DESCRIPTION="Mutabah's Rust Compiler"
+HOMEPAGE="https://github.com/thepowersgang/mrustc"
+
+if [[ ${PV} == *"9999"* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/thepowersgang/mrustc.git"
+else
+	SRC_URI="https://github.com/thepowersgang/mrustc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz
+	"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND="sys-libs/zlib"
+# mrustc transpiles Rust to C, and currently the C code it generates doesn't currently work with clang
+RDEPEND="
+	${DEPEND}
+	sys-devel/gcc:*
+"
+BDEPEND="sys-devel/gcc:*"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.11.2-gcc15.patch"
+	"${FILESDIR}/${PN}-0.11.2-dont-strip-bins.patch"
+	"${FILESDIR}/${PN}-0.11.0-default-to-rust-1_74.patch"
+	"${FILESDIR}/${PN}-0.11.0-RUSTC_SRC_PROVIDED.patch"
+	"${FILESDIR}/${PN}-0.10.1-git-be-gone.patch"
+)
+
+QA_FLAGS_IGNORED="
+	usr/lib/rust/${P}/bin/mrustc
+	usr/lib/rust/${P}/bin/minicargo
+	usr/lib/rust/${P}/lib/rustlib/$(rust_abi)/lib/*.rlib
+"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && ! tc-is-gcc; then
+		die "mrustc needs to be built using GCC."
+	fi
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	export PARLEVEL=$(makeopts_jobs)
+	export RUSTC_VERSION=${MRUSTC_RUST_VER} # Pretend that we're using upstream-supported Rust
+	export MRUSTC_TARGET_VER=${RUSTC_VERSION%.*}
+	export RUSTCSRC="${WORKDIR}/rustc-${RUST_VERSION}-src"
+	export RUSTC_SRC_PROVIDED=1
+	export V='' # echo build commands in makefiles (minicargo still writes commands to file)
+	# build mrustc & minicargo then use them to build the standard library
+	# emake -f minicargo.mk will do everything including a full bootstrap
+	emake all
+	emake -C tools/minicargo/
+	# It's not much, but it's enough to do a 'hello world' at least... and build dev-lang/rust!
+	emake -e -f minicargo.mk LIBS
+}
+
+src_test() {
+	# The main makefile test targets just do this, cut out the middleman
+	emake -e -f minicargo.mk local_tests
+	# build and run 'hello world' (this is called using 'test' in the makefile, but we can do it manually)
+	edo "${S}"/bin/mrustc -L "${S}"/output-${MRUSTC_RUST_VER}/ \
+		-g "${S}/../rustc-${RUST_VERSION}-src/tests/ui/hello_world/main.rs" -o "${T}"/hello
+	"${T}"/hello || die "Failed to run hello_world built with mrustc"
+}
+
+src_install() {
+	# If we're installing into /usr/lib/rust we may as well be consistent
+	into /usr/lib/rust/${P}
+	dobin bin/mrustc
+	dobin bin/minicargo
+	local lib patch
+	local libs=( "${S}"/output-*/*.rlib* )
+	insinto  "/usr/lib/rust/${P}/lib/rustlib/$(rust_abi)/lib"
+	# If we ever want to support mrustc stdlib for multiple rusts we'll need to
+	# do something more clever here.
+	for lib in "${libs[@]}"; do
+		# We only want .rlib{,.hir,o}
+		if [[ ${lib} != *.c && ${lib} != *.d && ${lib} != *.txt ]]; then
+			doins "${lib}"
+		fi
+	done
+	# For convenience, install files required to build various rusts
+	insinto /usr/share/${P}
+	doins -r "${S}/script-overrides/"
+	insinto /usr/share/${P}/patches
+	for patch in "${S}"/rustc-*.patch "${S}"/rustc-*-overrides.toml; do
+		doins "${patch}"
+	done
+}
diff --git a/dev-lang/mrustc/mrustc-9999.ebuild b/dev-lang/mrustc/mrustc-9999.ebuild
new file mode 100644
index 000000000000..2d39a52cbcb6
--- /dev/null
+++ b/dev-lang/mrustc/mrustc-9999.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo multiprocessing rust-toolchain toolchain-funcs
+
+# The makefile needs to know the version of rust to build
+RUST_VERSION=1.74.1
+# We need to pretend to be this version of Rust for mrustc build and outputs
+MRUSTC_RUST_VER=1.74.0
+
+DESCRIPTION="Mutabah's Rust Compiler"
+HOMEPAGE="https://github.com/thepowersgang/mrustc"
+
+if [[ ${PV} == *"9999"* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/thepowersgang/mrustc.git"
+else
+	SRC_URI="https://github.com/thepowersgang/mrustc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz
+	"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND="sys-libs/zlib"
+# mrustc transpiles Rust to C, and currently the C code it generates doesn't currently work with clang
+RDEPEND="
+	${DEPEND}
+	sys-devel/gcc:*
+"
+BDEPEND="sys-devel/gcc:*"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.11.0-default-to-rust-1_74.patch"
+	"${FILESDIR}/${PN}-0.11.0-RUSTC_SRC_PROVIDED.patch"
+)
+
+QA_FLAGS_IGNORED="
+	usr/lib/rust/${P}/bin/mrustc
+	usr/lib/rust/${P}/bin/minicargo
+	usr/lib/rust/${P}/lib/rustlib/$(rust_abi)/lib/*.rlib
+"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && ! tc-is-gcc; then
+		die "mrustc needs to be built using GCC."
+	fi
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	export PARLEVEL=$(makeopts_jobs)
+	export RUSTC_VERSION=${MRUSTC_RUST_VER} # Pretend that we're using upstream-supported Rust
+	export MRUSTC_TARGET_VER=${RUSTC_VERSION%.*}
+	export RUSTCSRC="${WORKDIR}/rustc-${RUST_VERSION}-src"
+	export RUSTC_SRC_PROVIDED=1
+	export V='' # echo build commands in makefiles (minicargo still writes commands to file)
+	# build mrustc & minicargo then use them to build the standard library
+	# emake -f minicargo.mk will do everything including a full bootstrap
+	emake all
+	emake -C tools/minicargo/
+	# It's not much, but it's enough to do a 'hello world' at least... and build dev-lang/rust!
+	emake -e -f minicargo.mk LIBS
+}
+
+src_test() {
+	# The main makefile test targets just do this, cut out the middleman
+	emake -e -f minicargo.mk local_tests
+	# build and run 'hello world' (this is called using 'test' in the makefile, but we can do it manually)
+	edo "${S}"/bin/mrustc -L "${S}"/output-${MRUSTC_RUST_VER}/ \
+		-g "${S}/../rustc-${RUST_VERSION}-src/tests/ui/hello_world/main.rs" -o "${T}"/hello
+	"${T}"/hello || die "Failed to run hello_world built with mrustc"
+}
+
+src_install() {
+	# If we're installing into /usr/lib/rust we may as well be consistent
+	into /usr/lib/rust/${P}
+	dobin bin/mrustc
+	dobin bin/minicargo
+	local lib patch
+	local libs=( "${S}"/output-*/*.rlib* )
+	insinto  "/usr/lib/rust/${P}/lib/rustlib/$(rust_abi)/lib"
+	# If we ever want to support mrustc stdlib for multiple rusts we'll need to
+	# do something more clever here.
+	for lib in "${libs[@]}"; do
+		# We only want .rlib{,.hir,o}
+		if [[ ${lib} != *.c && ${lib} != *.d && ${lib} != *.txt ]]; then
+			doins "${lib}"
+		fi
+	done
+	# For convenience, install files required to build various rusts
+	insinto /usr/share/${P}
+	doins -r "${S}/script-overrides/"
+	insinto /usr/share/${P}/patches
+	for patch in "${S}"/rustc-*.patch "${S}"/rustc-*-overrides.toml; do
+		doins "${patch}"
+	done
+}
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index b72fd7c0f94a..5e700c78bf0f 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -2,5 +2,5 @@ DIST nqp-2024.10.tar.gz 9727368 BLAKE2B ac58b70e798a2e28952664bf75f75bab708bc960
 DIST nqp-2024.12.tar.gz 9726946 BLAKE2B ea1ee9690451f3a18b9815a2515fe781ca73562fa8820994c1e21bd3f5fc7414f167f0dbdeed96de9c4d98b98fe0ae68b07cee7dfd2de467a8f69c4c8dfdd43c SHA512 a9e920abe7419714195d5938492327769cc4a97bc67a97dbfdc2b3aa726cb4abf4884a5a8a55f882b69114cbec344a6423e9e975c62d5bf4f50162acfeef6b96
 EBUILD nqp-2024.10.ebuild 3276 BLAKE2B 7109bffdcf26bbd5840e40e740737ddcf3bd1ba9ea7f1c7301d348beb8dc5447a8b588eb275f707f6df61098e3e61aeb5edcc0bd5c4bec80fa2f201918603f18 SHA512 4011c1c504516784e1732c40fc08b3b6a1aecf1d42689f02c32398327f95df34bfb4688893a139a083ce0a126f8f430444d3e532a567beb239159e95ab9d5dcf
 EBUILD nqp-2024.12.ebuild 3276 BLAKE2B 7109bffdcf26bbd5840e40e740737ddcf3bd1ba9ea7f1c7301d348beb8dc5447a8b588eb275f707f6df61098e3e61aeb5edcc0bd5c4bec80fa2f201918603f18 SHA512 4011c1c504516784e1732c40fc08b3b6a1aecf1d42689f02c32398327f95df34bfb4688893a139a083ce0a126f8f430444d3e532a567beb239159e95ab9d5dcf
-EBUILD nqp-9999.ebuild 3276 BLAKE2B 7109bffdcf26bbd5840e40e740737ddcf3bd1ba9ea7f1c7301d348beb8dc5447a8b588eb275f707f6df61098e3e61aeb5edcc0bd5c4bec80fa2f201918603f18 SHA512 4011c1c504516784e1732c40fc08b3b6a1aecf1d42689f02c32398327f95df34bfb4688893a139a083ce0a126f8f430444d3e532a567beb239159e95ab9d5dcf
+EBUILD nqp-9999.ebuild 3294 BLAKE2B 49fe78da4f73c9028a0478d5452facb76dd07d46526f637982adcde5771819a68a02e3dfc91decd0e1d7368493a1856c43ec95ead3a558197e9a913e7d12fdb5 SHA512 a109aa4d8db79c8401053cee203da7c391b4350737895e997930744f8e4f1629bc4f9ca041eed3f6667a5ffadceb909bf85628bde604a5b92d8551cddf370610
 MISC metadata.xml 517 BLAKE2B 384b3622592cc6d5fd94f2f34bcb69b00ce00bbea6b811e56d068a8882bcfb78fd3eae9f7b28173147b3235b942409f7b19d45044bf63bf9dea5b8b5f7110ca8 SHA512 bf89e6907f728f3e471a9a0fff41004cdd3cf50a92d8a1a262220bd590ae6a489f0b51d541bfefb15c4aae378621135a354ef48b768ea5b182e3fca6af6c3cb5
diff --git a/dev-lang/nqp/nqp-9999.ebuild b/dev-lang/nqp/nqp-9999.ebuild
index a56f63b23cda..6d46ea3814be 100644
--- a/dev-lang/nqp/nqp-9999.ebuild
+++ b/dev-lang/nqp/nqp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( java moar )"
 
 CDEPEND="java? (
-		dev-java/asm:9
+		>=dev-java/asm-9.7.1_p20241213:0
 		dev-java/jna:4
 	)
 	moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 2f09b703f0f2..753bd2a5e662 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -5,7 +5,7 @@ DIST perl-5.40.0-patches-2.tar.xz 17072 BLAKE2B 7cc1085a0a701f72cf1fce2b7f18ac94
 DIST perl-5.40.0.tar.xz 13804184 BLAKE2B cf191c3ccaf6f395c0c7d08c2ad3456c1dd622d4fe78e7fb3a74c741e9a84f1d39a55f5bc6adbea54c9520b1b387e72e957f9a7544ab8f24968d233cd5b959ae SHA512 a2fb1a24c6367b4043f4e929b2d74fc3bad1415e53b791ed1f219f1701064ae21b2bd3164ba95fcf24eaf458bd54433024ccae43725c0bb82a1ec6a98dc7052d
 DIST perl-5.40.1-RC1.tar.xz 13921272 BLAKE2B bc1a51c20754c73055b785d60927585bb7a1507176f06a34c3e7c089b788408ebb4d419c380174a207f2bd5fc1ad031d7eb6f722c5f8137c0e58245efe2c24cd SHA512 ea9f19658c9154c1d37b623a329b5417828bf6b1b1f449ba41d0a3b09f91246d9c39c425e35164a02f7eeac35968cd383e674579a888be465fe3be13497e9c86
 DIST perl-cross-1.6.tar.gz 121973 BLAKE2B b3a17d92dd7621a3bc253a6c4e56eccd3adec2c2b52e606c956a08f48d786a16a3ac5beb056a732ba3df92227f210193b0f516fd9d73cac362a04ec52efab029 SHA512 980af804513ec126e40eb9d8200ca54ba805bbb13b38d20a45daaf8d98d6b257e2eebc1ecad56cd47f60e235fa1141f6df9518d748db4f18d5219180750ca615
-EBUILD perl-5.40.0-r1.ebuild 28235 BLAKE2B 9746de244c85af0e0a36358fc9e62e13f131ccbb52e98d96918f3f6db5e2869a30e14081b7c3626c33caf41a8455b22fc7e5bb11fed250b10daa65426b8ba717 SHA512 13a6de696391548f9b009c2c2a4ae9c719f3cb831ef0d670f868c2cf97bd17f63d5768f508c493ad50b714a3c5d921ba7c72e5ce3824103276eacde1ed32b2e3
+EBUILD perl-5.40.0-r1.ebuild 28233 BLAKE2B bf6f602d75a06f534a396dfaf0a0c0c34f9a3eb863a0e5990bb7d93638cc40a5a3f64725964e43e743d1a74e363781424a0356781e350ff6f9380dee1414a1ac SHA512 f19a7bb8f67e9f97cb33724e12fa5ee707ff7ef7dd0aac099e2779fb36d996d2520c4dbfef74498e5ba94f5f457323564961ecff82b5f2a004f30d8533222d39
 EBUILD perl-5.40.0.ebuild 28190 BLAKE2B 69f185c504db14e70534e0ac5ee2bb03e632591219741d4502806143d2d8f5ebc80c7a5d5136e4f65c683ae880c2d270cd376991efbe57085e697f37da2d09c6 SHA512 59bdac5bf0391f117fe753be97e0e385bd74d1854e1ea0afd4f99796d92a693ad7bfa17e39c2043d5b8f67c851d8e88a573b3dab30dfad4770d5987d7fbd4b7c
 EBUILD perl-5.40.1_rc1.ebuild 28122 BLAKE2B c4bfae5ea84289916e0817ec2cd3a197f72c35da81f4060355f0d1ad7cc29cfe69f20dc7c577868a285d738dfa920ddb43bd3e2fb3620f74025d5dac968273d9 SHA512 7714116d9b5029ec06e33478f638c7349300041aa38460a0669f528dda4dc53a0221eb319a71fd1700c49cd2e8cb50d36d3b560e24e0e5616574f0aa8924adb1
 MISC metadata.xml 435 BLAKE2B 9a9dfd2dc8274c402dde0c3be13053b28361603c4fd230d841b169843e397bd6e16537034495178dfd443246c1621b34d849455147e8556a12806d973293a855 SHA512 1cb3197cf3c6f3031bdbc95c2686fcd2585f6e457d0661ed986cf7fa91b4ca564f793c2f141bfe5b9b8c54d2b05dd200c3e32bf073061872e08bd7c501bedc83
diff --git a/dev-lang/perl/perl-5.40.0-r1.ebuild b/dev-lang/perl/perl-5.40.0-r1.ebuild
index 92014d50dd6c..15cc80327c83 100644
--- a/dev-lang/perl/perl-5.40.0-r1.ebuild
+++ b/dev-lang/perl/perl-5.40.0-r1.ebuild
@@ -55,7 +55,7 @@ LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SUBSLOT}"
 
 if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 IUSE="berkdb perl_features_debug doc gdbm perl_features_ithreads minimal perl_features_quadmath"
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 7c30f6da753c..d8a2245c0b84 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -1,37 +1,3 @@
-DIST rust-1.54.0-aarch64-unknown-linux-gnu.tar.xz 231424908 BLAKE2B 6c403acd4b6b27208f95eb3fbfee5c8e7a63f3314f29ea7498dc0a4ae720d77c249c9ebc02a95d50278ac7f07b8d943b1c9c5e1561858f72ad1d8cdb29b779cc SHA512 3e6f638a35ed391f5393be7c92ef2560ed6bb26af1ea6ebf784bfadd3e153d1effd88fe49128eb98f5ec2ced7a65f3f4a596db71b9c4eca90429e50a8f168d11
-DIST rust-1.54.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B f655d6f53a580041642871abd10993b771835770bebb6de1ff1dcc9b250ae52f862212feece533a9932c6efb0c3d02769cbbb03114d941c7e8d3117e1e23ce75 SHA512 d9508ae502e26694f83c04bbea3f95aeeee7990e703c8bb8be9ba098e0df86a39272022e1a94f8852ed23b8378ecb338dbd87ef226da444e29ccf7fb1f44e5f6
-DIST rust-1.54.0-aarch64-unknown-linux-musl.tar.xz 231629132 BLAKE2B 339e341eadd2cb0c763eb00b5a6750a1082da26bcae1b3c06459c99c64b4babf4aec5173222187eed7271e3c5847da47b49e6ab75674161b6e28297bb62ec781 SHA512 f0e20c079e4351fac5e8d635a37502e833a56fd216fd015117fb12be8b72e022bce946ec8e1612b320530dd186b1702b4384e74d64a479099db4562bcfc68453
-DIST rust-1.54.0-aarch64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 5aa9872ad96668d392c1aecf7f54c171e7bef6e17f65efc6c3fff7eee8dd7fc3eacee03e6544cdc27c5d34ea946d1a61aca6298c91812e9f35c391211b563506 SHA512 07694566ae33492df31083887fe9b7d43fb9f7c469ccd2fe9c77d3c8d3bd6b58ddc5e185462e982f78d63db39703a60986acaad51f953ea7434bcd9432a96946
-DIST rust-1.54.0-arm-unknown-linux-gnueabi.tar.xz 209386412 BLAKE2B f33b802bdfa3cbafdd86eff2d43e0af99e54777b1a26f1106016a8bdc4c06b5cdac8810ac68785f6da4cbe6a6d7fa74c13a855a5ef9c5703b16a2100ef60f2df SHA512 5f68879abd5da5d37b555b0b6ca5850d68663878bd23b5f6a31efd0a9dd43809c4d413154f8f343688eca23a96adbd08fcb3132831b848690261964d6a24e160
-DIST rust-1.54.0-arm-unknown-linux-gnueabi.tar.xz.asc 801 BLAKE2B 7b90cdac8d068bcd565b42bed2289deff1490ae51cb65bbf2f0c308f6187e4fcfd98898e8e590ade2c2af7f10080821a417445e5c3046b4e39e0099c32e62624 SHA512 35bc49bc4140207af140e561023826e565751e47bbee6c1fd374bd7a992b6499051f4d84ca12e17101ea552bcafd6b96b111af888cd891f6dc18fceda11c83c8
-DIST rust-1.54.0-arm-unknown-linux-gnueabihf.tar.xz 209102396 BLAKE2B 1190da5c96336a121b4d4f92dba36c52c5f2bb0b26fdd92ca92ae4954256aaa375ea174c9669a285365ff02d4f3cadbf2d2ac92b847b00e10606e3832629a864 SHA512 ca38f1948b02008c1e9355c12f6d1fd3721ae9c06e686a09a7eea48670d889879ac0f81c462d21f467d600fc0972b920219e7378f7ba438e756cbc9b419a5f43
-DIST rust-1.54.0-arm-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 9f01100804d72dc7afb7660277daa5a0f0cd96e478a7dc5a242360d07b25a22c5769727a67a46d63f3283e22e89ef5a6f6f6c48ac46f01075e2d908bf681be5d SHA512 316662676cf52a2e58c6cbeb46152da3919e54b0385c33a8fd1d46c25e71604f7803174278f80d4cb72cae54829ba00e3c4ba58001b43cc1148347f1788fdb02
-DIST rust-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz 217891252 BLAKE2B 657f366344fe911c5d93585ee0b1063815fb158069136c742512f21d3b47c64e42555d4e52ba305e5ddebbb1fb37fa8ba8ebc36f9a9e5fe5fe7ffdb31472e012 SHA512 0f4f4e075299cd369b4b53a425e9b290cd9cedca6a88878c6a4ae0487fe976b15bea0c8b92e7e376f77dc370552d95d738e99b7fa184a8e2c0e5ab94d65e7595
-DIST rust-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B c23e12a70df5e58dfca0e9c66432844424dc166cbc7dfeef4f692ba076ba687fd871bbbb5d37ed82ed5662ada170520c56c426f89be4fa07a0c88cfb773fe91b SHA512 14a5674ed5862b6cd3ddcd3efff4ab1298285bc0d5604a869e74e055a319401b9bf48a60d44583ddeb2230dcfab2e5584e5149947fbc40d97c112a6dae51745a
-DIST rust-1.54.0-i686-unknown-linux-gnu.tar.xz 226774108 BLAKE2B c56fb6ef24cda0c89b76403a38893a32382b09be8a8d08b066fbd437ac0a73a7d00af175c59bb7af6e6f5d8a74324e10afed2ea35d830f9f96f5ceaa4ec345d6 SHA512 15bc0c31a306aa1e2b16fec7f97963ca291b2632664c49add4281d3244054b2e2f51b0ade86a9d63db87124071fa25bd7d5e662acf4c30cf3267eb56da4a1f1f
-DIST rust-1.54.0-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 4d53a7760abd54973ef8ce95c10671db41136d7031a25ea0c0362feb65ce5755223d60a01c3418b69b902feebf75651bc4379ea66f98c862a573a8774a5e99c2 SHA512 e3dcef4d17bea43a1b0858da52e899d7a14db8ee7b9e3f506e9297dd0aba910d3808c25163a3f95698f32d25a3f128bb1759a808c84b8c75404300f60198fbd5
-DIST rust-1.54.0-mips-unknown-linux-gnu.tar.xz 147938432 BLAKE2B 38e7b768773cef9e3cfe707a716ba59ed67e2bbefe59db5531b06489131df219eba6a46eeb5c06bfd6d943fa4453f3d6f4b869725108fd2e069ab6ebbfa3d08b SHA512 aab52c26bd80b058772e0cd815bbd5ca0ab0fb10fa0ba43c07fc6151ec6e99d7ab48613a3e5cbdcb8f00b83108a716bd8b9f5d6f2c8518499b2482aa4d423a91
-DIST rust-1.54.0-mips-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 05f4c8ee719ff857aa0a53661f6483c450a561905150217f886c25cf5c3e8dc3a36ebe2da38c75f843e3de4274d92c0c274906af40a94a6ecb122a9d38703e7f SHA512 6ba884e92b0ead2049f639405308ab6363268a8b42f827c9ecbfc5b16a0755bd1d345d989243f28662ce8c53611fb5984104001b3edec7b2dc22cc914970a7e5
-DIST rust-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz 157458264 BLAKE2B cd68d03e058922a020665a35765913f3405b0c0d5c7e252da1dc63b4b6af27d31fa5ce7eee562635241baea422c84d7e2a9539a79e6ae152794aeb9636e97a46 SHA512 74a85d869141fc941bf4f9821945ce0efd0169415fc209cc2288015d4e358716380cf91e41342a231cd34ce88321f24c4d20fffec3be702498cec3846a14298b
-DIST rust-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz.asc 801 BLAKE2B aaca9b8e5007e0efc459a04ab95e6a3d76ab6cf177964acd4bb148f09ffac4f9c9bfba4ca4834e1ccc9505c259511f45ed1830285307388d79ac66b8dcddbbc5 SHA512 8d5d2a1200af550cdbc85b2dc847e524ada7f16fbc5f4c29d0e9e4e8c0067e04daaa273a99c14e6ad1a7d622e4f9d3da720b41f4ee75ff50cf2153cc190642e5
-DIST rust-1.54.0-mips64el-unknown-linux-gnuabi64.tar.xz 159901680 BLAKE2B d6ef3d514dce43878cb1f305ac0be9d2558c709adb61668ac8685964b663b08cd81793df893d1b5cd7edbf539823a9976dce75ac5bb1bf340246d33e03a0e7fe SHA512 9470fd938cb6b4c0ddb728428fa7d1d86b4bb2ca43563fbee9b21b82bc76f3350620b36a988ac0d9e274dd987c91ff0dc0a99ec5085cc8999257da8813889445
-DIST rust-1.54.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc 801 BLAKE2B 618073a30586c640ca3df15b377c16ae95e6599de68107f260b728dfeef4d95c13a07923550722e61b1afeffb89e8adc01047de32e60c3b40ee7ab4e2700e0b0 SHA512 29e35ba575441dc441529f154496e99e9db83ac6f7c19129085091f33cf5c7882235f60f27d9922d9873a1476cecbe70e7694cf6b865315c022758ba80959738
-DIST rust-1.54.0-mipsel-unknown-linux-gnu.tar.xz 154497208 BLAKE2B 40ab905d6088cb2e4364e2e6a0e4fb257365af05302abab81604d78b62bc255377ff7088884d9222f2997312befbf8efcd7f1821fd4bcf2dbae149c70cfa1224 SHA512 c61abff1df5e787d330abe4b3cbe8c3e67f02974dba3eb0fa4cbfeb0a74a956abb48199301e7f9af915b9be5a0d6ff7771198414458da52af18e9a74cab52620
-DIST rust-1.54.0-mipsel-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B f525e1849a0c753a077ffadb7dd0b1d67b5fb369c061ec895878fbbd8d377572db2b5bb1fb5e1a24bcef61eb3f80b6f6bbb3d93b611e6b00e535b2e516ae0681 SHA512 d55ac3c329b20bd4e7f095ee2c710bd5c5be825ae517561bf670b96626427db39d362be553c3b92c90710ab8d9b677d2367aa85a397a4568c1146e0dff10cda6
-DIST rust-1.54.0-powerpc-unknown-linux-gnu.tar.xz 164089736 BLAKE2B a4e3c0b6f78444a2f48e842468e828e517d32fb1b62b2ad0c0000bee97ac5730977c8dacdc614ea2182fabf25e23804efed53b493ec611dd5d4d5d8ec237feb4 SHA512 ae8ba40e5843bd3ecc25156521f7e7cc7c869457151896371fd5faa3bc565ff9a6b7d437e3587dd9f1e87e9fa19463259ec18fe03badbd89372c11ddc7b577ee
-DIST rust-1.54.0-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B ac59496efd850b618b4013d0cbe09172f5828e60ae07afd0b233749ff3c1699e524e3a4fa93fea906f79dbc44f1d94ad52bf3952c2a4014d9d2653702d86349f SHA512 daf5da203c079cfca365990b0111d9df16defb49e1bc9c24407e423873992a9920d88fc2a097e1df8d2b03e05d1118bb3786e908d4f46fb282357c62d24df88c
-DIST rust-1.54.0-powerpc64-unknown-linux-gnu.tar.xz 178088044 BLAKE2B e059572d2044aa05683d29370c395b714f25d0c7ec820bcb133d29667e9066b82e62e11000a3183a66cbeb87625517284d12263c2ea0eec60dc537ba3c78e6b9 SHA512 543dcaf3bab3343e796b3535a3b4e12d77227006e64e91b885f599fd94ffc9c1cc8d8c5ce3b788df0399c79dc785ff7c8dc375ae20d3b4156d1b16a7dec5a371
-DIST rust-1.54.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 663a3f7027c61f4a7e38bd0a72ffa55b9de2673cc0d48e94bb964e950b8a356b01011e94904efb3525c0ee2cd57e82ce8af50d2360a7e5b200b6eefeb4580927 SHA512 f0d03c2c3da60731cc05b9370df53766d6fc14ea3d49edbe0a7e809e35560a7cf06c4d8291896a604fdaddb665d117c53ec93671a0402dc093442ed3cbf4c596
-DIST rust-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz 187058704 BLAKE2B bd90f56b50024cfce5bbfb5e84d28c06687b6a5524b1964064b1e53111b49805815d3dec47fd035f9e1d78c426d0b0689ac7c8baa1044cfbb9343da452d77694 SHA512 9d13d53a1ef106b190161096122da1bc9090dc495604c8ddbb9d6b02323e6b7c9b8bec82dfe33ae6cf1820e986811a701f7a4d4c3eb7c297c777fe3563b8e9ee
-DIST rust-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 3cfdbc8958b7025b6b3b76a6aef603820418c3aa2ee63c0a257dcd36004ca90203abb1b60a921310a9aea10545e32a11291a9d9baf3caf3e2b5a27ab4724bd9f SHA512 3ece925a1e3797cc6bf6ce44a3ca4768f57bc9bc3bb1261d6a82905907c635bb20ea7f5eeed062ff02582b035a22508990bfe83640006fe77fde8e699d5d55cc
-DIST rust-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz 180939260 BLAKE2B 856a431c22f286d42069dcd34101cc6e539004024619ba061a39d3bcc48834ce0002e2499466f976b81a7aa7d47f1c3249f2b21c69233df4d7d0940d80f5761c SHA512 5af3bbd68706bff03d51daf76551830810a8e225e8f0a9a394fd29a4fe9f0389bed3e0d94333483e089b4cce375c0320cc6ae360ddc4f08fca0ae80e671ba2a4
-DIST rust-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 366ef8f21801cc510b22217c4d974343ccb9f941faf08fba584b3f068a9d3128e3a15f5dc1400ed3749166afb622bb3aaafcf15381a0f2a5b60767db6ca9d3f2 SHA512 fdafdedb8f667124cb71eb44a6a61b1cef1df0baab385d2f5c674d900cd24139e555aa30df99f9d496b5fb30031bb86a43b118fafa083a24e2be10126e68df67
-DIST rust-1.54.0-s390x-unknown-linux-gnu.tar.xz 186478732 BLAKE2B 3d3ef6c37e0c24a4622814c51bfe1a5093f261e393a3dbb9c5eda023f8d0a63ebf0080cba5d43c8448b79503aecc62f04ccc18f040562db57dcd2ff1cb243124 SHA512 5033e3f61af7de144c3ed441f9fdf9f0c00a837d018ec3c0d4ef67f032e7f808d2dcc586e7b85b733ff9bc2196c2e05fcd104b3daa85698cc0e4e9ab69b870bd
-DIST rust-1.54.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B b375bf65d9bef4a54792f93ac52fa408c85407d6aa646b64ee85d9220fdd9d7dda76c1e118def5262f5ab8fd9b7637c5d681d37c50d9e917eb6ba0d5b25e42fc SHA512 3bd16cdc61033d6e38de595ac145f0e7cebf3c3455491325ba89de8067cf6096beac7f00b3e4dc942cf4bf0f5ab59f6233b5d24f0ebf97ab3562260182baae4c
-DIST rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz 136593024 BLAKE2B 2f10b636982f335a200149d11c6cf212adb3e27f7d3eda9069881565a07f29aa6f2010ca786c3746190a3bbb8b8d79d531bee906e21e21f2c132f6c1e4198e17 SHA512 d2aad46556b164dac54be76a2459789fc686781b157f0c7d647464db3b03cbb902c8c4de5c6ef2e0811a94bdbba2973c93698c4f3a7c6ba294c0e652994e3fdc
-DIST rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B cdfb03b6a75cd86e565b0b502cbd72636b67a92f9039fb148ca19fbef3d0775616ff03420cebeffe36db3d1d1db75e7e77ac473841a399dc2a218df09598b2eb SHA512 144ec35e82194d16cbf4e56c34dc25aa83d8ec8021052cc471ec85f169b74bd9394ec52c21c898d3ac0b966fd7463cd567d729eec9152f5fb8307c87eb02877d
-DIST rust-1.54.0-x86_64-unknown-linux-musl.tar.xz 267840732 BLAKE2B 32e50467c4ee88cc502ea7e3e8cda9cbd89bcb6b7fac0c84b1509abf0a5c551d43f6522d148f54e4af65e0738b1dd13bfebaaba7e863909047fd53cac03bbbac SHA512 131f4743e5990c3e1ec2b7a0d1eb107a0e5264e6ce387cf4aa6db9a1693d0fe4a42de5722072708d72d580500d566f7772513974ce5589ea07997374fbdefdb9
-DIST rust-1.54.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 8b9194ce2b172cdd1fecbe064ddaa0047d30ddeafeaa903637e65775b139207c47da7eb17475ed17b1792b7c872ae71058c1f2cb7d59bd2d42a78cc590f9ec03 SHA512 2aaa42cab5272b6ee2ad0d3cd67b7dc648af68c5b9b5fd8f816688c0ebcc2cb0a24ac8c2a23dda5f17f7ba04f544625b3b03b22882c9122852bba680d8155afc
 DIST rust-1.71.1-aarch64-unknown-linux-gnu.tar.xz 209839296 BLAKE2B da65e966a6bd8c6a8a13e5ab747da2a8d9b55f90fc20c1bd041ccc1a2f4e2d11d50d2ed9cc7f3a470e7f886ec8b891ef98ea1295491414d5afeae7f83fa3a555 SHA512 a2ea1383a6ea965e4b0c3a7c648bb357fb531a6984418756abcff3c526ccd9221a28aeedd11b65180fd166575e07a00151460dbc15e3b132a0bcac643911d242
 DIST rust-1.71.1-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 52d1fbdba32db7ac2578615fd10a3db1da84441274bb190624e517aec67279c7330f7c6b7fa0835d8e1cd8f578d34952813228a6a221e41c4193e9a079cc6fb6 SHA512 63cbbdd9a73f0223444565b60f59765a734633ef8e93843639969b96fb67550b85fe58079d486a927174f95619f0d6fdfe3f3b84d871f776bc48986be7965238
 DIST rust-1.71.1-aarch64-unknown-linux-musl.tar.xz 193170880 BLAKE2B 26384119108f4503d35f79fc5401c46e1eee326eca4dc6cc282949d2f195928fda5d3bf56c0509b04fdaa3e7c3c47f4ba44b2b82a60b02f7bc520360b0433efe SHA512 3e79692cd4dba512516eb48970dc9711448c33e1d7a5ebe7c5fadaed7f053ae9c1a8e6efcd1713f87dd84107a37b0fb21b1246e0d5c3e0dab677e5c7ed210825
@@ -436,7 +402,6 @@ DIST rust-src-1.81.0.tar.xz 2901440 BLAKE2B 7ad2855c21728cc323108f7e45416a425a22
 DIST rust-src-1.82.0.tar.xz 2966368 BLAKE2B 4162e7393ac21a095ac1541ea7b62fafa561ce2153bdd2b3723d0f2e0130fb2fb1325ac8583d87d64b6cf6b76400d12aaac144c781e89a177483adb46854c81b SHA512 4f7817eb16dbddf15ab09206738569370c42abe117086b085a7cc8f7174f9c2b42571707558642c72597236610eeeca32575b665acbc2cbc4f7709e624c16cc4
 DIST rust-src-1.83.0.tar.xz 2998424 BLAKE2B de758c5bfb29865a3ab7ab02d17b0282272fa7d1cf5da333a6a19d6a16813320317785e9bab02e3ba9ca6ee9f26e0c96b00a117f33b74c82b13ece44133e3130 SHA512 e1f0ccae1fd4202d86cde1f1e2f4491983ec49fafb2b9eaca6260e9173bea0e0cc2567946e48e3ce48f0a620f63dc44d30334f06c935628158de110d43c7d53b
 DIST rust-src-1.84.0.tar.xz 3016148 BLAKE2B e948d4edb88f81ecfb49f56a3ca6331c4e9de17bd9f56af823e1cefdc5098abebc2bb013d7c12ca1713a43fec588f33befcb7146713eeade1511914f70146d62 SHA512 ccb45d57c7cdac311478a5b4689144297717e6404f9c4fb168127804f13f72c15433b32765f90ce56e6f34435229e754241cb3656b28a4b33c6070b6f79b7c53
-EBUILD rust-bin-1.54.0.ebuild 5533 BLAKE2B d6e9c37a4ba322c4fa86d658eb3517a3c45bfa3341869ffb040c6ca350c16a892f26abe3c51cdea52d42c453a837f3204256285170729ae301d16e63db8bb8d4 SHA512 7ed26906372c87134263d00cecd62ad51731a906529eb23765dbca78efd921f1713d23d2f46ee0f2a5a2cedc2554fa60749b25f3a23f9a030821b90d7999adcf
 EBUILD rust-bin-1.71.1-r100.ebuild 7172 BLAKE2B f8b6f4910cf00212f0d7288d10d29c72d88826728fddfc77f47a782103564a88252837931c699ea9cf7586e4d9507bdae2a3354df262414c368af95a2d0bbfb8 SHA512 24aa046084a58816a2d3a949826945e294ab2ddacbc1e2ccb4cf1914065f3e52f7c3f680330939194b29149a3384c711efa09a261277d4b2dec6aff6660142a9
 EBUILD rust-bin-1.71.1-r101.ebuild 7172 BLAKE2B f8b6f4910cf00212f0d7288d10d29c72d88826728fddfc77f47a782103564a88252837931c699ea9cf7586e4d9507bdae2a3354df262414c368af95a2d0bbfb8 SHA512 24aa046084a58816a2d3a949826945e294ab2ddacbc1e2ccb4cf1914065f3e52f7c3f680330939194b29149a3384c711efa09a261277d4b2dec6aff6660142a9
 EBUILD rust-bin-1.74.1-r100.ebuild 7515 BLAKE2B eabe846ec482e04cfe068420c8315eead88dbe229bedf5f2809b492dc360bf5f34023c89a68b62d1f92c5a3ba628bfd8c861e83980925f74c61d95d3f106db2e SHA512 e40c66befee2c16b579b630de2e0aae00eb5bd72680bd6ee724ab52f434dfc725b2c377d725d95a3500be818acad973202e9b802762adcb1b54cab0251280d2b
diff --git a/dev-lang/rust-bin/rust-bin-1.54.0.ebuild b/dev-lang/rust-bin/rust-bin-1.54.0.ebuild
deleted file mode 100644
index ce1061857a9f..000000000000
--- a/dev-lang/rust-bin/rust-bin-1.54.0.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit prefix rust-toolchain toolchain-funcs verify-sig multilib multilib-minimal
-
-MY_P="rust-${PV}"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-SRC_URI="$(rust_all_arch_uris ${MY_P})"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rustfmt"
-
-RDEPEND=">=app-eselect/eselect-rust-20190311"
-BDEPEND="
-	prefix? ( dev-util/patchelf )
-	verify-sig? ( sec-keys/openpgp-keys-rust )
-"
-
-REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
-
-QA_PREBUILT="
-	opt/${P}/bin/.*
-	opt/${P}/lib/.*.so
-	opt/${P}/libexec/.*
-	opt/${P}/lib/rustlib/.*/bin/.*
-	opt/${P}/lib/rustlib/.*/lib/.*
-"
-
-# An rmeta file is custom binary format that contains the metadata for the crate.
-# rmeta files do not support linking, since they do not contain compiled object files.
-# so we can safely silence the warning for this QA check.
-QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
-src_unpack() {
-	verify-sig_src_unpack
-	mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die
-}
-
-patchelf_for_bin() {
-	local filetype=$(file -b ${1})
-	if [[ ${filetype} == *ELF*interpreter* ]]; then
-		einfo "${1}'s interpreter changed"
-		patchelf ${1} --set-interpreter ${2} || die
-	elif [[ ${filetype} == *script* ]]; then
-		hprefixify ${1}
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-
-	# start native abi install
-	pushd "${S}" >/dev/null || die
-	local analysis std
-	analysis="$(grep 'analysis' ./components)"
-	std="$(grep 'std' ./components)"
-	local components="rustc,cargo,${std},rls-preview,${analysis}"
-	use doc && components="${components},rust-docs"
-	use clippy && components="${components},clippy-preview"
-	use rustfmt && components="${components},rustfmt-preview"
-	./install.sh \
-		--components="${components}" \
-		--disable-verify \
-		--prefix="${ED}/opt/${P}" \
-		--mandir="${ED}/opt/${P}/man" \
-		--disable-ldconfig \
-		|| die
-
-	if use prefix; then
-		local interpreter=$(patchelf --print-interpreter "${EPREFIX}/bin/bash")
-		ebegin "Changing interpreter to ${interpreter} for Gentoo prefix at ${ED}/opt/${P}/bin"
-		find "${ED}/opt/${P}/bin" -type f -print0 | \
-			while IFS=  read -r -d '' filename; do
-				patchelf_for_bin ${filename} ${interpreter} \; || die
-			done
-		eend $?
-	fi
-
-	local symlinks=(
-		cargo
-		rls
-		rust-gdb
-		rust-gdbgui
-		rust-lldb
-		rustc
-		rustdoc
-	)
-
-	use clippy && symlinks+=( clippy-driver cargo-clippy )
-	use rustfmt && symlinks+=( rustfmt cargo-fmt )
-
-	einfo "installing eselect-rust symlinks and paths"
-	local i
-	for i in "${symlinks[@]}"; do
-		# we need realpath on /usr/bin/* symlink return version-appended binary path.
-		# so /usr/bin/rustc should point to /opt/rust-bin-<ver>/bin/rustc-<ver>
-		local ver_i="${i}-bin-${PV}"
-		ln -v "${ED}/opt/${P}/bin/${i}" "${ED}/opt/${P}/bin/${ver_i}"
-		dosym "../../opt/${P}/bin/${ver_i}" "/usr/bin/${ver_i}"
-	done
-
-	# symlinks to switch components to active rust in eselect
-	dosym "../../../opt/${P}/lib" "/usr/lib/rust/lib-bin-${PV}"
-	dosym "../../../opt/${P}/man" "/usr/lib/rust/man-bin-${PV}"
-	dosym "../../opt/${P}/lib/rustlib" "/usr/lib/rustlib-bin-${PV}"
-	dosym "../../../opt/${P}/share/doc/rust" "/usr/share/doc/${P}"
-
-	# musl logic can be improved a bit, but fine as is for now
-	cat <<-_EOF_ > "${T}/50${P}"
-	LDPATH="${EPREFIX}/usr/lib/rust/lib"
-	MANPATH="${EPREFIX}/usr/lib/rust/man"
-	$(use amd64 && usex elibc_musl 'CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '')
-	$(use arm64 && usex elibc_musl 'CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '')
-	_EOF_
-	doenvd "${T}/50${P}"
-
-	# note: eselect-rust adds EROOT to all paths below
-	cat <<-_EOF_ > "${T}/provider-${P}"
-	/usr/bin/cargo
-	/usr/bin/rustdoc
-	/usr/bin/rust-gdb
-	/usr/bin/rust-gdbgui
-	/usr/bin/rust-lldb
-	/usr/lib/rustlib
-	/usr/lib/rust/lib
-	/usr/lib/rust/man
-	/usr/share/doc/rust
-	/usr/bin/rls
-	_EOF_
-
-	if use clippy; then
-		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
-	fi
-	if use rustfmt; then
-		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
-	fi
-
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-	popd >/dev/null || die
-	#end native abi install
-
-	else
-		local rust_target
-		rust_target="$(rust_abi $(get_abi_CHOST ${v##*.}))"
-		dodir "/opt/${P}/lib/rustlib"
-		cp -vr "${WORKDIR}/rust-${PV}-${rust_target}/rust-std-${rust_target}/lib/rustlib/${rust_target}"\
-			"${ED}/opt/${P}/lib/rustlib" || die
-	fi
-
-	# BUG: installs x86_64 binary on other arches
-	rm -f "${ED}/opt/${P}/lib/rustlib/"*/bin/rust-llvm-dwp || die
-}
-
-pkg_postinst() {
-	eselect rust update
-
-	elog "Rust installs a helper script for calling GDB now,"
-	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}."
-
-	if has_version app-editors/emacs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-vim to get vim support for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust cleanup
-}
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 53a41a7ba49e..9da5db1521fd 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -1,7 +1,3 @@
-AUX 1.47.0-ignore-broken-and-non-applicable-tests.patch 2862 BLAKE2B 96363bfcaf3634185160d54f475711409c5af1e31b8deb3f1cb8650629eed6f4db6b8d758b84055c9ebe2983a213485f9d4d6de4f551ea1e3d122f7c3baad77e SHA512 4a2c7eab2d3930ba6d8bc042f52c993683a3e21bf023ae609bfb4db65df8c5750ce94264d6ee9196e4dfd3b3e204f10c70d6f3a2e752d0b373fee4ada4c5fe53
-AUX 1.49.0-gentoo-musl-target-specs.patch 6377 BLAKE2B 07e037353210292bc576ebbbda2afc489efeb696dffb34b4c5edffbb512b0ba5944cf641e625dd8a158cc7234b70d49d377397aab8cb9a86b4ec6f5a50a6cba6 SHA512 e166d4ed3e321257cef03655be98915badef432de10aa2bde2a4b9f1913dbb774a29a72d7d2861f69d02a37fd9f7c753c551a3e65fb7da4dfa78a8601eab8d38
-AUX 1.53.0-rustversion-1.0.5.patch 13732 BLAKE2B af345fb7fc8bb3ab139ed0e14819b0e000a1a525703c11535594695151640fe360a089c460a7f1219f0b8010979d73de55fbdd223f32ba7ba296ed16b048ec13 SHA512 ec748dd5a0dbebadae3e98bbef40338cc945180560586ae9aee7a1ec7e94e7a061ba3f3760f11e8061accfab908128d048aa834da5e34387dd0bb0fc16e82af2
-AUX 1.54.0-parallel-miri.patch 1707 BLAKE2B 131daebf9a1a1c454adfb61ce781204cb3f78f1bd2d0985fb76a9743a5f74ba8504845110a8fa624ebb9fc03bfede6bf3b115d706788af76d4baf2234056c006 SHA512 934bc8edb46d4367328a522fb83f020e2fac09a6a373482e8b2110383725f4733c500045bcb6119d4fdcc5367401a5ca787fb2491f6bb5b25c41897adf66fd88
 AUX 1.62.1-musl-dynamic-linking.patch 898 BLAKE2B 09321e356d5c945f72e75e668bfee2a78158131713b917d7a70834dfb0e9c732a1d259ac5406e12552ffa5741dd03c08a5a04e3c68d3e6f905318486b23f081e SHA512 3edefd746a2b1eacaef7b3fd51b14a36ec0a5a4f8893355c48d3afba862405451f4d6961b22b429db1b402572d841d91351ac4759ab8ef3891fd00641d827d48
 AUX 1.67.0-doc-wasm.patch 1359 BLAKE2B 59293c5b61de7ca283629d7f65b965388a42527811fc8355cdf5320fee03d10560f34e9c9a25dbe91e5758c37484485581a5e524a497711f1e108e5ffde6c53c SHA512 f3bafc2d0d2569f0d6891e14aa307cd2425d6624832b27381ae9d6f7ced488eff6d5fa0cdcd77a98d1f92a10a9d832f3aa3c481d1abbb42a0882862bbb189346
 AUX 1.70.0-ignore-broken-and-non-applicable-tests.patch 1029 BLAKE2B 42a634c423c57f23bf709294f79024fde03a529c9de6e15554102bfb0a777571e388a8a122d8e01fa8b1889b873083e7802ee30bc9de3c3ebd758a6c7628f295 SHA512 3b0f22370f002934f5237849f2a018989a700e6b4ed5ffe308d5a0acda54c85b67919db88a94eb991568056030899802ceb2bf102ce8eef9745efee40e8f738c
@@ -21,11 +17,6 @@ AUX 1.82.0-dwarf-llvm-assertion.patch 10589 BLAKE2B 2fe6a9e5cb4714c310539cee24c2
 AUX 1.82.0-i586-baseline.patch 1818 BLAKE2B 59f396cbcc9421ae9394d0bb51053dc9addb8ca895ea8c4d7633b56361782b65f4e7f0699dec2999f2e188b4929f9036991444187f8ef35f6fea176a01999f83 SHA512 898dbde6a2f3acbe7a50023b88d3280ae85125e2bb99d18823174b541972766cf75a3457a34a024cea7348537fa6854af6ffc975abbc19323a20de87cbf5e5fb
 AUX 1.83.0-cross-compile-libz.patch 915 BLAKE2B dbb726de09c9c957f245ecce29c597f4c9c26bae0c14901c62ad51349f02d47c69fa687bd926f7ecf47aaab4ac5aac9378dfe7fa0a66dee95ff1765c5aa9b0cc SHA512 b9127b7656b8e5f79db3157d9425f97af0634088fad512e572357797a2f24f9e9c3635e06ab2efc5ad8edf86ffcab53adbf013e29162579642a382d0015ab54e
 AUX 1.83.0-dwarf-llvm-assertion.patch 10432 BLAKE2B 27f7c4145cf3046e7cb74071b72c5d7a4a3cfbdc97530c588f82225ecc8a76692d228804c3fb8e7f356d9e76b982d429fa369dc5f4607d8ad91e3a486c7cd5fd SHA512 aa0b4022f00fe126953d7d9bb6759c5ef1b6deaf7dd387e031e74c9d1cbcd6861c673afefdca5f494015ddcb64f23297f1176f22d4f3b63ec3dbd0c39527adfd
-AUX llvm/12/cstdint-signals-h.patch 993 BLAKE2B f771a4f0bbe1cef4001e471b55d9849999e53ea9eaf20b7cde76495faaa8b34f920c011d4ef1fb19c23b41b86c2fd46c9fdce068314d3450a99ef76b60173bc2 SHA512 4d7f2f90654eaa4132088dfc1541b9e804cd67f1889317c05bd7c2ebc65205388c3c128c749d864ca3b1e04e170f5aad5964e7eb331867043beb5b3f07548730
-DIST openssl-0.10.35.crate 204462 BLAKE2B fb58a3be883bac3d5aa3e971172a281a80e9e100c51585db3d2828ecfd89d0b3b19edfacba2039056fa3aefb79717e03cd2ecbf932afb1acac2e74e1c29d3551 SHA512 5ebe4626a894ccc6e5c159cef72357654aa1a20dcc863fdab495f10a574b49b0b9d4e85a069b8b9297544ea0d09fd88a976396c3a8e8faaee9d01d79d943126f
-DIST openssl-sys-0.9.65.crate 54405 BLAKE2B f0e09accf076653f172199d36bfe0b7547a738f962e9ee8c15563c4d27587aade3e44830022a1787dfc932ae1f162336e3a110a34b1459656631c7ea50e58b75 SHA512 4c14ff5258a35b86e35d352c5702c90e1f70954c8f33d17160694b63305057b97da3ac6846d3e8f8e7293c40f15b76effd1e34fad4be613b8d815b90148406f7
-DIST rustc-1.54.0-src.tar.xz 116286856 BLAKE2B 5ac47822646a0b6205f09282168b4d4ddcace9f6bc8f242c890327ca4074626f129514f8bcae5c5556015745f718990cce490658076f5cd3526623439540416b SHA512 5162f85b43ca2c5af93fdbfb2597d75df8a838f7fcc025a5298499ce1043db50f1ea2fbba753e47ce5daad3d80d4b612acf6527ef902c34117763e687fdbbcfa
-DIST rustc-1.54.0-src.tar.xz.asc 801 BLAKE2B 5ee9166eaa00e4ffec10fb82b18946d403bc2030c6e04de6449311cbccc2ef1b017044f451a1c19be3a0a9640c4a9a9e4bd22d28e2115509f333ae38eb25e9d4 SHA512 5ad91f43515de14114964db0348cd28c08adc6dc935f110bf339053414b8eab8a40f1074ceffa44ed2df61254f8368d867479400618c44efaa0333642ab49d07
 DIST rustc-1.71.1-src.tar.xz 151983068 BLAKE2B 3dfdbc246feb84a79ae94c2de978c5585ee06cf6b683d2245869b62e28f7c79f89cc589f5431537713bf088236a0b824acefc1b68e418e9eb72e1eea98054e3f SHA512 fd0e5a16bdbeb539184513583089e55f681cb772810df357b6b1464853f7022ac02edab3dd155b2262ed0047e2a25dea3808dd078dcdfce9d399384465009db4
 DIST rustc-1.71.1-src.tar.xz.asc 801 BLAKE2B a88c073a70552d73e2d7695eceabdaa478f34501b7271fabf7f4a09f3efa545181f34353e45776b05918e6aeba88adb02f9731454f7085a7abf1602fc6589983 SHA512 9dd0406cf22f1daa7fcfd015fc1c6f8d36586aa99bf14c1491ee464c1f892ab759feb83e8b55b64713170fb777fdbe038fb5fd01a59c911b6599223baaba0677
 DIST rustc-1.74.1-src.tar.xz 155968724 BLAKE2B e05f2379ac94b286f85791a138e1928e5b5b5a7749f0981d82c40c2a12860f55bf96bb2f0e924e35a0f8b2447b13052d38adea909aaa3199105787bb5a4861b3 SHA512 14c7e7ed2f38ab60299d8c7d41d78f042b6b57ef822d577b5138e60bdde31cf141eccd4332a25bc5da3d58eb5313d63c1448b5dfe9e11b8055bb8ea133a9038d
@@ -50,9 +41,8 @@ DIST rustc-1.83.0-src.tar.xz 353808388 BLAKE2B 217c85f7351a7c57a2684da2c7c81a320
 DIST rustc-1.83.0-src.tar.xz.asc 801 BLAKE2B 3bacb43d50ebba579dc2d4f1726298a7887e303e15f039ef72b840e30d90bc2cf9cdbe4617a9ee113a2b1a48f1982e72cf30323d72cdfb9a65b5b4d734ca0024 SHA512 84b252ccaddc06cb05858ff64f582dd25823818c81b1e3a00362deeda06f09e6c36948fd316d5f0ca5e24949e6f99bb14a14dbd2af1cfbb85e679e27ab0a813c
 DIST rustc-1.84.0-src.tar.xz 354993944 BLAKE2B e4697d8a9f42484556ed490390aef535b2214ccb3715ade57936211c1c637737da5f2b9a6c53a30df0fba1744fbd80d4d1382c0b74f6b36b36098bf187557201 SHA512 9e964c1b964e74083a9002fa04b072fa8fe7a520b24ad55e88a89bb2a2a2cd5727c5438d6db425b824ae7502ab215c2dd3f49777efd65f76bae09965df2e070a
 DIST rustc-1.84.0-src.tar.xz.asc 801 BLAKE2B b1846702f36b92c479499f5eb704ce1e272131fc1b6b625c8d64c873a82ed79b1de8cceb1f21ae4b9dccf81e258547debf367b7b769ac94ed10a59dee18f79f1 SHA512 5ada0e0fed9901044eaa0d7cb657f685c7e183e91245714abe4a0a8bf3062a7de281932c7de7587220df0542511f6011d057bd8bed19d98c755eab74091cdfdb
-EBUILD rust-1.54.0.ebuild 16326 BLAKE2B b7dbdb8f5ef963e97a6a6062c202d66e7320c30c2239576b5aae24d9bcd2197755fe41a36d274b007a31cf597db2a7a41618e47cc8caa4c4208b219907c3438a SHA512 491ad28e70b29ce2370cec883389e0bf11bc86816828c0d60d2015cf6d749ce716e3245eb5aa9477ce27e209682ba747927e09027162a52f9e30be47f4f81f54
 EBUILD rust-1.71.1-r100.ebuild 22077 BLAKE2B 1082eec69086f44922a4d9b4d7d0fbee5104c4653fe6320764748638389871081c5812aa0bed84ecd36f6d764e38a257c640518b3ca190797ca595506106739f SHA512 461a0bd207a4424c2512ee404202b14fdc8bf6d4bd628e38f325584ff4e452de0f3615e3a3683b2d1eae0b9498443eccb10f6800cf3c6be862f1643b9203c017
-EBUILD rust-1.74.1-r100.ebuild 23421 BLAKE2B 0d1b4a85f11c4bc4750fe017ab0e03d79088ce72357b0d96390a774fbbd44fbd75f18497757716ab7cc7ad919f51c87623d5dab3c44576eb398ebccd772e0fba SHA512 9529c20867b64b0c0890ab11865ce2aa764fcf3384405cb1a16ac6d1c7d685fc2f70e1edc41acd2f0fc011772bced22bf27e3596a752866f94f77a9677d4ba95
+EBUILD rust-1.74.1-r100.ebuild 37690 BLAKE2B 93ff1451143f5282ef231911a3b820649052300b933a9e6fd602ce6dcbf6f88af118e2835e59d3b520ba7f09a292d71d1f9b7b7a48bbbeadaaf880ff0a0dc3ea SHA512 2709d8377472eda62ebd2d0c296b1b678c106e6cc33268823391f0e2072f06551e1bb9094017077f4bd56aa0a34bee3a329d0a6f27fd1f8304af6abcc9e9b241
 EBUILD rust-1.75.0-r100.ebuild 23584 BLAKE2B ec9b5d0dc286ce5f1931df6e60817531f3ce6002a3916e47355c557693b19bdacdefd3e01d309880c8e48e53d4fc9082bab4aa2ed9da34c51df8b8c25e60305f SHA512 f759a9db473a3d19571b20669b9631446b71c508ba9cf42edc126e1da03ce8ad34478b6712f48711ee152001841d31662ea6f227faacec1fb51b625522415e64
 EBUILD rust-1.76.0-r100.ebuild 20091 BLAKE2B c9132c08aa051dcd3412909472312db21db79db7215beacc564c2d58e00b2dbd758f4bfa3a81d2a5dfa70a1bbf9ec82a96dbd7042e561d05c5e3cb7a699d240c SHA512 c9a821bfb2f693ab5d628eff20dcdea32bc1f29540e22c465275f89a6559f6db6d9ab93fd2cabba30f20b5bdd9cb24645d4f73f9b1976bb113b06544ea4746c2
 EBUILD rust-1.77.1-r100.ebuild 23547 BLAKE2B dfa0b1105be8a58c88afd4fe184381bc83516f9935e6ac533d8f44bc0953b3da9305cbfdd44915810d87fc89cd2aee76f06e30d617ed4425cd01cbe429e5e8c4 SHA512 9ce03c548c77382a8fd91690a6071bf082f468e5807cd132a0b8206208580336a61991f7d563b5d12629d920753e2b2d59d099e7f7afad17d259717a17af6cd5
@@ -64,4 +54,4 @@ EBUILD rust-1.82.0-r100.ebuild 23997 BLAKE2B 227d902466e31d42551be544e88839814ff
 EBUILD rust-1.82.0-r101.ebuild 24046 BLAKE2B d132b0109d9d1e68ded0357221609102f0e638069e4ec2bf61e53fb94b388fe67e97b5cb5ee3f29ecdc3a9f4c18a4ad6cef0e08addc248289ae3178c2e04aa04 SHA512 31f3e5bfa8345bcad487474bd8e0570c31e51a7e477d030f2fe61148e4598f069211139504a43958367b740cf38b18ff92e46e49d6080b7df8177453e9dae14e
 EBUILD rust-1.83.0-r1.ebuild 23279 BLAKE2B 183f2a6f686030c2efad110709d52b68c655dc374faa748f83c5d33ced7e44b81d5c321e843e8ffcd6c4d248bb8b6452986eb9f1e0b636e199404668f3a54518 SHA512 8220054d98db8bb50d9abd765ffefaafd360ad13ee566485e2f82930a8821b32c7b5e33080127e8fea5dbe655a81c8edd1563d0efa5c78be4c41d8bd4af22050
 EBUILD rust-1.84.0.ebuild 22990 BLAKE2B cecc312f026169d94fdd5d435c54fe83f75bc5c6c0d3954b255d4a20dcca2a97254a7555e2c64c7961643bce0cb2779fc105cc0bf3dc6f4c1c3c3ce6f4736213 SHA512 c31e9762a00f862814865b70d7ec2ea1fe26aa7ea0c97f8795e29dc1a97e74c46d2f8381da47e11b389c112312421ee059134a29b3924a476b526ff49bf94d1c
-MISC metadata.xml 1708 BLAKE2B ab2730e5846922c119865b26cf317a9d150321dca15500b2254fe6d0580e939a67d3b42ef1b74268ea629e843c251c5d1edc2e88edfe590c0c6e7d1b98b38b04 SHA512 6b7c99fed72711e3bdb024e6873ef0a372c7456ddcc56af239c6f8bacfff688ad8246ded6b6489172f94dbe5921159be42021248200afea2b304a529dcff7485
+MISC metadata.xml 1841 BLAKE2B 48a8167ae44a7f4892b917895298627ac920af6c488180980e65bdeec53b650455fc6d7dddad0a7a8257d473080082377fb6b6df6a834b294b6e6485e6784a1e SHA512 1f5fd792b65ccac89a61233004980d9f7cbaecea5d05f35f9cc2dc9cab4e3ccfcd46828e88770a1b8ba5ca23064b6a75eea72a0b32bcce52bb399b85ac95f755
diff --git a/dev-lang/rust/files/1.47.0-ignore-broken-and-non-applicable-tests.patch b/dev-lang/rust/files/1.47.0-ignore-broken-and-non-applicable-tests.patch
deleted file mode 100644
index ff1707f4b8a4..000000000000
--- a/dev-lang/rust/files/1.47.0-ignore-broken-and-non-applicable-tests.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Sun, 16 Sep 2018 16:38:48 +0000
-Subject: [PATCH 12/15] Ignore broken and non-applicable tests
-
-c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475
-env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox)
-long-linker-command-lines: takes >10 minutes to run (but still passes)
-simd-intrinsic-generic-bitmask.rs: broken on BE, #59356
-sparc-struct-abi: no sparc target
-sysroot-crates-are-unstable: can't run rustc without RPATH
----
- src/test/codegen/sparc-struct-abi.rs                            | 1 +
- src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile   | 2 ++
- src/test/run-make-fulldeps/long-linker-command-lines/Makefile   | 2 ++
- src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile | 2 ++
- src/test/ui/env-funky-keys.rs                                   | 1 +
- 6 files changed, 10 insertions(+)
-
-diff --git a/src/test/codegen/sparc-struct-abi.rs b/src/test/codegen/sparc-struct-abi.rs
-index 78e5b14a212..6f93e93286b 100644
---- a/src/test/codegen/sparc-struct-abi.rs
-+++ b/src/test/codegen/sparc-struct-abi.rs
-@@ -4,6 +4,7 @@
- 
- // only-sparc64
- // compile-flags: -O --target=sparc64-unknown-linux-gnu --crate-type=rlib
-+// ignore-test
- #![feature(no_core, lang_items)]
- #![no_core]
- 
-diff --git a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile b/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile
-index f124ca2ab61..363b18f0985 100644
---- a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile
-+++ b/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile
-@@ -1,3 +1,5 @@
-+# ignore-aarch64
-+
- -include ../tools.mk
- 
- all:
-diff --git a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile
-index 5876fbc94bc..5f167ece1a2 100644
---- a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile
-+++ b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile
-@@ -1,3 +1,5 @@
-+# ignore-test
-+
- -include ../tools.mk
- 
- all:
-diff --git a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
-index 9e770706857..6d92ec5cec8 100644
---- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
-+++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
-@@ -1,1 +1,3 @@
-+# ignore-test
-+
- all:
-         python2.7 test.py
-diff --git a/src/test/ui/env-funky-keys.rs b/src/test/ui/env-funky-keys.rs
-index c5c824ac58d..f3fe047a79c 100644
---- a/src/test/ui/env-funky-keys.rs
-+++ b/src/test/ui/env-funky-keys.rs
-@@ -1,6 +1,7 @@
- // run-pass
- // Ignore this test on Android, because it segfaults there.
- 
-+// ignore-test
- // ignore-android
- // ignore-windows
- // ignore-cloudabi no execve
--- 
-2.24.1
-
diff --git a/dev-lang/rust/files/1.49.0-gentoo-musl-target-specs.patch b/dev-lang/rust/files/1.49.0-gentoo-musl-target-specs.patch
deleted file mode 100644
index 25f1f27fcce6..000000000000
--- a/dev-lang/rust/files/1.49.0-gentoo-musl-target-specs.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 671ef2d1c228aed031b4232b8bea96f17b825263 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Mon, 23 Nov 2020 14:52:04 -0800
-Subject: [PATCH] add gentoo musl target specs
-
----
- .../src/spec/aarch64_gentoo_linux_musl.rs             | 11 +++++++++++
- .../src/spec/armv7_gentoo_linux_musleabihf.rs         | 11 +++++++++++
- .../rustc_target/src/spec/i686_gentoo_linux_musl.rs   | 11 +++++++++++
- compiler/rustc_target/src/spec/mod.rs                 |  8 ++++++++
- .../src/spec/powerpc64_gentoo_linux_musl.rs           | 11 +++++++++++
- .../src/spec/powerpc64le_gentoo_linux_musl.rs         | 11 +++++++++++
- .../src/spec/powerpc_gentoo_linux_musl.rs             | 11 +++++++++++
- .../rustc_target/src/spec/x86_64_gentoo_linux_musl.rs | 11 +++++++++++
- 8 files changed, 85 insertions(+)
- create mode 100644 compiler/rustc_target/src/spec/aarch64_gentoo_linux_musl.rs
- create mode 100644 compiler/rustc_target/src/spec/armv7_gentoo_linux_musleabihf.rs
- create mode 100644 compiler/rustc_target/src/spec/i686_gentoo_linux_musl.rs
- create mode 100644 compiler/rustc_target/src/spec/powerpc64_gentoo_linux_musl.rs
- create mode 100644 compiler/rustc_target/src/spec/powerpc64le_gentoo_linux_musl.rs
- create mode 100644 compiler/rustc_target/src/spec/powerpc_gentoo_linux_musl.rs
- create mode 100644 compiler/rustc_target/src/spec/x86_64_gentoo_linux_musl.rs
-
-diff --git a/compiler/rustc_target/src/spec/aarch64_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/aarch64_gentoo_linux_musl.rs
-new file mode 100644
-index 0000000..420fe7c
---- /dev/null
-+++ b/compiler/rustc_target/src/spec/aarch64_gentoo_linux_musl.rs
-@@ -0,0 +1,11 @@
-+use crate::spec::Target;
-+
-+pub fn target() -> Target {
-+    let mut base = super::aarch64_unknown_linux_musl::target();
-+
-+    base.llvm_target = "aarch64-gentoo-linux-musl".to_string();
-+    base.options.vendor = "gentoo".to_string();
-+    base.options.crt_static_default = false;
-+
-+    base
-+}
-diff --git a/compiler/rustc_target/src/spec/armv7_gentoo_linux_musleabihf.rs b/compiler/rustc_target/src/spec/armv7_gentoo_linux_musleabihf.rs
-new file mode 100644
-index 0000000..067e2d6
---- /dev/null
-+++ b/compiler/rustc_target/src/spec/armv7_gentoo_linux_musleabihf.rs
-@@ -0,0 +1,11 @@
-+use crate::spec::Target;
-+
-+pub fn target() -> Target {
-+    let mut base = super::armv7_unknown_linux_musleabihf::target();
-+
-+    base.llvm_target = "armv7-gentoo-linux-musleabihf".to_string();
-+    base.options.vendor = "gentoo".to_string();
-+    base.options.crt_static_default = false;
-+
-+    base
-+}
-diff --git a/compiler/rustc_target/src/spec/i686_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/i686_gentoo_linux_musl.rs
-new file mode 100644
-index 0000000..1cd39cd
---- /dev/null
-+++ b/compiler/rustc_target/src/spec/i686_gentoo_linux_musl.rs
-@@ -0,0 +1,11 @@
-+use crate::spec::Target;
-+
-+pub fn target() -> Target {
-+    let mut base = super::i686_unknown_linux_musl::target();
-+
-+    base.llvm_target = "i686-gentoo-linux-musl".to_string();
-+    base.options.vendor = "gentoo".to_string();
-+    base.options.crt_static_default = false;
-+
-+    base
-+}
-diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
-index f1e8330..d8c0ba0 100644
---- a/compiler/rustc_target/src/spec/mod.rs
-+++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -490,6 +490,14 @@ macro_rules! supported_targets {
- }
- 
- supported_targets! {
-+    ("aarch64-gentoo-linux-musl", aarch64_gentoo_linux_musl),
-+    ("armv7-gentoo-linux-musleabihf", armv7_gentoo_linux_musleabihf),
-+    ("i686-gentoo-linux-musl", i686_gentoo_linux_musl),
-+    ("powerpc-gentoo-linux-musl", powerpc_gentoo_linux_musl),
-+    ("powerpc64-gentoo-linux-musl", powerpc64_gentoo_linux_musl),
-+    ("powerpc64le-gentoo-linux-musl", powerpc64le_gentoo_linux_musl),
-+    ("x86_64-gentoo-linux-musl", x86_64_gentoo_linux_musl),
-+
-     ("x86_64-unknown-linux-gnu", x86_64_unknown_linux_gnu),
-     ("x86_64-unknown-linux-gnux32", x86_64_unknown_linux_gnux32),
-     ("i686-unknown-linux-gnu", i686_unknown_linux_gnu),
-diff --git a/compiler/rustc_target/src/spec/powerpc64_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/powerpc64_gentoo_linux_musl.rs
-new file mode 100644
-index 0000000..e840bb2
---- /dev/null
-+++ b/compiler/rustc_target/src/spec/powerpc64_gentoo_linux_musl.rs
-@@ -0,0 +1,11 @@
-+use crate::spec::Target;
-+
-+pub fn target() -> Target {
-+    let mut base = super::powerpc64_unknown_linux_musl::target();
-+
-+    base.llvm_target = "powerpc64-gentoo-linux-musl".to_string();
-+    base.options.vendor = "gentoo".to_string();
-+    base.options.crt_static_default = false;
-+
-+    base
-+}
-diff --git a/compiler/rustc_target/src/spec/powerpc64le_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/powerpc64le_gentoo_linux_musl.rs
-new file mode 100644
-index 0000000..1037d82
---- /dev/null
-+++ b/compiler/rustc_target/src/spec/powerpc64le_gentoo_linux_musl.rs
-@@ -0,0 +1,11 @@
-+use crate::spec::Target;
-+
-+pub fn target() -> Target {
-+    let mut base = super::powerpc64le_unknown_linux_musl::target();
-+
-+    base.llvm_target = "powerpc64le-gentoo-linux-musl".to_string();
-+    base.options.vendor = "gentoo".to_string();
-+    base.options.crt_static_default = false;
-+
-+    base
-+}
-diff --git a/compiler/rustc_target/src/spec/powerpc_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/powerpc_gentoo_linux_musl.rs
-new file mode 100644
-index 0000000..a623ffe
---- /dev/null
-+++ b/compiler/rustc_target/src/spec/powerpc_gentoo_linux_musl.rs
-@@ -0,0 +1,11 @@
-+use crate::spec::Target;
-+
-+pub fn target() -> Target {
-+    let mut base = super::powerpc_unknown_linux_musl::target();
-+
-+    base.llvm_target = "powerpc-gentoo-linux-musl".to_string();
-+    base.options.vendor = "gentoo".to_string();
-+    base.options.crt_static_default = false;
-+
-+    base
-+}
-diff --git a/compiler/rustc_target/src/spec/x86_64_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/x86_64_gentoo_linux_musl.rs
-new file mode 100644
-index 0000000..f330473
---- /dev/null
-+++ b/compiler/rustc_target/src/spec/x86_64_gentoo_linux_musl.rs
-@@ -0,0 +1,11 @@
-+use crate::spec::Target;
-+
-+pub fn target() -> Target {
-+    let mut base = super::x86_64_unknown_linux_musl::target();
-+
-+    base.llvm_target = "x86_64-gentoo-linux-musl".to_string();
-+    base.options.vendor = "gentoo".to_string();
-+    base.options.crt_static_default = false;
-+
-+    base
-+}
--- 
-2.29.2
-
diff --git a/dev-lang/rust/files/1.53.0-rustversion-1.0.5.patch b/dev-lang/rust/files/1.53.0-rustversion-1.0.5.patch
deleted file mode 100644
index bc6ae8be00b7..000000000000
--- a/dev-lang/rust/files/1.53.0-rustversion-1.0.5.patch
+++ /dev/null
@@ -1,234 +0,0 @@
-From 12efa21eb88cb43d3b927952da0c5635373ac92b Mon Sep 17 00:00:00 2001
-From: David Tolnay <dtolnay@gmail.com>
-Date: Thu, 17 Jun 2021 22:34:55 -0700
-Subject: [PATCH] Update rustversion to 1.0.5
-
----
- Cargo.lock                                   |  4 +--
- vendor/rustversion/.cargo-checksum.json      |  2 +-
- vendor/rustversion/Cargo.toml                |  2 +-
- vendor/rustversion/build/build.rs            |  6 ++++
- vendor/rustversion/build/rustc.rs            | 30 +++++++++-----------
- vendor/rustversion/src/lib.rs                | 15 ++++++++++
- vendor/rustversion/src/time.rs               | 13 +++++++--
- vendor/rustversion/tests/test_parse.rs       | 10 +++++++
- vendor/rustversion/tests/ui/bad-bound.stderr |  4 +--
- vendor/rustversion/tests/ui/bad-date.stderr  |  4 +--
- 10 files changed, 63 insertions(+), 27 deletions(-)
-
-diff --git a/Cargo.lock b/Cargo.lock
-index 0939f19cdfe..26a89caf050 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -4582,9 +4582,9 @@ dependencies = [
- 
- [[package]]
- name = "rustversion"
--version = "1.0.4"
-+version = "1.0.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"
-+checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088"
- 
- [[package]]
- name = "ryu"
-diff --git a/vendor/rustversion/.cargo-checksum.json b/vendor/rustversion/.cargo-checksum.json
-index e1277df7b59..0a134695aaf 100644
---- a/vendor/rustversion/.cargo-checksum.json
-+++ b/vendor/rustversion/.cargo-checksum.json
-@@ -1 +1 @@
--{"files":{"Cargo.toml":"1a91782510461d54726e816ae776042b95c79c9949d49c11b8782caefc22ead2","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"01dc6a1bf499a12bd0bfbbfe4db2ca8460b2c151235bcf2aad2356de4c2ec50a","build/build.rs":"481daf363b7004c90ffc3e012863a4102e9f26b9aaa2a4a295c2dd78f690be28","build/rustc.rs":"4dc8f1764672137bd15758cc19242740b0d6ab99e4a69171ad0999f9112a15a6","src/attr.rs":"9301cd4aff5a9648c057d5d8de9eb66921f0c3a715c51ada4459576bd49c8b19","src/bound.rs":"44bda74d3aacfeeeac9dae2f7eef3acc844d4c3c7eaa9d3e6288e5aeff269dff","src/constfn.rs":"613b8f53b21cc06b4f619fce9000993d3e7873b650701ca01cef1e53bed5b40a","src/date.rs":"454c749a60db8144a706a813e06fe3ae39c981920ba9832ef82f3f9debe1f052","src/error.rs":"cb37102f03ebbaca313d80f9714fe08dfef92fe956789ee87d93eb6121705f4f","src/expr.rs":"8e8ca76f4f5838436d9d7273f499c698bb41f6c15bc07d32ec5c1cb8bd3dd731","src/iter.rs":"8d4b817b9abc4e817105b673e15f29ef9bb8284a010ce01ac2d83387fe136947","src/lib.rs":"f8347832d8072058dbb4af6b8d67a834a02fe9c5460bbaa26defec4b66317f1b","src/release.rs":"abb8ddd877c39a023bf5e7bd67063d6e4144e79758a8bafa338167f9d15b89f1","src/time.rs":"45fb48ff0a0046a5a1b108b9ce53b14885637ad868ede1d66970379c2b7f16ef","src/token.rs":"824ce765f692db73afa02d3ebb0281c750748035efc98fa547be29d3072665ce","src/version.rs":"afdb048bba95bbb885945eba5527b6bf0eca0105642bfc304c2f82a8b7d556df","tests/compiletest.rs":"0a52a44786aea1c299c695bf948b2ed2081e4cc344e5c2cadceab4eb03d0010d","tests/test_const.rs":"a8297ca6559f895a3b2664964a42b6f82bbbc3c8faa9556a513006e6e1827995","tests/test_eval.rs":"6f0ee3f49c9a0d0c374a4d0e9a9dce753cd9fc2ca7725e000a435dbd5f4a9ce3","tests/test_parse.rs":"fbf9695f4208263743715e6c8b6294dfffee21462a65dfeb9339a70c0e18dbc6","tests/ui/bad-bound.rs":"25bde278fcaabf62868417148a5e5f2006bf589d7ebd7bf6004fb8d78e47594f","tests/ui/bad-bound.stderr":"bc9297f758c2541fb0a8b48d5785f4bbcd0d2a07d876ba0baf2fc9de9275e7e6","tests/ui/bad-date.rs":"6e23714dae8b6346fefe50dacd4abba3265248bbadfdd60c739138aa8a0037ba","tests/ui/bad-date.stderr":"1ac3cab13ee900fc8344e8fab21ff4d9cad476aca44925a4c1b2293a6b59b742","tests/ui/bad-not.rs":"f003df8bd245e9dd8edc3a6d94078ee5162fac7a98db881271f0f5b6db98d45d","tests/ui/bad-not.stderr":"d4ef78fae4a82419e737757158796cb103a5920df498956eaf57ed201797b463","tests/ui/bad-version.rs":"f4ea2cd038e6c63deb9c2e3ceffce93dbf179d9ce18c16d88f3b6cd7138a8c8e","tests/ui/bad-version.stderr":"60ed51c62f4c2fb6ff95cff7523cfca379ed434f319da9d82704318588792338","tests/ui/const-not-fn.rs":"10bbe38f0d89391fff0698756e4cfd4e72a41090360393a0c951b67df14d1c35","tests/ui/const-not-fn.stderr":"9551f7f222445b31d7af2415d467301c332d55bb3d5a143846484f2f00047a01"},"package":"cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"}
-\ No newline at end of file
-+{"files":{"Cargo.toml":"a09ee758f816eddff8a8c7fb5be54dd95e74caad18a207251faedd251ecfaf1c","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"01dc6a1bf499a12bd0bfbbfe4db2ca8460b2c151235bcf2aad2356de4c2ec50a","build/build.rs":"bae427f344972e6e0e348ec48dce0947274b3ec6cac0938497a8d3da5c9834e5","build/rustc.rs":"3e4acf7ea679f9331dd4e8dbe42a08a312f58379ea1eee5898793a9848d06d8c","src/attr.rs":"9301cd4aff5a9648c057d5d8de9eb66921f0c3a715c51ada4459576bd49c8b19","src/bound.rs":"44bda74d3aacfeeeac9dae2f7eef3acc844d4c3c7eaa9d3e6288e5aeff269dff","src/constfn.rs":"613b8f53b21cc06b4f619fce9000993d3e7873b650701ca01cef1e53bed5b40a","src/date.rs":"454c749a60db8144a706a813e06fe3ae39c981920ba9832ef82f3f9debe1f052","src/error.rs":"cb37102f03ebbaca313d80f9714fe08dfef92fe956789ee87d93eb6121705f4f","src/expr.rs":"8e8ca76f4f5838436d9d7273f499c698bb41f6c15bc07d32ec5c1cb8bd3dd731","src/iter.rs":"8d4b817b9abc4e817105b673e15f29ef9bb8284a010ce01ac2d83387fe136947","src/lib.rs":"5652f6f84fc80136bd29b2125f7676e80e0df7d40aac274b0658c99cecbd871d","src/release.rs":"abb8ddd877c39a023bf5e7bd67063d6e4144e79758a8bafa338167f9d15b89f1","src/time.rs":"bdd05a743b07a6bbfa0dbc9d4e415e051aba4a51a430c3be1e23447eae298c8b","src/token.rs":"824ce765f692db73afa02d3ebb0281c750748035efc98fa547be29d3072665ce","src/version.rs":"afdb048bba95bbb885945eba5527b6bf0eca0105642bfc304c2f82a8b7d556df","tests/compiletest.rs":"0a52a44786aea1c299c695bf948b2ed2081e4cc344e5c2cadceab4eb03d0010d","tests/test_const.rs":"a8297ca6559f895a3b2664964a42b6f82bbbc3c8faa9556a513006e6e1827995","tests/test_eval.rs":"6f0ee3f49c9a0d0c374a4d0e9a9dce753cd9fc2ca7725e000a435dbd5f4a9ce3","tests/test_parse.rs":"cdfe376020b9391330292968046117b0935c828d73385e8faeb2e333ec897088","tests/ui/bad-bound.rs":"25bde278fcaabf62868417148a5e5f2006bf589d7ebd7bf6004fb8d78e47594f","tests/ui/bad-bound.stderr":"a03dc78b380191c10d3b3406b1fd3208bb2609d4c26b9c33ccd335721e3cd072","tests/ui/bad-date.rs":"6e23714dae8b6346fefe50dacd4abba3265248bbadfdd60c739138aa8a0037ba","tests/ui/bad-date.stderr":"3a607fb950a69f7dc1b503295bce53541f9dee9f4674edc5d13ee3a69ff0e8cd","tests/ui/bad-not.rs":"f003df8bd245e9dd8edc3a6d94078ee5162fac7a98db881271f0f5b6db98d45d","tests/ui/bad-not.stderr":"d4ef78fae4a82419e737757158796cb103a5920df498956eaf57ed201797b463","tests/ui/bad-version.rs":"f4ea2cd038e6c63deb9c2e3ceffce93dbf179d9ce18c16d88f3b6cd7138a8c8e","tests/ui/bad-version.stderr":"60ed51c62f4c2fb6ff95cff7523cfca379ed434f319da9d82704318588792338","tests/ui/const-not-fn.rs":"10bbe38f0d89391fff0698756e4cfd4e72a41090360393a0c951b67df14d1c35","tests/ui/const-not-fn.stderr":"9551f7f222445b31d7af2415d467301c332d55bb3d5a143846484f2f00047a01"},"package":"61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088"}
-\ No newline at end of file
-diff --git a/vendor/rustversion/Cargo.toml b/vendor/rustversion/Cargo.toml
-index 56995ff0792..c72b1b2b343 100644
---- a/vendor/rustversion/Cargo.toml
-+++ b/vendor/rustversion/Cargo.toml
-@@ -13,7 +13,7 @@
- [package]
- edition = "2018"
- name = "rustversion"
--version = "1.0.4"
-+version = "1.0.5"
- authors = ["David Tolnay <dtolnay@gmail.com>"]
- build = "build/build.rs"
- description = "Conditional compilation according to rustc compiler version"
-diff --git a/vendor/rustversion/build/build.rs b/vendor/rustversion/build/build.rs
-index 2a8bc4af39f..15312510d68 100644
---- a/vendor/rustversion/build/build.rs
-+++ b/vendor/rustversion/build/build.rs
-@@ -1,3 +1,9 @@
-+#![allow(
-+    clippy::enum_glob_use,
-+    clippy::must_use_candidate,
-+    clippy::single_match_else
-+)]
-+
- mod rustc;
- 
- use std::env;
-diff --git a/vendor/rustversion/build/rustc.rs b/vendor/rustversion/build/rustc.rs
-index 723e6bdd0e2..dfc6a05166f 100644
---- a/vendor/rustversion/build/rustc.rs
-+++ b/vendor/rustversion/build/rustc.rs
-@@ -48,23 +48,21 @@ pub fn parse(string: &str) -> Option<Version> {
-         Some(channel) if channel == "dev" => Dev,
-         Some(channel) if channel.starts_with("beta") => Beta,
-         Some(channel) if channel == "nightly" => match words.next() {
--            Some(hash) => {
--                if !hash.starts_with('(') {
--                    return None;
-+            Some(hash) if hash.starts_with('(') => match words.next() {
-+                None if hash.ends_with(')') => Dev,
-+                Some(date) if date.ends_with(')') => {
-+                    let mut date = date[..date.len() - 1].split('-');
-+                    let year = date.next()?.parse().ok()?;
-+                    let month = date.next()?.parse().ok()?;
-+                    let day = date.next()?.parse().ok()?;
-+                    match date.next() {
-+                        None => Nightly(Date { year, month, day }),
-+                        Some(_) => return None,
-+                    }
-                 }
--                let date = words.next()?;
--                if !date.ends_with(')') {
--                    return None;
--                }
--                let mut date = date[..date.len() - 1].split('-');
--                let year = date.next()?.parse().ok()?;
--                let month = date.next()?.parse().ok()?;
--                let day = date.next()?.parse().ok()?;
--                match date.next() {
--                    None => Nightly(Date { year, month, day }),
--                    Some(_) => return None,
--                }
--            }
-+                None | Some(_) => return None,
-+            },
-+            Some(_) => return None,
-             None => Dev,
-         },
-         Some(_) => return None,
-diff --git a/vendor/rustversion/src/lib.rs b/vendor/rustversion/src/lib.rs
-index 2614105dd1a..172eb89382f 100644
---- a/vendor/rustversion/src/lib.rs
-+++ b/vendor/rustversion/src/lib.rs
-@@ -145,6 +145,21 @@
- //!
- //! <br>
- 
-+#![allow(
-+    clippy::cast_lossless,
-+    clippy::cast_possible_truncation,
-+    clippy::doc_markdown,
-+    clippy::enum_glob_use,
-+    clippy::from_iter_instead_of_collect,
-+    clippy::module_name_repetitions,
-+    clippy::must_use_candidate,
-+    clippy::needless_doctest_main,
-+    clippy::needless_pass_by_value,
-+    clippy::redundant_else,
-+    clippy::toplevel_ref_arg,
-+    clippy::unreadable_literal
-+)]
-+
- extern crate proc_macro;
- 
- mod attr;
-diff --git a/vendor/rustversion/src/time.rs b/vendor/rustversion/src/time.rs
-index 1e6dd9066b4..3c21463dd80 100644
---- a/vendor/rustversion/src/time.rs
-+++ b/vendor/rustversion/src/time.rs
-@@ -1,4 +1,5 @@
- use crate::date::Date;
-+use std::env;
- use std::time::{SystemTime, UNIX_EPOCH};
- 
- // Timestamp of 2016-03-01 00:00:00 in UTC.
-@@ -13,14 +14,20 @@
- 
- pub fn today() -> Date {
-     let default = Date {
--        year: 2019,
--        month: 1,
--        day: 1,
-+        year: 2020,
-+        month: 2,
-+        day: 25,
-     };
-     try_today().unwrap_or(default)
- }
- 
- fn try_today() -> Option<Date> {
-+    if let Some(pkg_name) = env::var_os("CARGO_PKG_NAME") {
-+        if pkg_name.to_str() == Some("rustversion-tests") {
-+            return None; // Stable date for ui testing.
-+        }
-+    }
-+
-     let now = SystemTime::now();
-     let since_epoch = now.duration_since(UNIX_EPOCH).ok()?;
-     let secs = since_epoch.as_secs();
-diff --git a/vendor/rustversion/tests/test_parse.rs b/vendor/rustversion/tests/test_parse.rs
-index 843bd73d3e5..cb39b3179f5 100644
---- a/vendor/rustversion/tests/test_parse.rs
-+++ b/vendor/rustversion/tests/test_parse.rs
-@@ -1,3 +1,5 @@
-+#![allow(clippy::enum_glob_use, clippy::must_use_candidate)]
-+
- include!("../build/rustc.rs");
- 
- #[test]
-@@ -76,6 +78,14 @@ fn test_parse() {
-                 }),
-             },
-         ),
-+        (
-+            "rustc 1.52.1-nightly (gentoo)",
-+            Version {
-+                minor: 52,
-+                patch: 1,
-+                channel: Dev,
-+            },
-+        ),
-     ];
- 
-     for (string, expected) in cases {
-diff --git a/vendor/rustversion/tests/ui/bad-bound.stderr b/vendor/rustversion/tests/ui/bad-bound.stderr
-index f8c498c8577..2c56acbdb33 100644
---- a/vendor/rustversion/tests/ui/bad-bound.stderr
-+++ b/vendor/rustversion/tests/ui/bad-bound.stderr
-@@ -1,10 +1,10 @@
--error: expected rustc release number like 1.31, or nightly date like 2020-10-26
-+error: expected rustc release number like 1.31, or nightly date like 2020-02-25
-  --> $DIR/bad-bound.rs:1:22
-   |
- 1 | #[rustversion::since(stable)]
-   |                      ^^^^^^
- 
--error: expected rustc release number like 1.31, or nightly date like 2020-10-26
-+error: expected rustc release number like 1.31, or nightly date like 2020-02-25
-  --> $DIR/bad-bound.rs:4:26
-   |
- 4 | #[rustversion::any(since(stable))]
-diff --git a/vendor/rustversion/tests/ui/bad-date.stderr b/vendor/rustversion/tests/ui/bad-date.stderr
-index 734d7889075..c523ccc02bf 100644
---- a/vendor/rustversion/tests/ui/bad-date.stderr
-+++ b/vendor/rustversion/tests/ui/bad-date.stderr
-@@ -1,10 +1,10 @@
--error: expected nightly date, like 2020-10-26
-+error: expected nightly date, like 2020-02-25
-  --> $DIR/bad-date.rs:1:24
-   |
- 1 | #[rustversion::nightly(stable)]
-   |                        ^^^^^^
- 
--error: expected nightly date, like 2020-10-26
-+error: expected nightly date, like 2020-02-25
-  --> $DIR/bad-date.rs:4:28
-   |
- 4 | #[rustversion::any(nightly(stable))]
--- 
-2.32.0
-
diff --git a/dev-lang/rust/files/1.54.0-parallel-miri.patch b/dev-lang/rust/files/1.54.0-parallel-miri.patch
deleted file mode 100644
index 68239d98d374..000000000000
--- a/dev-lang/rust/files/1.54.0-parallel-miri.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a789b49e4c0e7d742cc39713484596293d844537 Mon Sep 17 00:00:00 2001
-From: hyd-dev <yd-huang@outlook.com>
-Date: Fri, 30 Jul 2021 21:28:34 +0800
-Subject: [PATCH] Use `Lrc` instead of `Rc` in `MiriCompilerCalls::config()`
-
----
- src/bin/miri.rs | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/tools/miri/src/bin/miri.rs b/src/tools/miri/src/bin/miri.rs
-index 5a8f07263..18c393815 100644
---- a/src/tools/miri/src/bin/miri.rs
-+++ b/src/tools/miri/src/bin/miri.rs
-@@ -1,5 +1,6 @@
- #![feature(rustc_private, bool_to_option, stmt_expr_attributes)]
- 
-+extern crate rustc_data_structures;
- extern crate rustc_driver;
- extern crate rustc_errors;
- extern crate rustc_hir;
-@@ -12,12 +13,12 @@ use std::convert::TryFrom;
- use std::env;
- use std::num::NonZeroU64;
- use std::path::PathBuf;
--use std::rc::Rc;
- use std::str::FromStr;
- 
- use hex::FromHexError;
- use log::debug;
- 
-+use rustc_data_structures::sync::Lrc;
- use rustc_driver::Compilation;
- use rustc_errors::emitter::{ColorConfig, HumanReadableErrorType};
- use rustc_hir::{self as hir, def_id::LOCAL_CRATE, Node};
-@@ -42,7 +43,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls {
-                 // HACK: rustc will emit "crate ... required to be available in rlib format, but
-                 // was not found in this form" errors once we use `tcx.dependency_formats()` if
-                 // there's no rlib provided, so setting a dummy path here to workaround those errors.
--                Rc::make_mut(&mut crate_source).rlib = Some((PathBuf::new(), PathKind::All));
-+                Lrc::make_mut(&mut crate_source).rlib = Some((PathBuf::new(), PathKind::All));
-                 crate_source
-             };
-         });
diff --git a/dev-lang/rust/files/llvm/12/cstdint-signals-h.patch b/dev-lang/rust/files/llvm/12/cstdint-signals-h.patch
deleted file mode 100644
index 1945372c4d0d..000000000000
--- a/dev-lang/rust/files/llvm/12/cstdint-signals-h.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://gitweb.gentoo.org/fork/llvm-project.git/commit/llvm/include/llvm/Support/Signals.h?h=gentoo-15.0.7-r7&id=ff1681ddb303223973653f7f5f3f3435b48a1983
-From: Sergei Trofimovich <slyich@gmail.com>
-Date: Mon, 23 May 2022 08:03:23 +0100
-Subject: [Support] Add missing <cstdint> header to Signals.h
-
-Without the change llvm build fails on this week's gcc-13 snapshot as:
-
-    [  0%] Building CXX object lib/Support/CMakeFiles/LLVMSupport.dir/Signals.cpp.o
-    In file included from llvm/lib/Support/Signals.cpp:14:
-    llvm/include/llvm/Support/Signals.h:119:8: error: variable or field 'CleanupOnSignal' declared void
-      119 |   void CleanupOnSignal(uintptr_t Context);
-          |        ^~~~~~~~~~~~~~~
---- a/src/llvm-project/llvm/include/llvm/Support/Signals.h
-+++ b/src/llvm-project/llvm/include/llvm/Support/Signals.h
-@@ -14,6 +14,7 @@
- #ifndef LLVM_SUPPORT_SIGNALS_H
- #define LLVM_SUPPORT_SIGNALS_H
- 
-+#include <cstdint>
- #include <string>
- 
- namespace llvm {
--- 
-cgit v1.2.3-65-gdbad
diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml
index c634998b3552..94b0499334fd 100644
--- a/dev-lang/rust/metadata.xml
+++ b/dev-lang/rust/metadata.xml
@@ -21,6 +21,7 @@
 		<flag name="clippy">Install clippy, Rust code linter</flag>
 		<flag name="dist">Install dist tarballs (used for bootstrapping)</flag>
 		<flag name="miri">Install miri, an interpreter for Rust's mid-level intermediate representation (requires USE=nightly, sometimes is broken)</flag>
+		<flag name="mrustc-bootstrap">Use <pkg>dev-lang/mrustc</pkg> to build the bootstrap Rust sysroot from this package's source</flag>
 		<flag name="nightly">Enable nightly (UNSTABLE) features (NOTE: it does not install nightly version, just enables features marked as nightly at time of release)</flag>
 		<flag name="parallel-compiler">Build a multi-threaded rustc (experimental, not tested by upstream)</flag>
 		<flag name="rustfmt">Install rustfmt, Rust code formatter</flag>
diff --git a/dev-lang/rust/rust-1.54.0.ebuild b/dev-lang/rust/rust-1.54.0.ebuild
deleted file mode 100644
index 360ae22cd5db..000000000000
--- a/dev-lang/rust/rust-1.54.0.ebuild
+++ /dev/null
@@ -1,559 +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} )
-
-CARGO_BOOTSTRAP="yes"
-RUST_MAX_VER=${PV}
-RUST_MIN_VER="$(ver_cut 1).$(($(ver_cut 2) - 1)).0"
-
-# Requried to build against openssl-3.*
-CRATE_PATHS_OVERRIDE="
-	openssl@0.10.35
-	openssl-sys@0.9.65
-"
-
-inherit cargo check-reqs estack flag-o-matic multiprocessing \
-	multilib multilib-build python-any-r1 rust-toolchain toolchain-funcs verify-sig
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-
-SRC_URI="
-	https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz
-	${CARGO_CRATE_URIS}
-	verify-sig? (
-		https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz.asc
-	)
-"
-
-S="${WORKDIR}/rustc-${PV}-src"
-
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-IUSE="clippy cpu_flags_x86_sse2 debug doc miri nightly parallel-compiler rustfmt test wasm ${ALL_LLVM_TARGETS[*]}"
-
-BDEPEND="${PYTHON_DEPS}
-	app-eselect/eselect-rust
-	|| (
-		>=sys-devel/gcc-4.7
-		>=llvm-core/clang-3.5
-	)
-	>=dev-build/cmake-3.13.4
-	dev-build/ninja
-	test? ( dev-debug/gdb )
-	verify-sig? ( sec-keys/openpgp-keys-rust )
-"
-
-DEPEND="
-	>=app-arch/xz-utils-5.2
-	net-misc/curl:=[http2,ssl]
-	sys-libs/zlib:=
-	dev-libs/openssl:0=
-	elibc_musl? ( sys-libs/libunwind:= )
-"
-
-RDEPEND="${DEPEND}
-	app-eselect/eselect-rust
-	!dev-lang/rust:stable
-	!dev-lang/rust-bin:stable
-"
-
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
-	miri? ( nightly )
-	parallel-compiler? ( nightly )
-	test? ( ${ALL_LLVM_TARGETS[*]} )
-	wasm? ( llvm_targets_WebAssembly )
-	x86? ( cpu_flags_x86_sse2 )
-"
-
-# we don't use cmake.eclass, but can get a warnings
-CMAKE_WARN_UNUSED_CLI=no
-
-QA_FLAGS_IGNORED="
-	usr/lib/${PN}/${PV}/bin/.*
-	usr/lib/${PN}/${PV}/libexec/.*
-	usr/lib/${PN}/${PV}/lib/lib.*.so
-	usr/lib/${PN}/${PV}/lib/rustlib/.*/bin/.*
-	usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/lib.*.so
-"
-
-QA_SONAME="
-	usr/lib/${PN}/${PV}/lib/lib.*.so.*
-	usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/lib.*.so
-"
-
-# An rmeta file is custom binary format that contains the metadata for the crate.
-# rmeta files do not support linking, since they do not contain compiled object files.
-# so we can safely silence the warning for this QA check.
-QA_EXECSTACK="usr/lib/${PN}/${PV}/lib/rustlib/*/lib*.rlib:lib.rmeta"
-
-# causes double bootstrap
-RESTRICT="test"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc
-
-PATCHES=(
-	"${FILESDIR}"/1.47.0-ignore-broken-and-non-applicable-tests.patch
-	"${FILESDIR}"/1.49.0-gentoo-musl-target-specs.patch
-	"${FILESDIR}"/1.53.0-rustversion-1.0.5.patch # https://github.com/rust-lang/rust/pull/86425
-	"${FILESDIR}"/1.54.0-parallel-miri.patch # https://github.com/rust-lang/miri/pull/1863
-	"${FILESDIR}/llvm/12/cstdint-signals-h.patch"
-)
-
-toml_usex() {
-	usex "${1}" true false
-}
-
-pre_build_checks() {
-	local M=7680
-	# multiply requirements by 1.5 if we are doing x86-multilib
-	if use amd64; then
-		M=$(( $(usex abi_x86_32 15 10) * ${M} / 10 ))
-	fi
-	M=$(( $(usex clippy 128 0) + ${M} ))
-	M=$(( $(usex miri 128 0) + ${M} ))
-	M=$(( $(usex rustfmt 256 0) + ${M} ))
-	local ltarget
-	for ltarget in ${ALL_LLVM_TARGETS[@]}; do
-		M=$(( $(usex ${ltarget} 256 0) + ${M} ))
-	done
-	M=$(( $(usex wasm 256 0) + ${M} ))
-	M=$(( $(usex debug 2 1) * ${M} ))
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		M=$(( 15 * ${M} / 10 ))
-	fi
-	eshopts_pop
-	M=$(( $(usex doc 256 0) + ${M} ))
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-	python-any-r1_pkg_setup
-
-	export LIBGIT2_NO_PKG_CONFIG=1 #749381
-	rust_pkg_setup
-}
-
-src_unpack() {
-	verify-sig_src_unpack
-	cargo_src_unpack
-	# Vendored sources here override crates-io sources (repo) from cargo eclass.
-	sed -i '/\[source.crates-io\]/,+2d' "${ECARGO_HOME}"/config.toml
-}
-
-src_configure() {
-
-	local rust_target="" rust_targets="" arch_cflags
-
-	# Collect rust target names to compile standard libs for all ABIs.
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\""
-	done
-	if use wasm; then
-		rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
-	fi
-	rust_targets="${rust_targets#,}"
-
-	local tools="\"cargo\",\"rls\",\"analysis\",\"src\","
-	if use clippy; then
-		tools="\"clippy\",$tools"
-	fi
-	if use miri; then
-		tools="\"miri\",$tools"
-	fi
-	if use rustfmt; then
-		tools="\"rustfmt\",$tools"
-	fi
-
-	local rust_stage0_root
-	rust_stage0_root="$(rustc --print sysroot || die "Can't determine rust's sysroot")"
-
-	# in case of prefix it will be already prefixed, as --print sysroot returns full path
-	[[ -d ${rust_stage0_root} ]] || die "${rust_stage0_root} is not a directory"
-
-	rust_target="$(rust_abi)"
-
-	cat <<- _EOF_ > "${S}"/config.toml
-		changelog-seen = 2
-		[llvm]
-		download-ci-llvm = false
-		optimize = $(toml_usex !debug)
-		release-debuginfo = $(toml_usex debug)
-		assertions = $(toml_usex debug)
-		ninja = true
-		targets = "${LLVM_TARGETS// /;}"
-		experimental-targets = ""
-		link-shared = false
-		[build]
-		build-stage = 2
-		test-stage = 2
-		doc-stage = 2
-		build = "${rust_target}"
-		host = ["${rust_target}"]
-		target = [${rust_targets}]
-		cargo = "${rust_stage0_root}/bin/cargo"
-		rustc = "${rust_stage0_root}/bin/rustc"
-		rustfmt = "${rust_stage0_root}/bin/rustfmt"
-		docs = $(toml_usex doc)
-		compiler-docs = false
-		submodules = false
-		python = "${EPYTHON}"
-		locked-deps = true
-		vendor = true
-		extended = true
-		tools = [${tools}]
-		verbose = 2
-		sanitizers = false
-		profiler = false
-		cargo-native-static = false
-		[install]
-		prefix = "${EPREFIX}/usr/lib/${PN}/${PV}"
-		sysconfdir = "etc"
-		docdir = "share/doc/rust"
-		bindir = "bin"
-		libdir = "lib"
-		mandir = "share/man"
-		[rust]
-		# https://github.com/rust-lang/rust/issues/54872
-		codegen-units-std = 1
-		optimize = true
-		debug = $(toml_usex debug)
-		debug-assertions = $(toml_usex debug)
-		debug-assertions-std = $(toml_usex debug)
-		debuginfo-level = $(usex debug 2 0)
-		debuginfo-level-rustc = $(usex debug 2 0)
-		debuginfo-level-std = $(usex debug 2 0)
-		debuginfo-level-tools = $(usex debug 2 0)
-		debuginfo-level-tests = 0
-		backtrace = true
-		incremental = false
-		default-linker = "$(tc-getCC)"
-		parallel-compiler = $(toml_usex parallel-compiler)
-		channel = "$(usex nightly nightly stable)"
-		description = "gentoo"
-		rpath = false
-		verbose-tests = true
-		optimize-tests = $(toml_usex !debug)
-		codegen-tests = true
-		dist-src = false
-		remap-debuginfo = true
-		lld = $(toml_usex wasm)
-		# only deny warnings if doc+wasm are NOT requested, documenting stage0 wasm std fails without it
-		# https://github.com/rust-lang/rust/issues/74976
-		# https://github.com/rust-lang/rust/issues/76526
-		deny-warnings = $(usex wasm $(usex doc false true) true)
-		backtrace-on-ice = true
-		jemalloc = false
-		[dist]
-		src-tarball = false
-		compression-formats = ["gz"]
-	_EOF_
-
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
-		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
-
-		cat <<- _EOF_ >> "${S}"/config.env
-			CFLAGS_${rust_target}=${arch_cflags}
-		_EOF_
-
-		cat <<- _EOF_ >> "${S}"/config.toml
-			[target.${rust_target}]
-			cc = "$(tc-getBUILD_CC)"
-			cxx = "$(tc-getBUILD_CXX)"
-			linker = "$(tc-getCC)"
-			ar = "$(tc-getAR)"
-		_EOF_
-		# librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true;
-		if use elibc_musl; then
-			cat <<- _EOF_ >> "${S}"/config.toml
-				crt-static = false
-			_EOF_
-		fi
-	done
-	if use wasm; then
-		cat <<- _EOF_ >> "${S}"/config.toml
-			[target.wasm32-unknown-unknown]
-			linker = "rust-lld"
-		_EOF_
-	fi
-
-	if [[ -n ${I_KNOW_WHAT_I_AM_DOING_CROSS} ]]; then # whitespace intentionally shifted below
-	# experimental cross support
-	# discussion: https://bugs.gentoo.org/679878
-	# TODO: c*flags, clang, cargo.eclass target support
-	# it would be much better if we could split out stdlib
-	# complilation to separate ebuild and abuse CATEGORY to
-	# just install to /usr/lib/rustlib/<target>
-
-	# extra targets defined as a bash array
-	# spec format:  <LLVM target>:<rust-target>:<CTARGET>
-	# best place would be /etc/portage/env/dev-lang/rust
-	# Example:
-	# RUST_CROSS_TARGETS=(
-	#	"AArch64:aarch64-unknown-linux-gnu:aarch64-unknown-linux-gnu"
-	# )
-	# no extra hand holding is done, no target transformations, all
-	# values are passed as-is with just basic checks, so it's up to user to supply correct values
-	# valid rust targets can be obtained with
-	# 	rustc --print target-list
-	# matching cross toolchain has to be installed
-	# matching LLVM_TARGET has to be enabled for both rust and llvm (if using system one)
-	# only gcc toolchains installed with crossdev are checked for now.
-
-	# BUG: we can't pass host flags to cross compiler, so just filter for now
-	# BUG: this should be more fine-grained.
-	filter-flags '-mcpu=*' '-march=*' '-mtune=*'
-
-	local cross_target_spec
-	for cross_target_spec in "${RUST_CROSS_TARGETS[@]}";do
-		# extracts first element form <LLVM target>:<rust-target>:<CTARGET>
-		local cross_llvm_target="${cross_target_spec%%:*}"
-		# extracts toolchain triples, <rust-target>:<CTARGET>
-		local cross_triples="${cross_target_spec#*:}"
-		# extracts first element after before : separator
-		local cross_rust_target="${cross_triples%%:*}"
-		# extracts last element after : separator
-		local cross_toolchain="${cross_triples##*:}"
-		use llvm_targets_${cross_llvm_target} || die "need llvm_targets_${cross_llvm_target} target enabled"
-		command -v ${cross_toolchain}-gcc > /dev/null 2>&1 || die "need ${cross_toolchain} cross toolchain"
-
-		cat <<- _EOF_ >> "${S}"/config.toml
-			[target.${cross_rust_target}]
-			cc = "${cross_toolchain}-gcc"
-			cxx = "${cross_toolchain}-g++"
-			linker = "${cross_toolchain}-gcc"
-			ar = "${cross_toolchain}-ar"
-		_EOF_
-		if [[ "${cross_toolchain}" == *-musl* ]]; then
-			cat <<- _EOF_ >> "${S}"/config.toml
-				musl-root = "$(${cross_toolchain}-gcc -print-sysroot)/usr"
-			_EOF_
-		fi
-
-		# append cross target to "normal" target list
-		# example 'target = ["powerpc64le-unknown-linux-gnu"]'
-		# becomes 'target = ["powerpc64le-unknown-linux-gnu","aarch64-unknown-linux-gnu"]'
-
-		rust_targets="${rust_targets},\"${cross_rust_target}\""
-		sed -i "/^target = \[/ s#\[.*\]#\[${rust_targets}\]#" config.toml || die
-
-		ewarn
-		ewarn "Enabled ${cross_rust_target} rust target"
-		ewarn "Using ${cross_toolchain} cross toolchain"
-		ewarn
-		if ! has_version -b 'sys-devel/binutils[multitarget]' ; then
-			ewarn "'sys-devel/binutils[multitarget]' is not installed"
-			ewarn "'strip' will be unable to strip cross libraries"
-			ewarn "cross targets will be installed with full debug information"
-			ewarn "enable 'multitarget' USE flag for binutils to be able to strip object files"
-			ewarn
-			ewarn "Alternatively llvm-strip can be used, it supports stripping any target"
-			ewarn "define STRIP=\"llvm-strip\" to use it (experimental)"
-			ewarn
-		fi
-	done
-	fi # I_KNOW_WHAT_I_AM_DOING_CROSS
-
-	einfo "Rust configured with the following flags:"
-	echo
-	echo RUSTFLAGS="${RUSTFLAGS:-}"
-	echo RUSTFLAGS_BOOTSTRAP="${RUSTFLAGS_BOOTSTRAP:-}"
-	echo RUSTFLAGS_NOT_BOOTSTRAP="${RUSTFLAGS_NOT_BOOTSTRAP:-}"
-	env | grep "CARGO_TARGET_.*_RUSTFLAGS="
-	cat "${S}"/config.env || die
-	echo
-	einfo "config.toml contents:"
-	cat "${S}"/config.toml || die
-	echo
-}
-
-src_compile() {
-	# we need \n IFS to have config.env with spaces loaded properly. #734018
-	(
-	IFS=$'\n'
-	env $(cat "${S}"/config.env) RUST_BACKTRACE=1\
-		"${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) || die
-	)
-}
-
-src_test() {
-	# https://rustc-dev-guide.rust-lang.org/tests/intro.html
-
-	# those are basic and codegen tests.
-	local tests=(
-		assembly
-		codegen
-		codegen-units
-		compile-fail
-		incremental
-		mir-opt
-		pretty
-		run-make
-	)
-
-	# fragile/expensive/less important tests
-	# or tests that require extra builds
-	# TODO: instead of skipping, just make some nonfatal.
-	if [[ ${ERUST_RUN_EXTRA_TESTS:-no} != no ]]; then
-		tests+=(
-			rustdoc
-			rustdoc-js
-			rustdoc-js-std
-			rustdoc-ui
-			run-make-fulldeps
-			ui
-			ui-fulldeps
-		)
-	fi
-
-	local i failed=()
-	einfo "rust_src_test: enabled tests ${tests[@]/#/src/test/}"
-	for i in "${tests[@]}"; do
-		local t="src/test/${i}"
-		einfo "rust_src_test: running ${t}"
-		if ! (
-				IFS=$'\n'
-				env $(cat "${S}"/config.env) RUST_BACKTRACE=1 \
-				"${EPYTHON}" ./x.py test -vv --config="${S}"/config.toml \
-				-j$(makeopts_jobs) --no-doc --no-fail-fast "${t}"
-			)
-		then
-				failed+=( "${t}" )
-				eerror "rust_src_test: ${t} failed"
-		fi
-	done
-
-	if [[ ${#failed[@]} -ne 0 ]]; then
-		eerror "rust_src_test: failure summary: ${failed[@]}"
-		die "aborting due to test failures"
-	fi
-}
-
-src_install() {
-	(
-	IFS=$'\n'
-	env $(cat "${S}"/config.env) DESTDIR="${D}" \
-		"${EPYTHON}" ./x.py install	-vv --config="${S}"/config.toml -j$(makeopts_jobs) || die
-	)
-
-	# bug #689562, #689160
-	rm -v "${ED}/usr/lib/${PN}/${PV}/etc/bash_completion.d/cargo" || die
-	rmdir -v "${ED}/usr/lib/${PN}/${PV}"/etc{/bash_completion.d,} || die
-
-	local symlinks=(
-		cargo
-		rls
-		rust-gdb
-		rust-gdbgui
-		rust-lldb
-		rustc
-		rustdoc
-	)
-
-	use clippy && symlinks+=( clippy-driver cargo-clippy )
-	use miri && symlinks+=( miri cargo-miri )
-	use rustfmt && symlinks+=( rustfmt cargo-fmt )
-
-	einfo "installing eselect-rust symlinks and paths: ${symlinks[@]}"
-	local i
-	for i in "${symlinks[@]}"; do
-		# we need realpath on /usr/bin/* symlink return version-appended binary path.
-		# so /usr/bin/rustc should point to /usr/lib/rust/<ver>/bin/rustc-<ver>
-		# need to fix eselect-rust to remove this hack.
-		local ver_i="${i}-${PV}"
-		if [[ -f "${ED}/usr/lib/${PN}/${PV}/bin/${i}" ]]; then
-			einfo "Installing ${i} symlink"
-			ln -v "${ED}/usr/lib/${PN}/${PV}/bin/${i}" "${ED}/usr/lib/${PN}/${PV}/bin/${ver_i}" || die
-		else
-			ewarn "${i} symlink requested, but source file not found"
-			ewarn "please report this"
-		fi
-		dosym "../lib/${PN}/${PV}/bin/${ver_i}" "/usr/bin/${ver_i}"
-	done
-
-	# symlinks to switch components to active rust in eselect
-	dosym "${PV}/lib" "/usr/lib/${PN}/lib-${PV}"
-	dosym "${PV}/libexec" "/usr/lib/${PN}/libexec-${PV}"
-	dosym "${PV}/share/man" "/usr/lib/${PN}/man-${PV}"
-	dosym "rust/${PV}/lib/rustlib" "/usr/lib/rustlib-${PV}"
-	dosym "../../lib/${PN}/${PV}/share/doc/rust" "/usr/share/doc/${P}"
-
-	newenvd - "50${P}" <<-_EOF_
-		LDPATH="${EPREFIX}/usr/lib/rust/lib-${PV}"
-		MANPATH="${EPREFIX}/usr/lib/rust/man-${PV}"
-		$(use amd64 && usex elibc_musl 'CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '')
-		$(use arm64 && usex elibc_musl 'CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '')
-	_EOF_
-
-	rm -rf "${ED}/usr/lib/${PN}/${PV}"/*.old || die
-	rm -rf "${ED}/usr/lib/${PN}/${PV}/doc"/*.old || die
-
-	# note: eselect-rust adds EROOT to all paths below
-	cat <<-_EOF_ > "${T}/provider-${P}"
-		/usr/bin/cargo
-		/usr/bin/rls
-		/usr/bin/rust-gdb
-		/usr/bin/rust-gdbgui
-		/usr/bin/rust-lldb
-		/usr/bin/rustdoc
-		/usr/lib/rust/lib
-		/usr/lib/rust/libexec
-		/usr/lib/rust/man
-		/usr/lib/rustlib
-		/usr/share/doc/rust
-	_EOF_
-
-	if use clippy; then
-		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
-	fi
-	if use miri; then
-		echo /usr/bin/miri >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-miri >> "${T}/provider-${P}"
-	fi
-	if use rustfmt; then
-		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
-	fi
-
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-	eselect rust update
-
-	if has_version dev-debug/gdb || has_version dev-util/lldb; then
-		elog "Rust installs a helper script for calling GDB and LLDB,"
-		elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
-	fi
-
-	if has_version app-editors/emacs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-vim to get vim support for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust cleanup
-}
diff --git a/dev-lang/rust/rust-1.74.1-r100.ebuild b/dev-lang/rust/rust-1.74.1-r100.ebuild
index 95bdb5effa4e..d131b800b874 100644
--- a/dev-lang/rust/rust-1.74.1-r100.ebuild
+++ b/dev-lang/rust/rust-1.74.1-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,8 +8,12 @@ PYTHON_COMPAT=( python3_{10..12} )
 
 RUST_MAX_VER=${PV}
 RUST_MIN_VER="$(ver_cut 1).$(($(ver_cut 2) - 1)).0"
+RUST_OPTIONAL=1
 
-inherit check-reqs estack flag-o-matic llvm-r1 multiprocessing multilib multilib-build \
+MRUSTC_VERSION="0.11.2"
+MRUSTC_RUST_VERSION="1.74.0"
+
+inherit check-reqs cmake edo estack flag-o-matic llvm-r1 multiprocessing multilib multilib-build \
 	optfeature python-any-r1 rust rust-toolchain toolchain-funcs verify-sig
 
 if [[ ${PV} = *beta* ]]; then
@@ -45,7 +49,7 @@ ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV}"
 
-IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind +lto miri nightly parallel-compiler rustfmt rust-analyzer rust-src system-llvm test wasm ${ALL_LLVM_TARGETS[*]}"
+IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind +lto miri mrustc-bootstrap nightly parallel-compiler rustfmt rust-analyzer rust-src system-llvm test wasm ${ALL_LLVM_TARGETS[*]}"
 
 LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
@@ -67,6 +71,12 @@ BDEPEND="${PYTHON_DEPS}
 	)
 	test? ( dev-debug/gdb )
 	verify-sig? ( sec-keys/openpgp-keys-rust )
+	mrustc-bootstrap? (
+		~dev-lang/mrustc-${MRUSTC_VERSION}
+		dev-build/cmake
+		sys-devel/gcc:*
+	)
+	!mrustc-bootstrap? ( ${RUST_DEPEND} )
 "
 
 DEPEND="
@@ -174,6 +184,9 @@ pre_build_checks() {
 	fi
 	eshopts_pop
 	M=$(( $(usex doc 256 0) + ${M} ))
+	if use mrustc-bootstrap; then
+		M=$(( 2 * ${M} ))
+	fi
 	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
 }
 
@@ -197,25 +210,44 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	pre_build_checks
-	python-any-r1_pkg_setup
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pre_build_checks
+		python-any-r1_pkg_setup
+
+		export LIBGIT2_NO_PKG_CONFIG=1 #749381
+		if tc-is-cross-compiler; then
+			use system-llvm && die "USE=system-llvm not allowed when cross-compiling"
+			local cross_llvm_target="$(llvm_tuple_to_target "${CBUILD}")"
+			use "llvm_targets_${cross_llvm_target}" || \
+				die "Must enable LLVM_TARGETS=${cross_llvm_target} matching CBUILD=${CBUILD} when cross-compiling"
+		fi
 
-	export LIBGIT2_NO_PKG_CONFIG=1 #749381
-	if tc-is-cross-compiler; then
-		use system-llvm && die "USE=system-llvm not allowed when cross-compiling"
-		local cross_llvm_target="$(llvm_tuple_to_target "${CBUILD}")"
-		use "llvm_targets_${cross_llvm_target}" || \
-			die "Must enable LLVM_TARGETS=${cross_llvm_target} matching CBUILD=${CBUILD} when cross-compiling"
-	fi
+		if use mrustc-bootstrap; then
+			if ! tc-is-gcc; then
+				die "USE=mrustc-bootstrap reqires that the build environment use GCC"
+			fi
+		else
+			rust_pkg_setup
+		fi
 
-	rust_pkg_setup
+		if use system-llvm; then
+			llvm-r1_pkg_setup
 
-	if use system-llvm; then
-		llvm-r1_pkg_setup
+			local llvm_config="$(get_llvm_prefix)/bin/llvm-config"
+			export LLVM_LINK_SHARED=1
+			export RUSTFLAGS="${RUSTFLAGS} -Lnative=$("${llvm_config}" --libdir)"
+		fi
+	fi
+}
 
-		local llvm_config="$(get_llvm_prefix)/bin/llvm-config"
-		export LLVM_LINK_SHARED=1
-		export RUSTFLAGS="${RUSTFLAGS} -Lnative=$("${llvm_config}" --libdir)"
+src_prepare() {
+	default
+	# We'll need to revert this after the bootstrap.
+	if use mrustc-bootstrap; then
+		pushd "${S}" 2>/dev/null || die
+		patch -p0 < "${BROOT}"/usr/share/mrustc-${MRUSTC_VERSION}/patches/rustc-${MRUSTC_RUST_VERSION}-src.patch ||
+			die "Failed to patch sources to enable bootstrap with mrustc"
+		popd 2>/dev/null || die
 	fi
 }
 
@@ -253,9 +285,13 @@ src_configure() {
 	use rust-analyzer && tools+=',"rust-analyzer"'
 	use rust-src && tools+=',"src"'
 
-	local rust_stage0_root="$(${RUSTC} --print sysroot || die "Can't determine rust's sysroot")"
-	# in case of prefix it will be already prefixed, as --print sysroot returns full path
-	[[ -d ${rust_stage0_root} ]] || die "${rust_stage0_root} is not a directory"
+	if use mrustc-bootstrap; then
+		local rust_stage0_root="${WORKDIR}/bootstrap/rust-${PV}"
+	else
+		local rust_stage0_root="$(${RUSTC} --print sysroot || die "Can't determine rust's sysroot")"
+		# in case of prefix it will be already prefixed, as --print sysroot returns full path
+		[[ -d ${rust_stage0_root} ]] || die "${rust_stage0_root} is not a directory"
+	fi
 
 	rust_target="$(rust_abi)"
 	rust_build="$(rust_abi "${CBUILD}")"
@@ -514,7 +550,253 @@ src_configure() {
 	echo
 }
 
+# Build a very minimal llvm that we can use for bootstrap rustc codegen
+llvm_bootstrap() {
+	# Reference ${P}/src/bootstrap/native.rs for these values
+	local llvm_cmake_opts=(
+		"-G Ninja"
+		"-DLLVM_TARGET_ARCH=${CFG_COMPILER_HOST_TRIPLE%%-*}"
+		"-DLLVM_DEFAULT_TARGET_TRIPLE=${CFG_COMPILER_HOST_TRIPLE}"
+		"-DLLVM_TARGETS_TO_BUILD=${BOOTSTRAP_LLVM_TARGETS:=X86;ARM;AArch64}" #;Mips;PowerPC;SystemZ;JSBackend;MSP430;Sparc;NVPTX
+		"-DLLVM_ENABLE_ASSERTIONS=OFF"
+		"-DLLVM_INCLUDE_EXAMPLES=OFF"
+		"-DLLVM_INCLUDE_TESTS=OFF"
+		"-DLLVM_INCLUDE_DOCS=OFF"
+		"-DLLVM_INCLUDE_BENCHMARKS=OFF"
+		"-DLLVM_ENABLE_ZLIB=OFF"
+		"-DLLVM_ENABLE_TERMINFO=OFF"
+		"-DLLVM_ENABLE_LIBEDIT=OFF"
+		"-DCMAKE_CXX_COMPILER=$(tc-getCXX)"
+		"-DCMAKE_C_COMPILER=$(tc-getCC)"
+		"-DCMAKE_BUILD_TYPE=Release"
+	)
+
+	if [[ -z "${LLVM_CMAKE_OPTS_EXTRA}" ]]; then
+		llvm_cmake_opts+=( "${LLVM_CMAKE_OPTS_EXTRA}")
+	fi
+
+	elog "Building bootstrap llvm ..."
+
+	mkdir -p "${WORKDIR}/bootstrap/llvm" || die
+	pushd "${WORKDIR}/bootstrap/llvm" 2>/dev/null || die
+		edo cmake ${llvm_cmake_opts[*]} "${S}/src/llvm-project/llvm"
+		eninja || die "Failed to build bootstrap llvm"
+	popd 2>/dev/null || die
+}
+
+# High level steps:
+# Our system mrustc package has built stdlib for our current platform.
+# - Step 1: Use system-installed mrustc, (m)rust(c) stdlib, and minicargo to
+#	bootstrap a `cargo` and `rustc` (mrustc-stage0)
+# - Step 2: Use minicargo and the built `rustc` to build a working `sysroot`
+#			(includes `std`, `panic_unwind``, `test`, etc.) (mrustc-stage0)
+# - Step 3: Build build libs again (this time using `cargo` and `rustc`) (mrustc-stage1)
+# - Step 4: Build a `rustc` using those libs (mrustc-stage1)
+#  - Done so there's an optimised rustc arollvm_cmake_optsund (mrustc is bad at codegen)
+# - Step 5: Build `libstd` with this `rustc` (mrustc-stage2)
+#  - Needed to match ABIs
+# Stages:
+# - mrustc-stage0: mrustc-built cargo and rustc
+# - mrustc-stage1: rustc and sysroot built with mrustc-stage0
+# - mrustc-stage2: rustc from stage1 with sysroot built with stage0
+# See:
+# - https://github.com/thepowersgang/mrustc/blob/master/run_rustc/Makefile
+# - https://github.com/thepowersgang/mrustc/blob/master/TestRustcBootstrap.sh
+# - Upstream Windows .cmd files are also a good reference for early bootstrap
+mrustc_bootstrap() {
+	export RUSTC_BOOTSTRAP=1 # Possibly the only intended use of this variable in ::gentoo
+	# export these variables now and unset them at the end of the function so they don't leak
+	# into the rest of the build.
+	export CFG_COMPILER_HOST_TRIPLE="$(rust_abi)"
+	export CFG_RELEASE="${MRUSTC_RUST_VERSION}"	# Let's pretend we're 1.74.0
+	export CFG_RELEASE_CHANNEL="stable"
+	export CFG_VERSION="${MRUSTC_RUST_VERSION}-stable-mrustc"
+	export CFG_PREFIX="mrustc"
+	export CFG_LIBDIR_RELATIVE="lib"
+	export RUSTC_INSTALL_BINDIR="bin"
+	export REAL_LIBRARY_PATH_VAR="LD_LIBRARY_PATH"
+
+	# These flags are used in every invocation of our bootstrap `cargo`.
+	local cargo_flags="--target ${CFG_COMPILER_HOST_TRIPLE} -j $(makeopts_jobs) --release --verbose"
+
+	if use system-llvm; then
+		export LLVM_CONFIG="$(get_llvm_prefix)/bin/llvm-config"
+	else
+		llvm_bootstrap
+		export LLVM_CONFIG="${WORKDIR}/bootstrap/llvm/bin/llvm-config"
+	fi
+
+	# define the mrustc sysroot and common minicargo arguments.
+	local mrustc_sysroot="${BROOT}/usr/lib/rust/mrustc-${MRUSTC_VERSION}/lib/rustlib/${CFG_COMPILER_HOST_TRIPLE}/lib"
+	local minicargo_common_args=(
+		"-L" "${mrustc_sysroot}"
+		"-j" "$(makeopts_jobs)"
+		"--vendor-dir" "${S}/vendor"
+		"--manifest-overrides"
+		"${BROOT}/usr/share/mrustc-${MRUSTC_VERSION}/patches/rustc-${MRUSTC_RUST_VERSION}-overrides.toml"
+	)
+	# There's a very good chance that minicargo and mrustc are not in the PATH.
+	if ! command -v minicargo &> /dev/null; then
+		export PATH="${BROOT}/usr/lib/rust/mrustc-${MRUSTC_VERSION}/bin:${PATH}"
+	fi
+	# Sanity check our bootstrap compiler & stdlib.
+	elog "Sanity checking mrustc and stdlib ..."
+	edo mrustc "${S}/tests/ui/hello_world/main.rs" -L "${mrustc_sysroot}" -o "${T}"/hello -g
+	"${T}"/hello || die "Failed to run hello_world"
+	# Seems fine, let's build some tools!
+
+	# Step 1: Build a `cargo` and `rustc` using system-installed mrustc
+	# Anything we produce is going to be terribly unoptimised; mrustc does not do fantastic codegen.
+	# It's good enough to bootstrap the "real" rustc though.
+	elog "Building bootstrap cargo and rustc using mrustc and minicargo (mrustc-stage0) ..."
+	local stage0="${WORKDIR}/bootstrap/mrustc-stage0"
+	mkdir -p "${stage0}" || die
+	edo minicargo "${S}"/src/tools/cargo --output-dir "${stage0}"/cargo-build ${minicargo_common_args[*]}
+	"${stage0}"/cargo-build/cargo --version || die "Bootstrap cargo failed basic sanity check"
+	edo minicargo "${S}"/compiler/rustc --output-dir "${stage0}"/rustc-build ${minicargo_common_args[*]} \
+		--features llvm
+	"${stage0}"/rustc-build/rustc_main --version || die "Bootstrap rustc failed basic sanity check"
+	# minicargo has special-casing for `rustc` so we need to rename it.
+	mv "${stage0}"/rustc-build/rustc_main "${stage0}"/rustc-build/rustc || die "Failed to rename rustc_main to rustc"
+	# rustc wants these here
+	mkdir -p "${stage0}"/codegen-backends || die
+	mv "${stage0}"/rustc-build/librustc_codegen_llvm.* "${stage0}"/codegen-backends || die
+
+	# Step 2: use the bootstrapped rustc to build sysroot; we need to use `minicargo` for this -
+	# mrustc does not accept all of the arguments that rustc does, even with the rustc_proxy wrapper.
+	# `--script-overrides`:  If the overrides are available, build scripts (and build-deps) are not built
+	# which is good since we don't have a working compiler yet, and can't build them.
+
+	local stage0_sysroot_lib="${stage0}/lib/rustlib/${CFG_COMPILER_HOST_TRIPLE}/lib"
+	# minicargo <= 0.11.2 doesn't create this directory and silently fails, besides it's better to be explicit, right?
+	mkdir -p "${stage0_sysroot_lib}" || die "Failed to create stage0 directory"
+
+	elog "Building 'sysroot' using bootstrap rustc (mrustc-stage0) ..."
+	edo env MRUSTC_PATH="${stage0}/rustc-build/rustc" minicargo -j $(makeopts_jobs) --vendor-dir "${S}"/vendor \
+		--script-overrides  "${BROOT}/usr/share/mrustc-0.11.2/script-overrides/stable-${MRUSTC_RUST_VERSION}-linux/" \
+		--output-dir "${stage0_sysroot_lib}" "${S}"/library/sysroot ||
+			die "Failed to build sysroot with bootstrap rust (mrustc-stage0)"
+
+	elog "Sanity checking sysroot and rustc ..."
+	mkdir -p "${T}"/stage0-hello || die
+	edo "${stage0}"/rustc-build/rustc -L "${stage0_sysroot_lib}" -g "${S}/tests/ui/hello_world/main.rs" \
+		-o "${T}"/stage0-hello/hello
+	"${T}"/stage0-hello/hello || die "Failed to run hello_world built with bootstrap rust stage0"
+
+	elog "mrustc bootstrap stage0 complete!"
+
+	# Step 3: Build a "proper" libstd, including dynamic libs using our bootstrap cargo and rustc.
+	elog "Building 'sysroot' with the stage0 rustc (mrustc-stage1) ..."
+	local stage1="${WORKDIR}/bootstrap/mrustc-stage1"
+	local stage1_sysroot_lib="${stage1}/lib/rustlib/${CFG_COMPILER_HOST_TRIPLE}/lib"
+	mkdir -p "${stage1_sysroot_lib}" || die "Failed to create stage1 directory"
+	mkdir -p "${stage1}/bin" || die
+
+	# Simplified to avoid calling rustc_proxy; We don't need stage1 rustc until after this is built...
+	edo env RUSTFLAGS="-Z force-unstable-if-unmarked" CARGO_TARGET_DIR="${stage1}/sysroot-build" \
+		RUSTC="${stage0}/rustc-build/rustc" "${stage0}"/cargo-build/cargo build ${cargo_flags} \
+		--manifest-path "${S}/library/sysroot/Cargo.toml" --features panic-unwind
+
+	# Move the built libs into the sysroot libdir.
+	mv "${stage1}/sysroot-build/${CFG_COMPILER_HOST_TRIPLE}/release/deps"/*.{rlib,rmeta,so} \
+		"${stage1_sysroot_lib}" || die "Failed to move stage1 libs to stage1 sysroot"
+
+	# We need to copy the stage0 rustc to the stage1 sysroot; this "updates" the sysroot location and enables
+	# resolution of stage1 libs. (run `rustc --print sysroot` on stage0 and stage1 rustc to verify)
+	cp "${stage0}/rustc-build/rustc" "${stage1}/bin/rustc" || die "Failed to copy rustc to stage1 sysroot"
+
+	# Step 4: Build `rustc` with itself, so we have a rustc with the right ABI.
+	# This will be our final `rustc` for the bootstrap process.
+	elog "Building rustc with stage1 libs (mrustc-stage1) ..."
+	mkdir -p "${stage1}/rustc-build" || die
+	edo env RUSTFLAGS="-Z force-unstable-if-unmarked -C link_args=-Wl,-rpath,\$ORIGIN/../lib" \
+		LD_LIBRARY_PATH="${stage2_sysroot_lib}" CARGO_TARGET_DIR="${stage1}/rustc-build" \
+		RUSTC="${stage1}/bin/rustc" TMPDIR="${T}" "${stage0}"/cargo-build/cargo build ${cargo_flags} \
+		--manifest-path "${S}/compiler/rustc/Cargo.toml"  --features llvm
+
+	# Step 5: Build `sysroot` with this `rustc` - Needed to match ABI
+	# We need to use the previous sysroot; we could reuse that dir but it's easier to just copy it.
+	elog "Building final 'sysroot' with the final rustc (mrustc-stage2) ..."
+	local stage2="${WORKDIR}/bootstrap/mrustc-stage2"
+	local stage2_sysroot_lib="${stage2}/lib/rustlib/${CFG_COMPILER_HOST_TRIPLE}/lib"
+	mkdir -p "${stage2_sysroot_lib}" || die "Failed to create stage2 directory"
+	mkdir -p "${stage2}/bin" || die
+
+	# Copy required files from stage1 to stage2 sysroot
+	cp "${stage1}/rustc-build/${CFG_COMPILER_HOST_TRIPLE}"/release/rustc-main "${stage2}/bin/rustc_binary" ||
+		die "Failed to copy final rustc to stage2 sysroot"
+	cp "${stage1}/rustc-build/${CFG_COMPILER_HOST_TRIPLE}"/release/librustc_driver.so "${stage2}/lib" ||
+		die "Failed to copy librustc_driver to sysroot"
+	cp "${stage1}/rustc-build/${CFG_COMPILER_HOST_TRIPLE}"/release/deps/*.{rlib,so} "${stage2_sysroot_lib}" ||
+		die "Failed to copy final rustc libs to stage2 sysroot"
+	cp "${stage1_sysroot_lib}"/* "${stage2_sysroot_lib}" || die "Failed to copy stage1 so files to stage2 sysroot"
+
+	# There's a magic script used in place of rustc so that libs can be found
+	cat <<- EOF > "${stage2}/bin/rustc" || die "Failed to create rustc wrapper"
+		#!/bin/sh
+		LD_LIBRARY_PATH="${stage2}/lib:${stage2_sysroot_lib}" ${stage2}/bin/rustc_binary "\$@"
+	EOF
+	chmod +x "${stage2}/bin/rustc" || die "Failed to make rustc wrapper executable"
+
+	# Use rustc to build 'sysroot'; this is the final step in the bootstrap process.
+	# rpath probably isn't needed here, but it doesn't hurt.
+	edo env RUSTFLAGS="-Z force-unstable-if-unmarked -C link_args=-Wl,-rpath,\$ORIGIN/../lib" \
+		CARGO_TARGET_DIR="${stage2}/stdlib-build" RUSTC="${stage2}/bin/rustc" \
+		"${stage0}"/cargo-build/cargo build ${cargo_flags} --manifest-path "${S}/library/sysroot/Cargo.toml" \
+		--features panic-unwind
+
+	# Build our final output sysroot
+	local output="${WORKDIR}/bootstrap/rust-${PV}"
+	local output_sysroot_lib="${output}/lib/rustlib/${CFG_COMPILER_HOST_TRIPLE}/lib"
+	mkdir -p "${output_sysroot_lib}" || die "Failed to create output directory"
+	mkdir -p "${output}/bin" || die "Failed to create output directory"
+
+	# Copy our various output files into the output sysroot
+	# rustc
+	cp "${stage1}/rustc-build/${CFG_COMPILER_HOST_TRIPLE}"/release/rustc-main "${output}/bin/rustc_binary" ||
+		die "Failed to copy final rustc to output"
+	cp "${stage1}/rustc-build/${CFG_COMPILER_HOST_TRIPLE}"/release/librustc_driver.so "${output}/lib" ||
+		die "Failed to copy librustc_driver to output"
+	cp "${stage1}/rustc-build/${CFG_COMPILER_HOST_TRIPLE}"/release/deps/*.{rlib,so} "${output_sysroot_lib}" ||
+		die "Failed to copy final rustc libs to output"
+	# cargo; no need to build an optimised cargo if we're using this to build a complelety new Rust.
+	cp "${stage0}/cargo-build/cargo" "${output}/bin/cargo" || die "Failed to copy cargo to output"
+	# libs
+	mv "${stage2}/stdlib-build/${CFG_COMPILER_HOST_TRIPLE}/release/deps"/*.{rlib,rmeta,so} "${output_sysroot_lib}" ||
+		die "Failed to copy stage2 libs to output"
+	# Our trusty rustc wrapper
+	cat <<- EOF > "${output}/bin/rustc" || die "Failed to create rustc wrapper"
+		#!/bin/sh
+		LD_LIBRARY_PATH="${output}/lib:${output_sysroot_lib}" ${output}/bin/rustc_binary "\$@"
+	EOF
+	chmod +x "${output}/bin/rustc" || die "Failed to make rustc wrapper executable"
+
+	# Perform a sanity check on the final Rust.
+	mkdir -p "${T}"/output-hello || die
+	edo "${output}/bin/rustc" -L "${output_sysroot_lib}" -g "${S}/tests/ui/hello_world/main.rs" \
+		-o "${T}"/output-hello/hello
+	"${T}"/output-hello/hello || die "Failed to run hello_world built with bootstrapped Rust"
+
+	elog "Successfully bootstrapped Rust using mrustc!"
+
+	# Note: The Rust sysroot that we've produced is pretty close to what we'd expect from a normal Rust build.
+	# If someone was so inclined they could build an optimised cargo using the stage2 rustc and sysroot,
+	# and install the output directly. This is untested, as I'm sure there's more to it than that.
+	# I'm satisfied with being able to build Rust normally at this point.
+
+	# Tidy up the Rust sources; revert mrustc changes so Rust can be built normally.
+	pushd "${S}" 2>/dev/null || die
+		patch -R -p0 < "${BROOT}"/usr/share/mrustc-${MRUSTC_VERSION}/patches/rustc-${MRUSTC_RUST_VERSION}-src.patch ||
+			die "Failed to revert mrustc patches"
+	popd 2>/dev/null || die
+
+	# Tidy up any environment variables we've set in the bootstrap process.
+	unset CFG_COMPILER_HOST_TRIPLE CFG_RELEASE CFG_RELEASE_CHANNEL CFG_PREFIX CFG_VERSION
+	unset CFG_LIBDIR_RELATIVE LLVM_CONFIG REAL_LIBRARY_PATH_VAR RUSTFLAGS RUSTC_BOOTSTRAP RUSTC_INSTALL_BINDIR
+}
+
 src_compile() {
+	use mrustc-bootstrap && mrustc_bootstrap
 	RUST_BACKTRACE=1 "${EPYTHON}" ./x.py build -vvv --config="${S}"/config.toml -j$(makeopts_jobs) || die
 }
 
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0dca9e60ebb3..d40f1f6c4b47 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index c95272e87e79..3e3d1bdcd2e2 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -2,5 +2,5 @@ AUX appstream-1.0.0-disable-Werror-flags.patch 1297 BLAKE2B e8b9bc262d39332f5390
 DIST AppStream-1.0.3.tar.xz 2644220 BLAKE2B cd7aa28b49c23229ee48b9a69e57a08244f81115e23525695e463930d2296daf80b5c7bb098c89726c220caec8c3e072fd85d77ac808e96c5cf2ff0488ba4ba1 SHA512 9b70d965966d55dbcc6a62d85525fdd5990a28abb1d94b2df91ab1549c24ce9c40d95e2d761c2f24e0c61fe5b74ab6a1f829dda387a8282aa9dff9198dc9610d
 DIST AppStream-1.0.4.tar.xz 2719900 BLAKE2B e8b3ca6092d4cddf73e5f902ac9d5e071d9eb31d8b206fd814e2078f5bcfcba1683e97beccaea9e7024da0285d77c63fb426e3b3d17f15c3add332e964e313d3 SHA512 ea0f9e226401b6c5a004676d14d01c195da295269169807bc956dbfd1d4f4b2b4ba61fe905fbefbe3c562a502c31fc869aba9e87c490dcac1d861f50038d14f1
 EBUILD appstream-1.0.3.ebuild 1924 BLAKE2B bee6229d4bb3d6e783b110e08b386d004ca92d5b8aa8f0b74e19735ca0202b705c90ef602937436e8d9447f9b6a715625a30d51bd2b4cdfb4f922c54d0449e11 SHA512 b1e5a10202f3680ab18d34f534c72a05147e4090f06c678fd9a32c88ccd366c4abe007e09d81df78a1a5c3aeceb52a4a54928fa60c04a71725d8007b281c77c7
-EBUILD appstream-1.0.4.ebuild 1929 BLAKE2B c4f83aa4f0bc4ed9e9ae2356ced546513d82baac6229cccbeaa10e3b917ef1842a22ff81365e87126ad7c3a8c67734010de4976db51e896c089d0705d685d135 SHA512 8023bf03d7c69fb157cc050350142e04285d5e4a7d617b1b053f9bb9d41efdfe00631b219889cc21dd393ab29e2b908354fd5a390e0b18d29e096a8c36517cb5
-MISC metadata.xml 400 BLAKE2B c9855a1e3650a66c8b42fb9055d6de0aa0575ed86bb1e8695d112f2e7cdfbd5f55d6805dfeb0ed19c3354ee3cda8208fd8a4adf4e8313e791493fa1730fb32d9 SHA512 9723ac7481f748429bddde7579b81c7db2dfad2ecd5150c1c4023843c5ef47e02ce41ff43508437ae60ba427a072d09e8d46a6e6b82fc946ea3af71dd71c52f2
+EBUILD appstream-1.0.4.ebuild 1976 BLAKE2B 610c4f9353f5cc992ce8bb1d771c9fe2aef7ae206be388f32ecc63c81f8be17a62a40210ff4c839b968f16357d5a095fa84d92363fd0ce76b9e0fdfaefb2c77e SHA512 875e865540792094f0c422b1c274ccb3220b1639ea0ba52f75bb398292201fb67898f2ed8333caa5ecc5af95e8fb2b527ef356b917386bdb7b7b4f07a48b3550
+MISC metadata.xml 455 BLAKE2B 8786bd83d39c561453a1c2c34638e0f430b2e29ee0fb06cfd88ae2c3003c49abfe4a70f2777f12b0432c33af4beeb4db441f58cc8d9739372c665d47e18ef1a6 SHA512 44d38cf7dfbc2a9969ff120a73aa08a296a72d669fd11593ec5486941548fdf1687f5aed844d27a82c6c30767db7e4ec14574f9c8959a8d4cd4c5cc89ce27ce8
diff --git a/dev-libs/appstream/appstream-1.0.4.ebuild b/dev-libs/appstream/appstream-1.0.4.ebuild
index f6363f0dc3b0..186071973821 100644
--- a/dev-libs/appstream/appstream-1.0.4.ebuild
+++ b/dev-libs/appstream/appstream-1.0.4.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
 LICENSE="LGPL-2.1+ GPL-2+"
 # check as_api_level
 SLOT="0/5"
-IUSE="apt doc +introspection qt6 systemd test"
+IUSE="apt compose doc +introspection qt6 systemd test"
 RESTRICT="test" # bug 691962
 
 RDEPEND="
@@ -68,6 +68,7 @@ src_configure() {
 		-Dstemming=true
 		-Dvapi=false
 		-Dapt-support=$(usex apt true false)
+		-Dcompose=$(usex compose true false)
 		-Dinstall-docs=$(usex doc true false)
 		-Dgir=$(usex introspection true false)
 		-Dqt=$(usex qt6 true false)
diff --git a/dev-libs/appstream/metadata.xml b/dev-libs/appstream/metadata.xml
index fc47b80bd700..c03626cd5701 100644
--- a/dev-libs/appstream/metadata.xml
+++ b/dev-libs/appstream/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="apt">Enables Debians APT support</flag>
+		<flag name="compose">Enable appstream compose</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">ximion/appstream</remote-id>
diff --git a/dev-libs/mimalloc/Manifest b/dev-libs/mimalloc/Manifest
index fd8e6828d40b..89125c9af20a 100644
--- a/dev-libs/mimalloc/Manifest
+++ b/dev-libs/mimalloc/Manifest
@@ -1,11 +1,7 @@
-DIST mimalloc-2.1.2.tar.gz 1163868 BLAKE2B bba29671fdca81b682edeefe16a1239640ea28fee4e44c97d0422ae81e0b3e7141c733459ccafc6672780157af67ff7d2a10cf4157180e003b458332a79d8481 SHA512 927b046e67783b325a6e41e3a9a6d3d78306fa1c82255defd1f3a7a60a27fd809a601f65b1b27fa38f2064e124f29856d7c0e5ccc33c54c2e4b6ebb9816d74b1
-DIST mimalloc-2.1.4.tar.gz 1133761 BLAKE2B 6271f54b8c0c0397bc0d7fb909009e05b9119c15ad3f926a82f078f3ffa7320503cc679487414d3b8e17bb41b17a43f71982727f80c7288b3b2d473992d706e5 SHA512 cdc43b212b9c67cd50b31bfae875387e3099165260fec995681a4079ca107c275452c2aadc5ee9a177391d1856750e0e2b104191bbb9829aeb5a42406267832e
-DIST mimalloc-2.1.6.tar.gz 1134456 BLAKE2B 1d4d0053e6c6b582d2c82f573b61dba7b3d1d6748999d313493d9db5bfb62e7379b48c72f88afab4e8b609971974488c9d42f96e2486d5905e2a9d78730d3231 SHA512 cbecca799be7a38b291c44ac765aa6ce36c6aeb0f064da942c568da38073350a122e7d1553e7929ee4f72f61ab3b767fa565f252cfd819463d2e1c73c25c5163
 DIST mimalloc-2.1.7.tar.gz 1181422 BLAKE2B 2c4c2d61837ab315e00a5c12d1c74c8f003aa3e9159403194ba61f5dfef2f4c2497b83487f07b20ba506ecde40a6754df6b7048a3818af58168ca90b8ed44470 SHA512 4e30976758015c76a146acc1bfc8501e2e5c61b81db77d253de0d58a8edef987669243f232210667b32ef8da3a33286642acb56ba526fd24c4ba925b44403730
 DIST mimalloc-2.1.8.tar.gz 1276091 BLAKE2B d592072d87a81fc49cac6bb874b707525d6d816539e02cd52e834648bb1052ddceabcb5b4b9f2606916e44db3ca05ca40af857eec258dd6bb11056721b064b3e SHA512 3b2044f9b58c83016a4dfb0c8ac9c5e26bfedff74c2948f19b369c89c72ee3ba6ce4ce25a020231e49685bb34340e8891d009d65e60af500e299f41f6932ab2d
-EBUILD mimalloc-2.1.2.ebuild 850 BLAKE2B df1b87e00239d319dd692395fe31c6376fb2e197208a002234cb6f62a2f43429fb0e7a90b0ba308a880e7dcfb343caa716d2bad7b2add0a9e7c9a49ff1741ae1 SHA512 847340d9b4a95d81fc7a5fe99b724cacd1eb96cd794f67ca934a7af32e1cfc11c3f8a58d0cd3403e9155b0d74150962d6971bcaa8f2c0dbaa998bf7a5fb02dbc
-EBUILD mimalloc-2.1.4.ebuild 994 BLAKE2B d04db9996415aede3568ddd1f40c1b14cceb5ad2ea53c4b90c23d4925a3a68572135db859c1f6ad81ceb5121c22effb32c3906639df8ae14fe2ab0fed9e5f31b SHA512 e1c2f5f9d19e794f3a23a63214b5fdf318d2e09b3bab0e5d2953202cfbb3acbe573b34786c1a1fa6c78a4c222cc1558708c90991014d53c4ebbeb1cc3dfbfe92
-EBUILD mimalloc-2.1.6.ebuild 1098 BLAKE2B 8a53d9e1714885ae2a51c484a49f15f9836a353843c76e7b6dc2f4bfc553f56d4c8c145e1ab4dbe9561085a84ffec9067a19ac679eaaebf40b699bee4eaa59eb SHA512 1748ef21e106f48b09b08294d74681e0e41cda0da3a515c3f4fa2f2a9cc2746bffed8b5ba304220f99e339f15f69e8afb53f6f598c34083ea0218ce0da1e344b
+DIST mimalloc-2.1.9.tar.gz 1276218 BLAKE2B 183749c1bb98c92986da9d3cb636d465927dd5b4186072edbe6e4fae88b59fdbfe4a0dd711c4705d64287c8085a0059d891c07f6aba50747eb67e56937d2e3ad SHA512 404a7827aea6f39bb4b9d43b5c93d5ca39e84e29bf362d597744703f7a6d0c091f55b45a070e6d61ad7f68bf7c28f541668c75db16bae1423bd318f47bf06974
 EBUILD mimalloc-2.1.7.ebuild 884 BLAKE2B 941e494359d742c255132a3093b3018b2955745ee41c6617ddbc0cca6f5765cf0062ab5b66d281aab4092f86c80cf3a91af0ce95d31f7e07e94759189f85823e SHA512 b8f35edfe1214232bee0d049296cea703dcaa68c22b27835cd58b9b73c7782c99287154875da7fc78e85557d855a534588381abc838c678369d9dd6472af8e01
 EBUILD mimalloc-2.1.8.ebuild 933 BLAKE2B 4825382654599e530fd7be30cf7f39b8a06bcfc8a735d0742d7f20ac2a18d990ebdeceb5fc8f719367e71b659bf25d13e5feb7ee52b90e2751f476e046422c9b SHA512 4c1769bc3469124cf9f7b8664ffd2242f92204884d88f757183a56962f8f3b89f9019a5b0f4c6f26b03cb2eca5c7d83566d0cab1631dad9b251f20f86d37bdd6
+EBUILD mimalloc-2.1.9.ebuild 933 BLAKE2B 4825382654599e530fd7be30cf7f39b8a06bcfc8a735d0742d7f20ac2a18d990ebdeceb5fc8f719367e71b659bf25d13e5feb7ee52b90e2751f476e046422c9b SHA512 4c1769bc3469124cf9f7b8664ffd2242f92204884d88f757183a56962f8f3b89f9019a5b0f4c6f26b03cb2eca5c7d83566d0cab1631dad9b251f20f86d37bdd6
 MISC metadata.xml 504 BLAKE2B cf6477282968a5469d072cfd81ce800e3ef0a48deb5353c85a1cabc837560cafdb9f9739cb4e98784238d2cc512a29cae5efee401f92a19bf75fb5d810154f76 SHA512 4e8fcc49881f3c479424cf363665d9b12c58eb52f7d962b98b81f5b3e186ba3bd14c2b5dac488d819147121a16c2d9613e75cb77f71fa04e820ca2c1e538baa6
diff --git a/dev-libs/mimalloc/mimalloc-2.1.4.ebuild b/dev-libs/mimalloc/mimalloc-2.1.4.ebuild
deleted file mode 100644
index a09a864cbf24..000000000000
--- a/dev-libs/mimalloc/mimalloc-2.1.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="A compact general purpose allocator with excellent performance"
-HOMEPAGE="https://github.com/microsoft/mimalloc"
-SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
-IUSE="hardened test valgrind"
-RESTRICT="!test? ( test )"
-
-DEPEND="valgrind? ( dev-debug/valgrind )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMI_SECURE=$(usex hardened)
-		-DMI_INSTALL_TOPLEVEL=ON
-		-DMI_BUILD_TESTS=$(usex test)
-		-DMI_BUILD_OBJECT=OFF
-		-DMI_BUILD_STATIC=OFF
-		-DMI_TRACK_VALGRIND=$(usex valgrind)
-		-DMI_LIBC_MUSL=$(usex elibc_musl)
-	)
-
-	# Bug #923177, #931778: append -latomic if it is available
-	test-flags-CCLD "-latomic" &>/dev/null &&
-		mycmakeargs+=( -DMI_USE_LIBATOMIC=ON )
-
-	cmake-multilib_src_configure
-}
diff --git a/dev-libs/mimalloc/mimalloc-2.1.6.ebuild b/dev-libs/mimalloc/mimalloc-2.1.6.ebuild
deleted file mode 100644
index 41d87f29aa29..000000000000
--- a/dev-libs/mimalloc/mimalloc-2.1.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="A compact general purpose allocator with excellent performance"
-HOMEPAGE="https://github.com/microsoft/mimalloc"
-SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/2"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
-IUSE="hardened test valgrind"
-RESTRICT="!test? ( test )"
-
-DEPEND="valgrind? ( dev-debug/valgrind )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMI_SECURE=$(usex hardened)
-		-DMI_INSTALL_TOPLEVEL=ON
-		-DMI_BUILD_TESTS=$(usex test)
-		-DMI_BUILD_OBJECT=OFF
-		-DMI_BUILD_STATIC=OFF
-		-DMI_TRACK_VALGRIND=$(usex valgrind)
-		-DMI_LIBC_MUSL=$(usex elibc_musl)
-	)
-
-	# XXX: Should be able to clean this up after 2.1.6
-	# https://github.com/microsoft/mimalloc/pull/898
-	#
-	# Bug #923177, #931778: append -latomic if it is available
-	test-flags-CCLD "-latomic" &>/dev/null &&
-		mycmakeargs+=( -DMI_USE_LIBATOMIC=ON )
-
-	cmake-multilib_src_configure
-}
diff --git a/dev-libs/mimalloc/mimalloc-2.1.2.ebuild b/dev-libs/mimalloc/mimalloc-2.1.9.ebuild
index 82790836bf71..49b88d5cd215 100644
--- a/dev-libs/mimalloc/mimalloc-2.1.2.ebuild
+++ b/dev-libs/mimalloc/mimalloc-2.1.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake-multilib flag-o-matic
+inherit cmake-multilib
 
 DESCRIPTION="A compact general purpose allocator with excellent performance"
 HOMEPAGE="https://github.com/microsoft/mimalloc"
@@ -11,24 +11,24 @@ SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -
 
 LICENSE="MIT"
 SLOT="0/2"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
-IUSE="hardened test valgrind"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug hardened test valgrind"
 RESTRICT="!test? ( test )"
 
 DEPEND="valgrind? ( dev-debug/valgrind )"
 
 src_configure() {
-	# Bug #923177
-	append-atomic-flags
-
 	local mycmakeargs=(
+		-DMI_DEBUG_FULL=$(usex debug)
 		-DMI_SECURE=$(usex hardened)
 		-DMI_INSTALL_TOPLEVEL=ON
 		-DMI_BUILD_TESTS=$(usex test)
-
 		-DMI_BUILD_OBJECT=OFF
 		-DMI_BUILD_STATIC=OFF
 		-DMI_TRACK_VALGRIND=$(usex valgrind)
+		-DMI_LIBC_MUSL=$(usex elibc_musl)
+		# Don't inject -march=XXX
+		-DMI_OPT_ARCH=OFF
 	)
 
 	cmake-multilib_src_configure
diff --git a/dev-libs/mxml/Manifest b/dev-libs/mxml/Manifest
index f9eb7a78a6f5..78719d0b3eca 100644
--- a/dev-libs/mxml/Manifest
+++ b/dev-libs/mxml/Manifest
@@ -1,5 +1,7 @@
 DIST mxml-3.3.1.tar.gz 1554784 BLAKE2B e0d599fd947dfef72edae40c1e70ea76c92105128dd46e772a7c71f9293cab3339c980396dffe105246cad64d0474935cc1939005ad9a2bffc8e8107f025a466 SHA512 43e6a92806d9c3f5db39fbf960c15ebfa6d92ef98274b7ce39b57724d6c26ad4362d6d8f3c1023efda92e6a815df068e5038a0cd479562b6be9dbdda8e827a41
 DIST mxml-4.0.3.tar.gz 1576958 BLAKE2B fe65513190bc8c03b8a66fb6711f9dcc846c19cdf67c17908fd5795408fead3e6ae2c11c8d4ca1c10be7b68d54ab87c602ab6ca3e5386d26ff75753d4dbe6476 SHA512 5855ea90c32a250ca0943389c768f1b9d9a231762d9b678d56bcb55c12d90a51b28c66940355e945b3d315bd764001e05ede576de976132768eb1eecb2667bba
+DIST mxml-4.0.4.tar.gz 1576163 BLAKE2B dd7cbaf3c918589afd6c452cf8c279f6efa563a32214478f5bf0896cbe3b11a5b626e7670d17cd7e83f4c20487c40d5717fbfdd62b1ce6ef120780f28903bfb8 SHA512 11ef51b7e8abe8f5b1728ee072217605456e11e56bd0abc5375820c1a0e30ea1a6f0a306e65a40c1cdda3394486b51e2d67cc9081113dbc570b6d9d835f5890f
 EBUILD mxml-3.3.1-r1.ebuild 1488 BLAKE2B 36889cb8ff7478da95e276525bc00ac04028bd64ca18ac9dadefd5e79aaf57fc6b08c5cae243913ad0a64937a99e9b949d57d40c37d0a4ae9c3999a418f7bdc2 SHA512 c6e0a5c91e49c9ba420e5bef902c4db0b9d162ff720f0e4b5010cab94e735f9498fbe257172b7ce957583440d30d8e9dc8a0b0d19c142a775acfca276a5b3cb2
 EBUILD mxml-4.0.3.ebuild 1298 BLAKE2B 5ee7e7e5338331dfa8ce8032c720fc67ca77c66d416198c00f7c63cebc21bfe0c3dea75c28852b01413e87a14facbfac0a48a010457980dde4e1ae9b8ad80a3d SHA512 21680962b4b6ab36a8f0d9b1e5bc76851cb69c8c71618506345ecf4675bbfad2fd781d4496f603f1333ee0256c174e81da36a5a54381667a422ad650a0e67f08
+EBUILD mxml-4.0.4.ebuild 1302 BLAKE2B e704ce0e9abe25b2d5f9a5d73552facabef142233169314b22f184f365efcb67d22b9ebafa9d32482bbc6d2cdc82c728f8737d70952fddd2c9e98fc0e1b22b5b SHA512 e8bc173b41b4d9920f973c08bb72a281f046cf9dcd8fd660bbc78662313c01d502c09ee4bd34c959068313a62b5f8219935fbb767cdd63ba1e7f802ea179df76
 MISC metadata.xml 1380 BLAKE2B ba169e7d7bf4572b56e2cc8923a48fce4b31af61107bd908d77f4a211aa096b4f0adfed9ae1d52cbad6b4309793f545cbd562a553e0c5aa1d0786b088f472cd7 SHA512 2895d86c62cb799302ba1515a3b638d52ca253f78e07bcc542bbb99338b84bc2079d48f42fb85a627e9252a545a853629943f9a904ead600aff161a24e1f1658
diff --git a/dev-libs/mxml/mxml-4.0.4.ebuild b/dev-libs/mxml/mxml-4.0.4.ebuild
new file mode 100644
index 000000000000..437234e08b84
--- /dev/null
+++ b/dev-libs/mxml/mxml-4.0.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A small XML parsing library that you can use to read XML data files or strings"
+HOMEPAGE="
+	https://github.com/michaelrsweet/mxml
+	https://www.msweet.org/mxml/
+"
+SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Mini-XML"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="static-libs test threads"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Don't hardcode FORTIFY_SOURCE
+	sed -e 's/-D_FORTIFY_SOURCE=3//g' -i configure || die
+	sed -e 's/-D_FORTIFY_SOURCE=3//g' -i configure.ac || die
+
+	# Don't run always tests
+	# Enable verbose compiling
+	sed -e '/ALLTARGETS/s/testmxml//g' -e '/.SILENT:/d' -i Makefile.in || die
+	eautoconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		AR="$(tc-getAR)"
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		--with-docdir=/usr/share/doc/"${PF}"
+		--with-dsoflags="${LDFLAGS}"
+		--with-ldflags="${LDFLAGS}"
+
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+	use test && emake testmxml
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	emake DSTROOT="${ED}" install
+}
diff --git a/dev-libs/zix/Manifest b/dev-libs/zix/Manifest
index 43cb977d0ba9..48f58b3f504c 100644
--- a/dev-libs/zix/Manifest
+++ b/dev-libs/zix/Manifest
@@ -1,3 +1,5 @@
 DIST zix-0.4.2.tar.xz 76492 BLAKE2B 46d9e3049632abe8fe60928fa4d27ab5a94e86549dbde999c8215f951fe6f70f29124c89de9639c07a3bfb06da6ce902ea2a59f431ea6015d2c7a38df2f6eff6 SHA512 b8fb931a3e9ab5a67f6da57a07bf10b91e7f861c8cf39db14c49c083a9983a0971cc6bc6abcb54a83c00471b386e377cb9bb51e2edd945ba07b9ae43a35964cc
+DIST zix-0.6.2.tar.xz 81316 BLAKE2B 230d9f6717f10ac6f7608593fa94331a4aebd8c4c1c59f1db5a7d1881d674d687d67c353c3944bf4649ea5cbb49a8c4afe8abc82bad9eaf84bff79777a0a91e1 SHA512 3b072f00481a34e8b900311c2dc77fd73a63a34f69ea953be6b714f5bcbdebcc3cdd81feae73b5ad2bdc09a4bac122e12d9035cfc417ca41dfe5230d1fe13d9c
 EBUILD zix-0.4.2.ebuild 1018 BLAKE2B 1c155e1ef4f8f16e0aa8b5f36129a3ae815e3efd2196dcbe0259ffd1fc0f007823d59a6cccebd5049b461ce4da32b707098f28c6be7bf0849598cd6f464ab3fc SHA512 340f5558c6012bfe024b3f286a0cf08d8f8a1adbf3be4f3710145e7e1864da5f5cd9ac562a1b66dbbb16a069d16246793b085f55ae7293025ea134e62883edfb
+EBUILD zix-0.6.2.ebuild 1024 BLAKE2B dd4ae90fb9bbf875e165833701abc1b53bf97093612673410841d26a14518115c0541097b9977f038a19532e474fddc642a3896aa408dfc2a6ddafe8076b8cf5 SHA512 08b4da68f521f50a699ce2759c59e445785b8bc40f919608ccc0744eb7fb96b1abbbfc0a0993a07fbd686d6bf147fa26f2229f53cccc07750372b57c66998ac8
 MISC metadata.xml 389 BLAKE2B c95e820b65fd6172f710a0f52e4480f653b7f536af3bc68a7fb04c660d62c22f71809a64e3c744b6ccb3159e4e33746b88f12f4cd0783f6c9ad8dfab1022e9fb SHA512 1053e837fd2181ddbb08c56a71d31b93a59668434f59d415e25a81c1211ff97845724501563d290c64ede01cdae20b54c8931eb7e390c7d9abfbd40d63f6a097
diff --git a/dev-libs/zix/zix-0.6.2.ebuild b/dev-libs/zix/zix-0.6.2.ebuild
new file mode 100644
index 000000000000..fdf378946bdb
--- /dev/null
+++ b/dev-libs/zix/zix-0.6.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+DESCRIPTION="Lightweight C library of portability wrappers and data structures"
+#HOMEPAGE="https://drobilla.net/software/zix.html"
+HOMEPAGE="https://gitlab.com/drobilla/zix"
+SRC_URI="https://download.drobilla.net/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen
+		dev-python/sphinx
+		dev-python/sphinx-lv2-theme
+		dev-python/sphinxygen
+	)
+"
+
+src_prepare() {
+	default
+
+	# fix doc installation path
+	sed -i "s/versioned_name/'${PF}'/g" doc/html/meson.build doc/singlehtml/meson.build || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_use_feature doc docs)
+		$(meson_feature test tests)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	local DOCS=( NEWS README.md )
+	einstalldocs
+}
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 1e4846ad3ba5..13b911f7f679 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
index b0fdf13c2b05..4b96efc40173 100644
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@@ -1,6 +1,6 @@
 DIST ssh2-1.3.1.tgz 33838 BLAKE2B 05976ad143563fd9d51be3f8e23b5b22099e351d6f252b612aa1dcb56648dc337b623d2cddf7b9079f3e07c879ca69215a1987cd6f4326f97ba134e13c6d28e7 SHA512 c74d4f699853148b53cdca0eaf8837bfdbdd21d185761606acadf2442e84dbefdb00cde207e0ce4794ae1e4f8692a38ed903b6d11fdc57bca7b54a4250da9a76
 DIST ssh2-1.4.1.tgz 34265 BLAKE2B 5cd257de7f3b2408f696d4acc463b981ca691f1a10a175e028beb77bf044640e1bfa2c85b1731096af398ae9920bf05f73e383db6c3f9e0c30e38a008ce70278 SHA512 9ff90b95b8fabfa2a75cf8a62a55e93df19d3e952f79234fc1d7ef3a030089f8b3703412bf6e22d85c7bf5825cf8493a4d97ad51a1600185d3d16f81c72e155c
 EBUILD pecl-ssh2-1.3.1-r1.ebuild 413 BLAKE2B c7329b86cd468a24274d5847aad083fc67341969ba9aea962a3085489cb70a63e041079617a041328de3e74f383d64b6ee3a0f716c7ffccc98dea2ff69b625f7 SHA512 2b9a74d51691f44ea990f910f3187fff8d7c0a36be6c83e63f52af329b33f6a95afd2f1b45e80da5472a72d4dd974101dc98d03801e46d20c945aaca2a11246a
-EBUILD pecl-ssh2-1.4.1.ebuild 452 BLAKE2B 2bb2d296da021a95821d1bb484d73efc02bc933eb7db4ebb75876b3f6e0534b53a9e729bf5fee42121f2c93b77a8e5f30592ee540b0f6a37dc842da6e34ddb32 SHA512 93b3d869109304a13ba68d2893a9b246aa6f6bde77cb5e10cc4cdbaf12498050c63b5f0df9d1bc6c81f08e7942b2d4799283a892fe3c7c7b87a644739fb8a896
+EBUILD pecl-ssh2-1.4.1.ebuild 450 BLAKE2B 165902b98c251a9b1ea2d419c76c82514ab1d1a601bf6b54b46b4c2ec1d7bf211167c41f130b979bcc6123fbb178d36077e2bfc151e6e2b5a84ff039f4b71d6e SHA512 f7bec4fc14259b4d7eb3342a655c523e627a8fb68d08765811b35b70d205edc28063252c0ec3b7ea4a8d823f928793bc2151db3b0f20e122c0cb0bc93e38e073
 EBUILD pecl-ssh2-9999.ebuild 514 BLAKE2B 69eea3c88f8198b9c81fcccb819b48712236fef041a83cdca4a8e7ad2768f02a0d281ac376315308c08957e802ceb2fbc92843c74c88e682e838041f3bdb8fe6 SHA512 b89c085a688755e162db6d4a8a324e64b66d5c585f3e1d08b75c70205bb61205d15b1f7344ba787b58e8243ea96e5f62f4c2964c71b09d02f40aa0b1ab971a04
 MISC metadata.xml 322 BLAKE2B 0576bb512c57e5e2809e3ec24de126d1f42823c1780fedae5cf2998a8074f60a6ee0aae29d8086c01c490623065d0adfd0a18568637875ff46408127a38aec60 SHA512 26fea3796f479e95df152a2d305b5ee50c0e3c44d3d0923dd0451e643ba93788f7d0e31f1d576f3d3fd90880550be4bde81b17ccc13268afa41ba566e7dbf43d
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.4.1.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-1.4.1.ebuild
index f5d84cb102d4..af6d86acf72a 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.4.1.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -13,7 +13,7 @@ DESCRIPTION="PHP bindings for the libssh2 library"
 HOMEPAGE="https://pecl.php.net/package/ssh2"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 # Upstream notes say there are errors with gcrypt backend
 DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
 RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-yaz/Manifest b/dev-php/pecl-yaz/Manifest
index c82c82b01d03..cec4af541e71 100644
--- a/dev-php/pecl-yaz/Manifest
+++ b/dev-php/pecl-yaz/Manifest
@@ -1,4 +1,4 @@
 DIST yaz-1.2.4.tgz 20204 BLAKE2B f36a0db6b8c49a8a4235f49ef07e28196954e9e25bcbe1a2fe94d69d14224b777f692bdc135b17b4d12d1684bb2abd52fd7966a3d78460e563d8475e31cb0ce6 SHA512 c7e17681ec82805ba74d643b427d6fdb4c4542a7efcf690cf9e4ac8adf61b9a9bfe3268ed317dc5220a85f9962f86387c3054f50e98cd986b29f8fb3f5be6b1e
-EBUILD pecl-yaz-1.2.4-r1.ebuild 609 BLAKE2B 1257a1369ba93e611ec97879f6691efe1d9e2f607bdf15e9683de8178264963acdb611988739f2da82a193c554b810f6b2a655638b2808cdabe2be61f12a737e SHA512 01938977acf517d656abfee5cf47a987d24108623ae79811461d547c722d132874d0044df2f94af9d8f31950f91f5b8080b71541ff7a9d46e7ff5d239da4c6b8
+EBUILD pecl-yaz-1.2.4-r1.ebuild 607 BLAKE2B 659c837671dc63402e93b15b22ebde021792b06e869584f88fc9a2ff89d92745bbeeed0d52802e2a31feec7ede26019238f33a03e9637604e36ad34e6f8cba34 SHA512 b6be8297d7e1a164ec9849fc57a8337b17d8dae661a138a272193c674e4bb7845ea3fd170dd2ab89ed1602bd1367621619c1e6effeb1b694f56f0e9e780e5074
 EBUILD pecl-yaz-1.2.4.ebuild 616 BLAKE2B 4dc1216f952c0e7b7d3e5b35ce31f0b18de9237e03a0331935b765bd919df742efb45599c93bb08645117a2743b18d39922dd4524fc0f0d6905a962ad8d07691 SHA512 34dd29dae6f8a3da6e5e8ea6c0f2c3da18ecc005738b5366a33897b5e5b8c8d0e33a1b5704cc60af2a5f796aafbda4c7ee7640896100da15b0cd435b1c0a659e
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.4-r1.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.4-r1.ebuild
index 24038a8a5309..9a050a4d4890 100644
--- a/dev-php/pecl-yaz/pecl-yaz-1.2.4-r1.ebuild
+++ b/dev-php/pecl-yaz/pecl-yaz-1.2.4-r1.ebuild
@@ -15,7 +15,7 @@ inherit php-ext-pecl-r3
 DESCRIPTION="This extension implements a Z39.50 client for PHP using the YAZ toolkit"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm ~hppa ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~hppa ~ppc64 ~s390 ~sparc x86"
 RESTRICT="test"
 
 DEPEND=">=dev-libs/yaz-3.0.2:0="
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index cd0c20a4f747..80593f6fdc15 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiopylgtv/Manifest b/dev-python/aiopylgtv/Manifest
index 1e46058d0eb4..e42031920c83 100644
--- a/dev-python/aiopylgtv/Manifest
+++ b/dev-python/aiopylgtv/Manifest
@@ -1,4 +1,4 @@
 AUX aiopylgtv-0.4.1-ssl.patch 5166 BLAKE2B 0a30dbc89a94afbb217fbe29f7928e00db78a3b0679a7085222c03d65d09bd22405c892c5ab436dd915fb772799fcf7a2c3f7b85260648bfa4e63f2999f66fb9 SHA512 8fa01bdb068795868a5ce04d07529cb45a162651c864c8d1179c46849cd6f9f6bcd61b3a7c75e6d83d9e7125df7614c0c4f17f790d88ac7da7b8481822868d8a
 DIST aiopylgtv-0.4.1.tar.gz 23165 BLAKE2B a41406ae0456f44cfd0e233e2ccd86b2815646fd9677cebcaa5427f5c4aa9e1a5221e69b98d25f52ef38acc16c5a3c8f051ef70d8e1c508d555da90e8e05899a SHA512 86182ab5936714cfbbea05eeb1369321b12b687a562350e5f77617c55e613855457a9ca67dc84fd20db50d42b66a4f69bd495676813b45107fbe20ccd63210ae
-EBUILD aiopylgtv-0.4.1-r1.ebuild 616 BLAKE2B 7a374ab9b0f52d857092fab683b7d969ece3d306445734c15469d2f2c20e106b6e8c98279ebdef0aa981a034bb7df83026e266d9668119cbd70198aacd02eb72 SHA512 d75c68a616990734e3fc0ce62698710ff5dff5549693349c2d547cd8330bccc24cc46d5b5e5126cee81a3b355331bc440843cad209429a4da201b64a28fcaf4e
+EBUILD aiopylgtv-0.4.1-r1.ebuild 616 BLAKE2B aeed76e62564abbd9ce3573ea890d6ccd5f497ad5863a5c309a069026b53d18acbb5ba4929c384c5458227fc8d74d8498a64530b955163df1d8b4498eb1b300e SHA512 d5701e726697fa0f64705f867b5cfe38b7efd45dbe0ddb63726a99a6fce6d8b5b922986a843a18a4c87b96f10f26471de79c8c89f72b48d938ec23848c1c7e58
 MISC metadata.xml 378 BLAKE2B 80d6571d9eac865ed96ca389cc2435dfed5c2afc113de9953a6aa9069785479e0ca3d092b36c5c9e3ac9a5eef6e3a11302927976162bb2599be2559afdba478a SHA512 36f1b5ab8d7e3fdd165ce4ddabee3cef7539911f134a65728badbba1986cc5e83fa40275798943dae713dae9cdbcb683dd563afd98b52f0e85bf46ef6d1bc813
diff --git a/dev-python/aiopylgtv/aiopylgtv-0.4.1-r1.ebuild b/dev-python/aiopylgtv/aiopylgtv-0.4.1-r1.ebuild
index 941faa54bb8b..eb85fb27686a 100644
--- a/dev-python/aiopylgtv/aiopylgtv-0.4.1-r1.ebuild
+++ b/dev-python/aiopylgtv/aiopylgtv-0.4.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{9..13} )
 PYTHON_REQ_USE="ssl"
 DISTUTILS_USE_PEP517="setuptools"
 
diff --git a/dev-python/aioresponses/Manifest b/dev-python/aioresponses/Manifest
index d91ae73edc04..53cb007098cc 100644
--- a/dev-python/aioresponses/Manifest
+++ b/dev-python/aioresponses/Manifest
@@ -1,3 +1,5 @@
 DIST aioresponses-0.7.7.tar.gz 39087 BLAKE2B 4692e088ec1c0a0f5e4f65a1269eb845ea6892ce41cc772cab9d0bb3795767b9ef776045d699e05f0816acdc795521318ce2ddd17ea8d436e89e9aae5e29436c SHA512 36fc45bc33d011d24fdbc437ea2adbba63eadec67d7198fe1e645d1dc0e7596104d5bf61ac1fe40b1d64f21cbe707e80775d26aa3762f87ad0a440ebabaa3a47
+DIST aioresponses-0.7.8.tar.gz 40253 BLAKE2B 470a71e1b9e315cdce32bb35daf3c111f439dc7096a5d991b7da479c4514331debe903b8d0cd1a9503b2c264ed7bf2901399139719e631adcf2f8aa359b9d4e2 SHA512 a7368e9f344d2790df9c10c9a5e2b9124f56b12413a0b52b91dced9513338b22f75887f94fc9c0b4e2709d7ed37f2c0978ba2652745546387b5317d188190390
 EBUILD aioresponses-0.7.7.ebuild 1006 BLAKE2B 5ffcad7361f28e11c8700c88e33db2e68605f2fc2516d80c8c66c657934d91443248b51be05479de7f03a900354e4704275306d39956be7f7446db7cc796c106 SHA512 be3bf7c2c7448d8a01651d125a638c12a72b645034d5fdbb3861ddb1df5540398d0c02f649f3f18959c394115ccd8def2f72b86604de430f75e9ebd38daa2c63
+EBUILD aioresponses-0.7.8.ebuild 1009 BLAKE2B fa0632fbbf4d03504f86316aec8f2ea95803fbb88981dfa5781cf6b1216e20d6131267b9b1f5d577dba5b3bec9604f528932fb863f1b7ca61b053fd73bdcde30 SHA512 84d1c24f3a55d092846ae7e049eef7eff50c7cdadcc73a7f0b4d9de427d4180d9e13b3bbc189f1a79c17aad6c87042b80474484cea068433e13b20aaff64cab1
 MISC metadata.xml 474 BLAKE2B 1768a360fe74d971bd194fdccc0b562c416b70f9992b513167cc6a0944c0d9e7b806029ac55f70998f6bdeffbe0113d1901664c4ded69d23b8664da5b1deda8e SHA512 b133e74d89b308b68387e069544fb24ac2b2f0aa2287c38c48e05c07fa7ec04639b5339930562078b17febd9895b1af46df59c9be323a2de8d7597f35eb24d7d
diff --git a/dev-python/aioresponses/aioresponses-0.7.8.ebuild b/dev-python/aioresponses/aioresponses-0.7.8.ebuild
new file mode 100644
index 000000000000..625145e6c611
--- /dev/null
+++ b/dev-python/aioresponses/aioresponses-0.7.8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 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="Helper to mock/fake web requests in Python's aiohttp package"
+HOMEPAGE="
+	https://github.com/pnuckowski/aioresponses/
+	https://pypi.org/project/aioresponses/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aiohttp-3.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ddt[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# These tests require Internet access
+	tests/test_aioresponses.py::AIOResponsesTestCase::test_address_as_instance_of_url_combined_with_pass_through
+	tests/test_aioresponses.py::AIOResponsesTestCase::test_pass_through_with_origin_params
+	tests/test_aioresponses.py::AIOResponseRedirectTest::test_pass_through_unmatched_requests
+)
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 80d23f9eb8ad..2e0eeda07a63 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,3 +1,5 @@
 DIST alembic-1.14.0.tar.gz 1916172 BLAKE2B 22c9373df866857328dbcd10e87ded6d7768bff0f5955a2ca607d9a31e722f69b3adb0560150483f59122bc676ba7d9bd4245e29f5f1a35c8f96b4741422b77a SHA512 efc6eb3527672a136a6acef8bcc1d484c4a331fbb1b825085ac337133facddd11c4cfe4f473175a748bbbec8f7d58c45cb341902cdedbbb7b00a0403e2ba53d5
+DIST alembic-1.14.1.tar.gz 1918219 BLAKE2B ba86062e0662b75fdd616d27f235ff836622deceb412f760af2f75313b6b81d8b42e0fc1d49d0bb5e164cbd54d8fed5faa2f402dd51393aa9f57899a9a1e541f SHA512 ae3f31f102ff6e2903d0719051e58fb7b30c251a9ce20c22e658bb343ba252cb0d66adc429ec83fc65ce73d6a6f6ae1673c878de81f433baa16663393a14d3dd
 EBUILD alembic-1.14.0.ebuild 1059 BLAKE2B bbcc91dd352f0a453892f7f19160469701918718113912522eb99781d2cb31001c896afd8c32665c0042dda7cfcecfca1832cf25f8deac2269c3e440369bc7d7 SHA512 3016dbf33d7b6b8dbedc780627e24b46385e1b6b428924375359a27912849d4834f916464c8e7ed795b65bdbc941e2cbf0f1e46f13a9316dc9d66f8949018a69
+EBUILD alembic-1.14.1.ebuild 1062 BLAKE2B 0b08f5bd8d4a5da464ccdb70e1bd927f4456aefb2572c2afbbfe8b093651f855e64c1f8a9571530b497c472f76d4ecfb747f7a52f184f03a547c12435315bb03 SHA512 a8d238b2a6f288359894f0135a1e82a9b22d212f415726b13ffbd04abd5a3832967f5d24aae0e342c8142c894732e9d9943346ca706b80395a0088b87341970a
 MISC metadata.xml 516 BLAKE2B 08b11ebed2913b00e0a8c0044a50e3ca7bc0e51fcad180725c90445227fed1aed58ed89b4bed58ef5c050c3eee3c19da33aabce5cd1f7835f4b560e67ccc7744 SHA512 b4afb6af57562e6065f03db71da0dbdfc9c4337e54cbaddfa257ee7bad48dbeecfaccd765901bf65279e34cf96be3975f983017858904716a36bf8c18f33db79
diff --git a/dev-python/alembic/alembic-1.14.1.ebuild b/dev-python/alembic/alembic-1.14.1.ebuild
new file mode 100644
index 000000000000..cc345d807b6e
--- /dev/null
+++ b/dev-python/alembic/alembic-1.14.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="
+	https://github.com/sqlalchemy/alembic/
+	https://pypi.org/project/alembic/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		sys-libs/timezone-data
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# setup.cfg contains -p no:warnings in addopts which triggers
+	# datetime.utcfromtimestamp() deprecation warning as an error in py3.12
+	epytest -o addopts=
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/asteval/Manifest b/dev-python/asteval/Manifest
index 15195d2a4a29..5c4c98e1f18c 100644
--- a/dev-python/asteval/Manifest
+++ b/dev-python/asteval/Manifest
@@ -1,5 +1,7 @@
 DIST asteval-1.0.4.gh.tar.gz 46374 BLAKE2B 4a3133457a752bc99a68fc4bffeb8aab8b4340ef21f8bae75d9131a5bcaa7eb4d081cacdfa7d9396565cc744a4d997e33516ba9cb0ae290392b06bfbcc608f27 SHA512 cf29562a2792013ed8fc7c14aaa261650b05037ee92ab75f8c79a1a235c59e8ee4768955c03ed615798666bfb62bf2ca37105dc93c1a4f56bcf446a0e4ba01f6
 DIST asteval-1.0.5.gh.tar.gz 46599 BLAKE2B 159076d1cdcac9ee6d9bf319ccb6ffcdb775fea7a930dce85d1171ede4f3e2b6acf1e9293cfe9d44e8da2762f20507c0781492fa5e6054a4f28fe836581af958 SHA512 a85cfde94e9f8d224d83b434d028bb91f2eec415090a14c2e8ceeecaba76c8e29c795bd54d9cfabc070dc9ee27cc492cfd533f35c272bf0649e284375b84ba7e
+DIST asteval-1.0.6.gh.tar.gz 47840 BLAKE2B ebc1e8e9df45f4a41ac8c2ea3b6419a65be45217c1943cc2af9964db1f3e030b6dbbd29bcf81113aa1132e952405b27a3dda7b7a0fa5796281100f2a8d5f49f3 SHA512 9ca8234b66945f2bb14e27b136dca2c4d1b8675a9087e584e87162192a94dd88e8f1dc5994089f2f5586733b997a4ee3ec416b83a949051a635ef4a4187fb0c5
 EBUILD asteval-1.0.4.ebuild 685 BLAKE2B ba482d23d1399de20354f3306e126dc3c2f378e426fb40b45920bb43b9217b2bb5cbb278124d6b19987c2876202d3141bf1245372dd0c159e662cbb716342e3c SHA512 bd7859bbe4b4d6aff03e0d0107bcb4a0fcfd36242c840f08c8b363d2e2d57850ef5a5064c430dfa900cc09ef464198f9401852358df73ff485a197397886135f
 EBUILD asteval-1.0.5.ebuild 685 BLAKE2B ba482d23d1399de20354f3306e126dc3c2f378e426fb40b45920bb43b9217b2bb5cbb278124d6b19987c2876202d3141bf1245372dd0c159e662cbb716342e3c SHA512 bd7859bbe4b4d6aff03e0d0107bcb4a0fcfd36242c840f08c8b363d2e2d57850ef5a5064c430dfa900cc09ef464198f9401852358df73ff485a197397886135f
+EBUILD asteval-1.0.6.ebuild 685 BLAKE2B 108e7ce73857a2aca6aa73f1f261a08fca7a968126cd1f2c64386fe701f2fd548bc1e793e3062ece380a4ccdbd292aac4298a02bbb35d4cbdcbbcded9ef35479 SHA512 c5d44697801f1970646e792f624b2ed42414e0241e24f71f944666b8a40a1ed084556f5fff26f84d6703a5393e9ea99adf961ed6442090ea0c6fee24d33fda5d
 MISC metadata.xml 364 BLAKE2B 80f2b5eb32f8318ba159dad79e648fbb4b48b0047bd6e325206d1c33aa139861adb41c524cf6ec4105cf43406b007ffed278270b59501ee7d3c8b53677c450da SHA512 9a85a30211972755b060243b5f244a992431cde577fde0548518d2c0172be504787077acc2709e7f72d5c2918d8045496b67bd83121d297504a10e9a5a5edf5e
diff --git a/dev-python/asteval/asteval-1.0.6.ebuild b/dev-python/asteval/asteval-1.0.6.ebuild
new file mode 100644
index 000000000000..e757c23d57da
--- /dev/null
+++ b/dev-python/asteval/asteval-1.0.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 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="Evaluator of Python expression using ast module"
+HOMEPAGE="
+	https://lmfit.github.io/asteval/
+	https://github.com/lmfit/asteval/
+	https://pypi.org/project/asteval/
+"
+SRC_URI="
+	https://github.com/lmfit/asteval/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	epytest -o addopts=
+}
diff --git a/dev-python/fpylll/Manifest b/dev-python/fpylll/Manifest
index dfb378520145..95e2d4029d85 100644
--- a/dev-python/fpylll/Manifest
+++ b/dev-python/fpylll/Manifest
@@ -1,3 +1,5 @@
 DIST fpylll-0.6.2.tar.gz 123743 BLAKE2B 755e322c1e88f0257531b356363447f05bb5c90bed1318796be5558ec96349b31e2a57420a502646f84e3d3eef2dd10ff648acbc140a0cc51cc9eb789660d499 SHA512 b5cff20f5bfb7398a76f772f72130b6c84af6a4cca10790a0b4e3df0bb6fdf3eaa6ceb351cd87422ad710081290c5a45dd0c3ccf71ad56cfc38dc16714a25242
+DIST fpylll-0.6.3.tar.gz 123868 BLAKE2B aa9e0ed169a39e1b17fb559c8d840fb6132b8d54b139ecfe1a154e5b2a6265d9e7ebfaa97b9a84278952a4c1629ad37ec9a12e3c0a3ff77f7be14c78e071f819 SHA512 c5a857e81347c53ad9b4ee93078dc384274737c72049ee7745245a7c0861ec7670ec338e4e7dc7d2fc72a9d7e59e6d918715224b2d0286a7b3f53993bdb47409
 EBUILD fpylll-0.6.2.ebuild 727 BLAKE2B ec0cb22cddcd2d677ad0852b18ca89e45ff73192f3116caea97d887d2c57654ea84761e9c913b2d340deabedcb8d49fae2beee6f9b692cd0772c8b7068d6b8f1 SHA512 302e51951159a163efb67f49239431551b468725d5d43b71dc8be1d3cb5fdd8a8f378a8405a82a1d581251c6044cc6bc252ba18453c6e2f60bd657b6fdc97f0e
+EBUILD fpylll-0.6.3.ebuild 728 BLAKE2B da081484c4bd1c1e731fd1ed90147e3f47e7bf091330647f0a1dbe3c4e1c6927a057c403c8c1558f3028054a81874412231b868569b2551305e9ec066145c660 SHA512 e92cfb7d58efd487bf4d88104530aecfa5c93f1b3df9b9cf43eea21ffd750650f9e00044a338049907ed4e8a4adaf9df91f0b704e590ff640e253f5210955ebe
 MISC metadata.xml 758 BLAKE2B a283c782701551a3b5de845a4707090b14a1671d311cef927cc50b89dee4e3428b02332e487232073034c821f6ea2e5cfdcbd86a827654746f060b0cfeb36d80 SHA512 89cfd778ab84ec1217e36e15e7fe1508b8c5344b2a94e8d99aa884115948e64ff88cd029060f0a64568587ce21ca328799514210c39b3b3650647e5f6f1353b8
diff --git a/dev-python/fpylll/fpylll-0.6.3.ebuild b/dev-python/fpylll/fpylll-0.6.3.ebuild
new file mode 100644
index 000000000000..367951ad2a48
--- /dev/null
+++ b/dev-python/fpylll/fpylll-0.6.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_EXT=1
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python bindings for sci-libs/fplll"
+HOMEPAGE="
+	https://github.com/fplll/fpylll/
+	https://pypi.org/project/fpylll/
+"
+
+# setup.py says "or later"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE="test"
+
+DEPEND="
+	dev-python/cysignals[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=sci-libs/fplll-5.5.0
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-python/cython-3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test(){
+	local -x PY_IGNORE_IMPORTMISMATCH=1
+	epytest
+}
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index fddc1b347a58..542173ccd21b 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,7 +1,7 @@
 AUX imageio-2.22.0-block-download.patch 1211 BLAKE2B c01e3fd7db7463bc11bf331384a21becfc3160d4880a2fd09e47bf0927d97e46787097f50a489b83c2626078b60a0cf8a0d896040981e78c107f1783c8e84c26 SHA512 170261b9fb07ccb7f7a7e058335326df1f72c8d098076bf6ca048a7ca6bac95ddb512b9e41740c385430bc25613249455203addd59931af4e70298e772303964
-DIST imageio-2.36.0.gh.tar.gz 415793 BLAKE2B 2b382290ab41a8b265629695c484eac887f33900d2b1a2a1e35f5db9ebc776242f7325e4c50055ab500f98067f1a27d083cd6aee9c0cf65dfe3e18c1d62336c2 SHA512 8d59633d31211e0510e8790e0d052b0c0d8912cc49a187c7d846ab62c2210b8f1851b63c83a0daf6123fc905b351ea0b51883746f6dcb83939975f51b913f63c
 DIST imageio-2.36.1.gh.tar.gz 415873 BLAKE2B d60fda8a0cdf6f677c9395ccd2abfa9a08cca73cedfc376335f12deee7206694d905079307546f716007d138f3b7da1e390b50715aede83e1ac94b300e80a439 SHA512 05695cb1530612ecbc002de3560fe6bafd11c6ad3fcff570b0309a4a9793820109163819fce4763052b8e442daec13ae09e0e2666b2deaea6c52ca76a9ae5386
+DIST imageio-2.37.0.gh.tar.gz 416361 BLAKE2B 6d66b9896cceca2279cec10968f1f71e0a9b387f0a3c43dcdf69a02cb037e3df2ea4e07c13d4f89dc5e61177d7a57fbed30c1cc8423977a1518c8b056ed8e87c SHA512 24d57913e6f070d85591a7ed13362d17ff6011385bece7ad715a5b1d775202832028223eae1b6817bf30fc189eb136a88a969e882310742aa7cb2a1cd59ba310
 DIST imageio-test_images-1121036015c70cdbb3015e5c5ba0aaaf7d3d6021.gh.tar.gz 195497374 BLAKE2B 0083212fd63c196dc2e721bff8f89c177b6741317b6b1c6ae9d00a8dd5fb6366efa3f01b9bffafafac7177cfdaa4d700077a2bad42ada735f5553e97f651c4ad SHA512 1bb1f36a069bfaa0d0ffe5258534e02e49237fc6ce85fe3d3648650130165abc9b3d5ff0e7e5861ee1d94add00d4258575f9c2f8556debecf597bdaa5499efe0
-EBUILD imageio-2.36.0.ebuild 2859 BLAKE2B ba8460b4bd7a3e14157adb4bd63d9e27a2fade32e8010690bdc9e39381934dfdda7ced169142bfb31833a1b097b160ff2a86ba0f78c6d4f69dfa7d43cacc144a SHA512 76f6cc81d0aeb69b7ea6db5e52781673e5cf41b74e28c42f412567f128c9663c84da2afadac1618fba1b976e6c799c85018bc7f0564c341dedcf69b1a12aad27
 EBUILD imageio-2.36.1.ebuild 2859 BLAKE2B ba8460b4bd7a3e14157adb4bd63d9e27a2fade32e8010690bdc9e39381934dfdda7ced169142bfb31833a1b097b160ff2a86ba0f78c6d4f69dfa7d43cacc144a SHA512 76f6cc81d0aeb69b7ea6db5e52781673e5cf41b74e28c42f412567f128c9663c84da2afadac1618fba1b976e6c799c85018bc7f0564c341dedcf69b1a12aad27
+EBUILD imageio-2.37.0.ebuild 2859 BLAKE2B 8568f0f43055418c223a0b30dd6141110fa17f052743634a4705ef9d444e78ff1dadc26ab57cc5935af71d5bcef68c791a12db0df0d227ce59ce9ece354c15ea SHA512 eaf5979050d19701d902d50b902983a229bd63d897e52b52d878ebfb10aafcc0a9af1623446d1499c50f6637de66a66b042243acb2ad2d95c2453edfa4df635d
 MISC metadata.xml 702 BLAKE2B 646c6a83e6d8e345fddb9cbc42a83c1193b9590937cd652e293d03e6e9d4b240a69e6e86399f5edc9ef05f96d1d4c3713dfa65f8b13984f4483b2ce76a239429 SHA512 5e1e4db52fed55ab837c70ddb9ec81a7ce0b062064e2d33cb5771cd81d50a1a2164e446531c32a405bb9319acd736141765dcd00e36d6db770434a656ad925e1
diff --git a/dev-python/imageio/imageio-2.36.0.ebuild b/dev-python/imageio/imageio-2.37.0.ebuild
index b87adefff348..882eec18d4dd 100644
--- a/dev-python/imageio/imageio-2.36.0.ebuild
+++ b/dev-python/imageio/imageio-2.37.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 620e8eec905d..c061f40e0a7c 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,7 +1,9 @@
 DIST moto-4.2.14.tar.gz 4933741 BLAKE2B 4c50a808dc8f27cfbcd0ba234d268084ee9a32f36cb5d6af61aacc4ee79f7bf5cf1045147c4642472129eee37bef8bc2c1953d140260d39d7f333ae0f5e5cf95 SHA512 d4079118ed1d2eef9134575e33dc0ed749bff0293d753baa63a630dbb987914b9933445027abdc344bb93fa1d6e483baf8a337a444c9dd055dda50b095ff9937
 DIST moto-5.0.25.tar.gz 6404745 BLAKE2B 322f6b1cd2e8a61931a45d4863d96eaf52b014061239be18a36b037fe75d14a1af3feb9dcf62885d486ffe4294f51745f1c38f8ca060eb3031a5d6796b2141b3 SHA512 dbf7280e3e994f1b86232f49d90e39809c0bfcffea9a016d671a262e6aa181538b4cea13a6011b2a51801b205a3e769014e25e51be496774e68c67abec4e1ecd
 DIST moto-5.0.26.tar.gz 6442983 BLAKE2B 90fd0db1c2a5824d9aa65ff383812d98eb36452883472dafd679755cb506f1267f8f702222a6eb50e6ab02ee8bfe5e7b9439636c8da8943579ceb4c980b2c6f6 SHA512 04372b8bc958be915231906dadd891758ea7aca80246bd7724f2163e7f8bab406933d639f7d5819a2002e138d1b107add3b2fd8fc0d1dcf74c18ac76cd8b3600
+DIST moto-5.0.27.tar.gz 6461751 BLAKE2B 92d0f884527c3ccee044120c4e4ec7b9d927b86a41bef505290d21c858b7be1f25ce0daea54fb4a5bc16e0c39a22c8c21372cc3280ca94e65402715df310226e SHA512 e8b45c2b0a02e381a45184fdead89086961c7fb029d71b828340aad5b1713f66d8421b836b6bf943833a331d13f81b976444e2875ae781951f6295aa4544e440
 EBUILD moto-4.2.14.ebuild 6507 BLAKE2B 4b1e22f10011ddf1b62996ad7d2efb5181843f958705ce1816f223bc3892f8515429f37c24403b03774c72f7d334a544e5688818e0e31f527b39c12979628ecc SHA512 ad9705a1f4c495c7fc9cec848d97a8f0f4d39d81848cb9c6d56788c083aabf120d4c89e8d59518fac93bcdee8561ce1fe8eff89eb277cb29921285899dd2ed97
 EBUILD moto-5.0.25.ebuild 5237 BLAKE2B 8034705470843495c69e555a444615514c00248e29ed8c884889a83038ed6508f9d3d7fe9cb6a09849b5396304268dec24bf588871dfdaea3a6dda160412b0c8 SHA512 dcc68487edbe45460786f44f3e2fe5ff3856a4c487e94d47842ac1562a9a0c62518c904f757aa6fcd0e98b32f449ad11ef35a87c151c336819a0a7105192f441
 EBUILD moto-5.0.26.ebuild 5240 BLAKE2B 8f46233b5ba6a99fcfd0aa029322a1cea096b96e0c3a102c7fd82d062385adc1bd46c96195a9dfc693411005fad51fc8be5e82350ef1d1f2638a6aa253e3e7b0 SHA512 796351ee50f7c1b67cf755ff8be2093716856da6fd80ad3aaf266932aece3f0f1203ff92611003285461d47326e0c0e42bf6bddcc9f6ceece5bf29f0ed033752
+EBUILD moto-5.0.27.ebuild 5240 BLAKE2B 1f3326ca93c5daed602bdfb9c5e00bbe6c10dd76f592ff7995075fc6cbff9fa222a7efa09f40a334e501e208e860d2c11fc059f0934bc474baaa05fc75916d44 SHA512 98c539dedaaaaac5d24ba0c8649c834e257318a8a01a4ac9315f25d86c3d0be56841a23800ada69b83ba807c0cab92913c64e42ee669900992f8652f2291c5b7
 MISC metadata.xml 553 BLAKE2B 1669d17d3e655aa3fb41a489229a5fbfa6a9cfb23c667e98fbbef931992c7e9645581b9ea12011601093586cba491a5557d68e5256edb9f387c4db362346edf9 SHA512 48ae3bd9be8c3bfb68f7022d0e7bb422c2a06157967809be302067facf91db825023859d18ccea89109931538b0e93181d54a31fcc967628df61a9a3112edd3d
diff --git a/dev-python/moto/moto-5.0.27.ebuild b/dev-python/moto/moto-5.0.27.ebuild
new file mode 100644
index 000000000000..d3f815a7dd7c
--- /dev/null
+++ b/dev-python/moto/moto-5.0.27.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2025 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 toolchain-funcs
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="
+	https://github.com/getmoto/moto/
+	https://pypi.org/project/moto/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-0.93[${PYTHON_USEDEP}]
+	dev-python/boto3[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/cfn-lint-0.40.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-35.0.0[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-3.0.0[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-2.10.1[${PYTHON_USEDEP}]
+	dev-python/jsonpath-ng[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3.0.7[${PYTHON_USEDEP}]
+	>=dev-python/openapi-spec-validator-0.5.0[${PYTHON_USEDEP}]
+	dev-python/pyaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.25.6[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/sshpubkeys[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/antlr4-python3-runtime[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+	)
+"
+
+: "${EPYTEST_TIMEOUT:=180}"
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_core/test_request_passthrough.py
+		tests/test_core/test_responses_module.py::TestResponsesMockWithPassThru::test_aws_and_http_requests
+		tests/test_core/test_responses_module.py::TestResponsesMockWithPassThru::test_http_requests
+		# broken code? (local variable used referenced before definition)
+		tests/test_appsync/test_appsync_schema.py
+		# require py_partiql_parser
+		tests/test_s3/test_s3_select.py
+		tests/test_dynamodb/test_dynamodb_statements.py
+		# require joserfc
+		tests/test_apigateway/test_apigateway.py::test_update_authorizer_configuration
+		tests/test_apigateway/test_apigateway.py::test_create_authorizer
+		tests/test_apigateway/test_apigateway.py::test_delete_authorizer
+		tests/test_cognitoidp/test_cognitoidp_exceptions.py::TestCognitoUserDeleter::test_authenticate_with_signed_out_user
+		tests/test_cognitoidp/test_cognitoidp_exceptions.py::TestCognitoUserPoolDuplidateEmails::test_use_existing_email__when_email_is_
+		tests/test_cognitoidp/test_cognitoidp_exceptions.py::TestCognitoUserPoolDuplidateEmails::test_use_existing_email__when_username_
+		tests/test_cognitoidp/test_cognitoidp_replay.py::TestCreateUserPoolWithPredeterminedID::test_different_seed
+		tests/test_cognitoidp/test_cognitoidp_replay.py::TestCreateUserPoolWithPredeterminedID::test_same_seed
+		tests/test_cognitoidp/test_server.py::test_sign_up_user_without_authentication
+		tests/test_cognitoidp/test_server.py::test_admin_create_user_without_authentication
+		tests/test_cognitoidp/test_server.py::test_associate_software_token
+		# TODO
+		tests/test_dynamodb/test_dynamodb_import_table.py
+		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
+		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
+		tests/test_stepfunctions/parser/test_stepfunctions_dynamodb_integration.py::test_zero_retry
+		# random crashes
+		tests/test_stepfunctions/parser/test_stepfunctions_sns_integration.py
+		tests/test_stepfunctions/parser/test_stepfunctions_sqs_integration.py
+		tests/test_stepfunctions/test_stepfunctions.py
+	)
+	local EPYTEST_IGNORE=(
+		# require joserfc
+		tests/test_cognitoidp/test_cognitoidp.py
+	)
+
+	case ${EPYTHON} in
+		python3.13)
+			EPYTEST_DESELECT+=(
+				# suddenly started crashing, *shrug*
+				tests/test_xray/test_xray_client.py::test_xray_context_patched
+				tests/test_xray/test_xray_client.py::test_xray_dynamo_request_id
+				tests/test_xray/test_xray_client.py::test_xray_dynamo_request_id_with_context_mgr
+				tests/test_xray/test_xray_client.py::test_xray_udp_emitter_patched
+			)
+			;;
+	esac
+
+	if ! tc-has-64bit-time_t; then
+		einfo "time_t is smaller than 64 bits, will skip broken tests"
+		EPYTEST_DESELECT+=(
+			tests/test_acm/test_acm.py::test_request_certificate_with_optional_arguments
+			tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header
+			tests/test_s3/test_server.py::test_s3_server_post_cors_multiple_origins
+		)
+		EPYTEST_IGNORE+=(
+			tests/test_route53domains/test_route53domains_domain.py
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x TZ=UTC
+
+	rm -rf moto || die
+	epytest -m 'not network and not requires_docker' \
+		-p rerunfailures --reruns=5
+}
diff --git a/dev-python/pyopengl-accelerate/Manifest b/dev-python/pyopengl-accelerate/Manifest
index 094dfdc4d12f..42169271c71c 100644
--- a/dev-python/pyopengl-accelerate/Manifest
+++ b/dev-python/pyopengl-accelerate/Manifest
@@ -1,6 +1,8 @@
 AUX pyopengl-accelerate-3.1.8-gcc-14.patch 1852 BLAKE2B 8751f51383f1971803dbf79ceb2d2434125b4e0803c2848f03ef268528e53bb1c28c08a354c5cb0a15616f47313c77e7748c8278892ab5558dbc7bc40762bb02 SHA512 fa8f7b98f08dc0679e050c637996460539a9b1a0dc2852aefa51e862753430e3b316390f1792acf9ffdbab0a59858e01efc669d084a68fac3db0492bb0232824
 AUX pyopengl-accelerate-3.1.8-numpy-2.0.patch 5634 BLAKE2B ede68f2263a4fb64b9f429f7840c35af94defeb101c0573fecdb468776e88a886c2ac58053f0544dc6b5f6d0d26ca2773ff993a0889c649ca01efd221853c136 SHA512 d70778ea7d55e49f07fbbe201c0b08ea107bc48a6f73a89184c5f6cafe961a876d7916c624413eaa1d2271e8b10ddf57a7117925bfa716deb77b69c8fb20e630
 DIST pyopengl-release-3.1.8.gh.tar.gz 3599436 BLAKE2B 7f33345d68d66d3cc81278eaa5f54298694f41f40583ee08a1f9f677705fb4414b6b2afbcd7b9345199b5f573478bfeba050e185b6534cbb19b45cb25c241b47 SHA512 d95014a36bd889fa014043e4640ba7f319bb996cb56e5f7086ee05d39c53d3928512d52b0ce181d7c144775a4da7eff7403cada0f91f23f56a699a1b023e00e6
+DIST pyopengl_accelerate-3.1.9.tar.gz 21799 BLAKE2B cf0a69d55dd1971fcd91d147e71035e3a59c55dbbf10eb2ae6d5e8e78ac932632a4867c4762ea56be5e79afa0c25b4e3d313557e6b3e1f4fcc3553df12096fce SHA512 a6e4dc2ee88f2133e02384113fa7947f9a30bd2b0dff5905c29fe46b346ba7e61b2d4dc2d598901524f46560025026d5163f750be0a2b58864b3863fa7179fcf
 EBUILD pyopengl-accelerate-3.1.8-r1.ebuild 1519 BLAKE2B 9a2288ce74652c0983dee9ba2982e1e13eb5085067e6b164b41268cf8f380a01c44a8b8562e0655775c8121645d5fa36d503e11ccc8ff4ebc358f258277de87b SHA512 ba7855a09d54b0d6813332107e90c4eb16744d572b26fe375d378480f95b730ef326d19b8697a28b970b28629ba77458aab8ec9bd3545c0b4df1ef000da6f1b2
+EBUILD pyopengl-accelerate-3.1.9.ebuild 1035 BLAKE2B da64439d4292306fca90e98ad3a951e3ef7a8cef488b5851ff4f51a936550a8f228557e81a8b59bf128e1323f9d6e7ab16c1b0952c3a33e72accb3f14818d34c SHA512 deb4cb442fb41fc367accb462aa10adfbcd0a898a0dbf17779887cf168cced6b05846a42c2eb6134c249fbeb70c6e1e691f69c5a1100e71b127fde32b0f723c1
 EBUILD pyopengl-accelerate-9999.ebuild 1521 BLAKE2B 0c9d9e69a33e1637223ede578a7fd464bec52f16389498c9998634f79ade5862819bd79c461e06b9a5099bbf7bd36596727626e71726b1983ebe9fc197794f65 SHA512 dfa4175d7187ad74e725ba23bfaa3f6fa4f376d391bfc709ecd371829e4bb38484416dfee75c80375febea7b7ac1b92009001755939c90640e640465f1890c81
 MISC metadata.xml 515 BLAKE2B 4a8dfbbf2250df73d9880ed75c4bfd63596e7f276dfd5dc15aff9177ad0b005256237e827bf4a0ce10f823ee1a17651248c1b47961bbd09af0a41b6281214228 SHA512 4f1a5ea9b42ba29e78fc15d2ad40623c63a2f351cc0a5f27eb7f8173155278bf214d5ac0f2d348c04967a99b2bb1f2c4b596ab8741a17cd891b2c34065ef0e35
diff --git a/dev-python/pyopengl-accelerate/pyopengl-accelerate-3.1.9.ebuild b/dev-python/pyopengl-accelerate/pyopengl-accelerate-3.1.9.ebuild
new file mode 100644
index 000000000000..83ad094ff1d6
--- /dev/null
+++ b/dev-python/pyopengl-accelerate/pyopengl-accelerate-3.1.9.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2025 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 pypi
+
+DESCRIPTION="Accelerate module for PyOpenGL"
+HOMEPAGE="
+	https://pyopengl.sourceforge.net/
+	https://github.com/mcfletch/pyopengl/
+	https://pypi.org/project/PyOpenGL-accelerate/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="numpy"
+
+DEPEND="
+	numpy? (
+		dev-python/numpy:=[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	if ! use numpy; then
+		cat > "${T}"/numpy.py <<-EOF || die
+			raise ImportError("building numpy extension disabled")
+		EOF
+	fi
+}
+
+python_compile() {
+	local -x PYTHONPATH=${T}:${PYTHONPATH}
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	cd "${T}" || die
+	epytest "${S}"/tests
+}
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index 998b4e60bcd8..2aa4c15ebf6d 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -3,6 +3,8 @@ AUX pyopengl-3.1.7-pypy3.patch 836 BLAKE2B 1ebae535d8ffc73b38c55d47ac43ca1345023
 AUX pyopengl-3.1.8-fix-version.patch 613 BLAKE2B 6f86f24d991629b63e04178be8baa45e431f360e9b54305799f85f4bd8fd11e298a883a4c2006189a3c4719febf312181a399e08b2af9c60170893449929e661 SHA512 d6b9aba76252f9e2cc3a0c09a128a56df0bacc2b2e36e64f672ca92ff06e7e2c674076f008f692fe4d4165e3b7991b225f65919b035306bcd7819afa5c91ad8e
 DIST PyOpenGL-3.1.7.tar.gz 1896446 BLAKE2B 3fd4c84bb59157b4a6ee09c2a5ecd0e4f548bf03a84d735acfd92453eafb92102677a2b9c98831a92be33e873630c815dee453745d630a4d6b044771a13c945c SHA512 add1b4d02e7297f00f82a9c9249d6665029073fe620a1650491af9102a76a16e9320b5f227275b0c273ff5a616c284fd9f25f0f425848676c37cab9f3c22ae2e
 DIST pyopengl-3.1.8.gh.tar.gz 3599436 BLAKE2B 7f33345d68d66d3cc81278eaa5f54298694f41f40583ee08a1f9f677705fb4414b6b2afbcd7b9345199b5f573478bfeba050e185b6534cbb19b45cb25c241b47 SHA512 d95014a36bd889fa014043e4640ba7f319bb996cb56e5f7086ee05d39c53d3928512d52b0ce181d7c144775a4da7eff7403cada0f91f23f56a699a1b023e00e6
+DIST pyopengl-3.1.9.tar.gz 1913642 BLAKE2B 2c2b768773b0531b432fb9add49d3c32dd468a4d8dfe0ee992064089ba3a51ecb19a7ce21c6c964935ff51fe1e37c49092540eff88f0a23c6cc754d457bbcef0 SHA512 b0fae0031cf0c47899d3cef6a334ee885595b4bc7d3da5055cd12240e6612b2ade1dc75afe1b1f6fe8e4572b994b88c4ec557d893e6606353f4700111cb6f161
 EBUILD pyopengl-3.1.7-r1.ebuild 1542 BLAKE2B 35ad54837b4efcba3aefba54f5fa0e56ebb87dd8e3bb7fbe0838a9280d4aafe8043296d5725312c56d33d167d1f87672ceae9e921ebf7048d37cc0eeca1f1094 SHA512 3bb3acfdd24be80a229e85b7a607b2598ffa8b5f2fd5456fd84fbbb99169a04a3a9f3d7780bdee40412f237239df7b32993896b7d812a9a499b3d96e397d10d0
 EBUILD pyopengl-3.1.8.ebuild 1731 BLAKE2B 129d05d6b1f4495f5b843ad43157875e7f5b9b01241659b334360c65e052a2b5e628b0b45cf7d42e93cdb5c7a9e8a595ea428981f1062947af18578069d60ae3 SHA512 2e95d5fe321592c6088100483c6a4c71c4b6138b8ada162fd1eba0bd70d250ba681c581a9963d2cf59b9d24d7c2547307c57a3a2e335bfff4d00e5115bb9860b
+EBUILD pyopengl-3.1.9.ebuild 1770 BLAKE2B 250282ad5c170af29dd0885bd62eb463ff987deb14235036dd83fe5268dc9b54f8442cb465fcb3ec8766f29e3cdcb34f45def3ff0b148492d05e4a42862cc318 SHA512 126cc47129789cc42449872ce8d5363fc22dae49643426d8a9d07f4bcbff73045c1d6554706a06fb7f8ea9b34c6b1982f27980c3794bd253153bb01df98da735
 MISC metadata.xml 422 BLAKE2B c9ee324fb408e8d0856193fde1324109e77c97f28fff0dc83d9c903cf3e2385c3401d8f949d50fc2e2a9c41b79c421298e04fc79639b79352138f41aeafb7018 SHA512 bedbbc7fcafc2c625f79241e75faeafd0d3c37b4186b5ef8842e8612d9527a4991f208b1878b1f1e28f4056eab2104e7acb57814e39ee82c0208d6f93fbb7b85
diff --git a/dev-python/pyopengl/pyopengl-3.1.9.ebuild b/dev-python/pyopengl/pyopengl-3.1.9.ebuild
new file mode 100644
index 000000000000..ece7d7b175c3
--- /dev/null
+++ b/dev-python/pyopengl/pyopengl-3.1.9.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_PN=PyOpenGL
+PYTHON_REQ_USE="tk?"
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi virtualx
+
+DESCRIPTION="Python OpenGL bindings"
+HOMEPAGE="
+	https://pyopengl.sourceforge.net/
+	https://github.com/mcfletch/pyopengl/
+	https://pypi.org/project/PyOpenGL/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="tk"
+
+RDEPEND="
+	media-libs/freeglut
+	virtual/opengl
+	x11-libs/libXi
+	x11-libs/libXmu
+	tk? ( dev-tcltk/togl )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+# The tests need an X server with the GLX extension. Software rendering
+# under Xvfb works but only with llvmpipe, not softpipe or swr.
+BDEPEND="
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygame[${PYTHON_USEDEP},opengl,X]
+		dev-python/python-xlib[${PYTHON_USEDEP}]
+		!prefix? (
+			media-libs/mesa[llvm]
+			x11-base/xorg-server[-minimal,xorg]
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/mcfletch/pyopengl/pull/109
+	"${FILESDIR}/${PN}-3.1.7-pypy3.patch"
+)
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# fragile memory tests
+		tests/test_checks.py::test_test_glgetfloat_leak
+		tests/test_vbo_memusage.py::test_sf_2980896
+		# missing EGL stuffs?
+		tests/test_checks.py::test_check_egl_es2
+		tests/test_checks.py::test_egl_ext_enumerate
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# refcounting tests
+				tests/test_checks.py::test_check_leak_on_discontiguous_array
+			)
+			;;
+	esac
+
+	nonfatal epytest tests || die "Tests failed with ${EPYTHON}"
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index f762d7bcff63..698757b7429b 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1,3 +1,3 @@
 DIST python-xlib-0.33.tar.bz2 213763 BLAKE2B 53486ec938bc00306658f3151556f1353fe5881ab942d06493f6f78d33b4cff8aab6e6aa5ad7e9124824d61549545719375c84f7b9376518e2328fa2e65df553 SHA512 3b7b4fea5cd69544d2227806853bdfdd04447089e182ca0f199e18e8bd43375d9bf03c819fd6a055ad4ad274594651e05db82585ab40d0fcf225ce36b553c991
-EBUILD python-xlib-0.33.ebuild 988 BLAKE2B 912f98d283cda200e20a25397d62ca3de3af4bc1e35dc295367530405443be8551b28d6f9b154e06ee2b1af71f377a2bd535b36ae1e3d3990d90ccd8d16b7819 SHA512 572fe03bffe8a2f4fa1226a80b65c6706df63fb348bdfaf2c8c073c5a6e2b332b738567a4499d85cc65ac2d788348a6b87673aaebaa7829e8d52a4c1f688c2cc
+EBUILD python-xlib-0.33.ebuild 994 BLAKE2B 245775a8bb4f3ffd228b6de52bead0afce7efa496a5a0ff8a44564b497d876a86aadba4b5da3ab9387d490745dfe70a12e6b513f354cacc4340789c10a6f6e78 SHA512 c526dc8927b8a059b7e2572400ceabef8a7b8abd3b0d747f5596c2a999e75ea5b737183b403ee2241275d2f4421bbdba2f34b6c845e3b79fd4964e7df6756f87
 MISC metadata.xml 434 BLAKE2B 3fa5d4e6b3b0347d1872805cf074795e486fe64a6b5b3edf326e9a8f81c1f5b86472ec6d906e85ef11493e9aeff9ef8ecfbece69103df037c8237fee3bbbaac9 SHA512 38738c99171d5351a797b12384a0f29b38250bb62cb17ff6250e3215a580500eec3210e22ee9605356c71477b8574b9fde34c5dee944b8437b901adc9b417218
diff --git a/dev-python/python-xlib/python-xlib-0.33.ebuild b/dev-python/python-xlib/python-xlib-0.33.ebuild
index ec6e1d083285..f23905f6f2e6 100644
--- a/dev-python/python-xlib/python-xlib-0.33.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.33.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 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_COMPAT=( pypy3 python3_{10..13} )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/pyxattr/Manifest b/dev-python/pyxattr/Manifest
index 7f04e8dab160..15566e727285 100644
--- a/dev-python/pyxattr/Manifest
+++ b/dev-python/pyxattr/Manifest
@@ -1,3 +1,3 @@
 DIST pyxattr-0.8.1.tar.gz 38443 BLAKE2B 2b044f5774c4b1e95a711e3bdad0c2f604d330865155360b8b6e08377c78d058e17a7d3f4792d6ef932b81f92b1671277663a36652d60a25aaa658a2e545f8a6 SHA512 98ba196b29b431ecacf0257712aa219175ba030e1c62fb388b4f3109d2d6b14ef09ed38f85177bd2991d3109c0af4cd2a108d17886dd51549e817727714f72f1
-EBUILD pyxattr-0.8.1.ebuild 859 BLAKE2B 5109bc0cff5c80c34c5d8e6bd1b086728a9edbf129ab5f667ebff4c6e889462dfd1d9b1195654d4481416b755d4df9e00998334b01f5ea12504340bc77dc3581 SHA512 64b84cc67229809c5c8a53f1ef0655e14a3f4dd33db762ba0077ccc944a215354a3e036fabfacd34973f1fbd15f5f0d414a563acef121f6a1eb25837b7bc261f
+EBUILD pyxattr-0.8.1.ebuild 871 BLAKE2B 138410e77cc35b6af9be74428ab64af5fc06b81ab793b3a355637584322f2b2907d6d02210a7e231d4246b77096bfb477759cfae429183086dd71fc3092255c4 SHA512 a0bd58fac908dea8858e6e37556e798587ef9b7251b1de65f453e934270900d56f381b0e5200401ef2be5e8fe10b5b7825fb2dc2fb9547a8a2f6e8fe932a9a89
 MISC metadata.xml 668 BLAKE2B 4464bbef18d4eedbc1309c009e0679ae4a6a5870416802e4ad7bdd3814ec1cc1f741386c1bb44578e5ae67c6da978645a5a14c14e74e58ac928708bbf09f5a4a SHA512 7efd22b5b2a920c4725558bce7ca44dd84106001e716188b28eedc7f4718d28b542f647fe8d9e0b58ec9037461745df323589f187933ea73947e6c9e5b59ede8
diff --git a/dev-python/pyxattr/pyxattr-0.8.1.ebuild b/dev-python/pyxattr/pyxattr-0.8.1.ebuild
index fd71bb8b74a8..f046f2088454 100644
--- a/dev-python/pyxattr/pyxattr-0.8.1.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.8.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/qscintilla/Manifest b/dev-python/qscintilla/Manifest
index bd627578c389..34a59c0446dc 100644
--- a/dev-python/qscintilla/Manifest
+++ b/dev-python/qscintilla/Manifest
@@ -1,3 +1,3 @@
 DIST QScintilla_src-2.14.1.tar.gz 3233610 BLAKE2B 83b54378f0d3fa39ea120214a06c91982f81281e15c61fc70a9e83928be64724cfd2679b5e4aafee44a324e24a6c4729693cd118c6ad0b1636a199f2f41d34fe SHA512 19e2f9e0a14947501c575018df368d24eb7f8c74e74faa5246db36415bf28dc0beee507ed0e73107c02b36a99bbaf55f0ef3349f479d2332e1b92b2c4a32788a
-EBUILD qscintilla-2.14.1-r2.ebuild 2762 BLAKE2B a3e97dfc738523c264d6334e9d57d6d9f4986edd33fd280dc953defa887c79c7e431037a708cff49544727f2b3d8969f5627a6059e798da37b140944c84b2dfd SHA512 37e6d5a1c8d6983734d337139ffef490bdecaefef51cd9fb706adeda69916e87c05cbbf34d93dca3f20bdf58d7147be168b82de48f01ff6e9beeda0dd634a358
+EBUILD qscintilla-2.14.1-r2.ebuild 2762 BLAKE2B e7b1bbd85e615a3533dbd1747cd02e8c1f7b6b39ffec4f4d121d2d29cc02767f310461379c0d92aa9b32f5092c8d115d1aeb5b47b887fc1a5030b456e54eb095 SHA512 e3231d9e21e40fd3b70b159d796553a621b4c7396cf64493a019fb5f596119b2c0fe6a9fe5b5eab342f07d63323d486c54bc2ee183195bc25f3599b95900828e
 MISC metadata.xml 498 BLAKE2B 275924a6a89a3553a1a32ce3103e624460e4c67aa07deede1f823784e2af7b20389e9f79f6fc559929b3457ed6be58bdd5dad3984457b27c6ca493450f1458e0 SHA512 cc45758a175fd95cff25aed840fafd1ce7e98b4b3b455e0f9d95f556c33e3d2c6229bf8ffce15aa2a7726238704cac64bf359972742dcf7d663a7cf27af147b8
diff --git a/dev-python/qscintilla/qscintilla-2.14.1-r2.ebuild b/dev-python/qscintilla/qscintilla-2.14.1-r2.ebuild
index 0e1a5a97c5f8..de90727fa909 100644
--- a/dev-python/qscintilla/qscintilla-2.14.1-r2.ebuild
+++ b/dev-python/qscintilla/qscintilla-2.14.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit multibuild python-r1 qmake-utils out-of-source-utils
 
 DESCRIPTION="Python bindings for QScintilla"
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index bb3440992490..4fc5d26867d6 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,12 +1,8 @@
 DIST websockets-11.0.3-python3.12.patch.xz 4328 BLAKE2B 6ef94255ef5d95de8015eca14a5110373ab9ffadf4d1c86a892da1aac46caa2755cafeb643a222000a03262c1b1b1aea58132daff36981c00dbb68ce05484058 SHA512 421a6fb5a2a801850ea1fbaf890c11eac0f55ad288185f16f4244f316132591bc5a814636141ba3ada67aeff340f41de61d06c8db87010c858c1b0b02fd9b5ab
 DIST websockets-12.0.gh.tar.gz 352120 BLAKE2B cab704e0ee44a7012ee58d515a5ea7380a97a3cbb8f55d105c00c8c2b9ed992b4c87435875474de32e5969fd92256bdec830db0571399a1d2e5fb719b23c2d83 SHA512 f17943d444ce275b709cf89453b2d2cce09f5af26f0460e226c2e24cfbb425c825963352e130dcd4201587606355375b525d8e5a02eccbffbb3985a108a3ed5e
-DIST websockets-13.0.1.gh.tar.gz 400436 BLAKE2B 3387cdc72117d2b1b0d1a5d3bc2444a243de2536b3937459221095b539172fab60972f4b1d0371c9c88222f8dcdf604a0371de1519728b40889a51ad6dd32029 SHA512 b187e7c443b9c6abbc7993f9c45dbd4fe83784d3ceb339b6e7d104cfa4da03450c25a8bf9dfa9c8626c3c91f2fe44c0dec6579ba830e0e20116a3e1e01be3bf1
-DIST websockets-13.1.gh.tar.gz 414934 BLAKE2B ac6ec67c360e88a7091c28e582b8a0e58fffb37b91f6cfe2b62fa91e1de10f94ba66b644e22f3ce34db698ec25c1685f682e3557058e30f162e1a6a39c19451e SHA512 f66c25c8c2a327840e424e1db3742f1e303df562fe59e91d44c15731d9e43d3d9b126253f2ffb2efeada63d3fd8b404480506554f263846d8d0d86da02f4d8aa
-DIST websockets-14.0.gh.tar.gz 424033 BLAKE2B c0181fee4dfc4c2b929d3b51edcdf1602e8c5e5c8595cd7b8df13b2f633434fd5a9ec3ac0a87e456eacd432fd1650ae4470ce5f5337b0391ccda57f38d5f58f4 SHA512 a32d6338ed70de0b99298e9b26c6a3f18a3b517633754c8b1fdbebfb407023f73d212e98db909a276c58aab6487db501540db0c8237280c1a311d8b0e7c1e4be
 DIST websockets-14.1.gh.tar.gz 425408 BLAKE2B ebedf5bf27373cc05b6b82675bf7ff32b63f025e9bcee405a224c44d54e93b6a10d86a1deb1773e232fe1bb1680642e4553b9f5be999cb7523823b180a899840 SHA512 771c7d2e55f90de1307d8d662c2066397c0e2299f321dd3621df99cdf105f8d9d7583b70e7d1c51465174e9d35ba8db51eda559ca9bbd7ce74c90d1759df2e5d
+DIST websockets-14.2.gh.tar.gz 427526 BLAKE2B 2c6fca711b16e5c45d49320f86f7da2ef428573786dbecb57876978b8a2819d8074984d929a0ff16222a8131f175287ed66d5c19dd7ca12106fbe93449a3dda6 SHA512 b5b5ce455e5b68a14993ac1d02c6f417db6cc89cdb9b21e12ba1e1975050fdf7e1935e08a35d8fcb41f5e255385c72834627c989f0734d7015bc1817f6067fe9
 EBUILD websockets-12.0.ebuild 1420 BLAKE2B 135e8bb0886d85ceb788f311e821a129a088fbaac7c7b276e43f0f8f8790ce8ec15db3405cfaf04356c9b42410fed2fc38642d58afaa84fc96c9f65a58d94c41 SHA512 105c2d7fcfd835a730c3b43411e60b4d893cb534d7cddd47b2adaa9a90e0cf351d81088561c477659910ea9bd206ce8605da37e424e78ef0b9b750dce4a31d2e
-EBUILD websockets-13.0.1.ebuild 1578 BLAKE2B 3577c3e10765c2ff4f2bfb88d50c9e5359a0954ae9b3f9f3f1c7487ed48a3df7bf2c712945d96ec50bdc24dbc5388a24edfc9d78509b047644b20095899922d0 SHA512 3fbeedacf97fef31d62ce177810ebf30ee2e2636a8e8de561b1f4a3d9c180cf5d697267785a985af59c96e9be38617fb24b654ebaf81dd8b5e5c17cddfea0ee3
-EBUILD websockets-13.1.ebuild 1580 BLAKE2B 1bf8489d5f5cc99d0ea8d9806984a0ea933c6f9cc04e8ca0b99e6d6ba0b41a30a03d4a167a784aa7a5586a7ff0ffcff925d186e81a91ecfc4aafe42c61f59857 SHA512 090c7180d10f93672792bdbe8611fb62956f0a79339fdb689d8681e46b39f409ebfe6ca4b409a2603f502d96538770e7c882a8ca60641bf182f8a5201403b0c4
-EBUILD websockets-14.0.ebuild 1583 BLAKE2B 1994b1df4d78b04588efd82af14701817220f626c647323a420471657c6abfb4357664d5495fe51af62f8bd490461f51515ec9037e921c83847de28b5b437197 SHA512 e0f183e129758c197643ce4e536330d56afbe9b21702ec15edfd2fa05c4a273d7478bed8eadb5aaf45eb649f9e4fb99466b5a47db8fcd2246ea56602b3a66413
 EBUILD websockets-14.1.ebuild 1576 BLAKE2B a861b65f56efccc82db38d20f72099af844abe5601d3f2304b32d4730ffd893ad183a58ea809385216d76c76067bd96b26a2fdfe14d6e035fc2d310a06e628a9 SHA512 d708df875bd2c4a8ac4dfd410c5d57fac1217df2a6831eb6ee37fc3eeafd3a62a59be3f34226716b6c7f15368e8b9e1902686312e8f38bb606c66747d82ff209
+EBUILD websockets-14.2.ebuild 1583 BLAKE2B fd5a04e5197cd3bd063224e9bf80ee87775eb5ae81ece6c552398493344e1226fa06ed85bddec7b960b8e0a1cdf420f50d9a9f74b7378371c405865f0d716d9d SHA512 4ff555d154f6c2ef2d5d2f7313a3bbb36b9d514fa40cfd569ed1969e37429e299ef3c17d2dae17ea53e7918ab5bc62f22faf0687ef763bafa2318d46a91d1dc9
 MISC metadata.xml 580 BLAKE2B 66a318a73b2a9e37f44a28dfc9ed5f1aa7193edb05fa295bde27fd7a1c429cae1d875289ac5bd8ff7b579be2cfc5671d27dfb46ba959c47b2c1074e8e549e9c3 SHA512 c4ba79e5ec539ffb6f0338e6e161132dc8dd0e6c7e7533df1c32731810126b728076703a542bb28abc159842ad71bd42e69e36f4fe17dc3377d054d21ec53dbf
diff --git a/dev-python/websockets/websockets-13.0.1.ebuild b/dev-python/websockets/websockets-13.0.1.ebuild
deleted file mode 100644
index f009f4c556c4..000000000000
--- a/dev-python/websockets/websockets-13.0.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for building WebSocket servers and clients in Python"
-HOMEPAGE="
-	https://websockets.readthedocs.io/
-	https://github.com/python-websockets/websockets/
-	https://pypi.org/project/websockets/
-"
-# tests are missing pypi sdist, as of 11.0
-SRC_URI="
-	https://github.com/python-websockets/websockets/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-11.0.3-python3.12.patch.xz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="+native-extensions"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	if use native-extensions && [[ ${EPYTHON} != pypy3 ]] ; then
-		local -x BUILD_EXTENSION=yes
-	else
-		local -x BUILD_EXTENSION=no
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires DNS access
-		# https://bugs.gentoo.org/909567
-		tests/legacy/test_client_server.py::ClientServerTests::test_explicit_host_port
-		tests/legacy/test_client_server.py::SecureClientServerTests::test_explicit_host_port
-		# TODO
-		tests/asyncio/test_server.py::ServerTests::test_close_server_keeps_handlers_running
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests -p rerunfailures --reruns=10 --reruns-delay=2
-}
diff --git a/dev-python/websockets/websockets-13.1.ebuild b/dev-python/websockets/websockets-13.1.ebuild
deleted file mode 100644
index 7e247066eed2..000000000000
--- a/dev-python/websockets/websockets-13.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for building WebSocket servers and clients in Python"
-HOMEPAGE="
-	https://websockets.readthedocs.io/
-	https://github.com/python-websockets/websockets/
-	https://pypi.org/project/websockets/
-"
-# tests are missing pypi sdist, as of 11.0
-SRC_URI="
-	https://github.com/python-websockets/websockets/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-11.0.3-python3.12.patch.xz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
-IUSE="+native-extensions"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	if use native-extensions && [[ ${EPYTHON} != pypy3 ]] ; then
-		local -x BUILD_EXTENSION=yes
-	else
-		local -x BUILD_EXTENSION=no
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires DNS access
-		# https://bugs.gentoo.org/909567
-		tests/legacy/test_client_server.py::ClientServerTests::test_explicit_host_port
-		tests/legacy/test_client_server.py::SecureClientServerTests::test_explicit_host_port
-		# TODO
-		tests/asyncio/test_server.py::ServerTests::test_close_server_keeps_handlers_running
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests -p rerunfailures --reruns=10 --reruns-delay=2
-}
diff --git a/dev-python/websockets/websockets-14.0.ebuild b/dev-python/websockets/websockets-14.2.ebuild
index 93fc44988e99..767a592057f3 100644
--- a/dev-python/websockets/websockets-14.0.ebuild
+++ b/dev-python/websockets/websockets-14.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 8bdadff7112b..193cbf9b0bad 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/arel-helpers/Manifest b/dev-ruby/arel-helpers/Manifest
index 1c9eee2fc817..53d59e759308 100644
--- a/dev-ruby/arel-helpers/Manifest
+++ b/dev-ruby/arel-helpers/Manifest
@@ -1,5 +1,5 @@
-DIST arel-helpers-2.14.0.tar.gz 11711 BLAKE2B 75182a17ae741b2fe62189bccf008ca9958a69d69b5c2aced227e1b77f7278565f2c6261f56e567e4534c1e0229ce00e630bb1dc77ce8e49d03267784f8f8dc2 SHA512 47edec1aaa5be14de4ee695b13096dcf3f0c30804b20dfdc84421e1a779d3faa6241c022003f4752da911d1ea71a49de6e1e3339e6a3e452ca7fa8116ff751ca
 DIST arel-helpers-2.15.0.tar.gz 11785 BLAKE2B 5588b114c0f3a1daf7ce8bb9301f709b6afefa91fdfbd4b30d98574c9bff0d650c996f9462836c22edd70bb5a4d8edabb4d46fd8d67ee6c3cb2fa2dd3459a807 SHA512 f13fc81815f3041fd40f8029683707698d283dc27d041f790bd4e14775cb113871f272c8dc22698a0dfbc5d6cf20d7a876bb02ea34a70583f1d6a4dc7c66a8e3
-EBUILD arel-helpers-2.14.0-r1.ebuild 1208 BLAKE2B 6d7a3c5c7439a4959f159d7c50d9cb8f54090a2ac953a13a004093b5657967f3fad2345515e62fca2efdc38a1a7241da2f2ae4af0efb12a7e4db026a21f0bbda SHA512 c1c3993c864777ae0928a4836c19a5f281f3c42f2148f2c92d1ce9633be532afaf8f2d02bf0731d10f80e26c2da4e8f02bcdfecfdb07470af2c000ed1dbf593c
+DIST arel-helpers-2.16.0.tar.gz 11845 BLAKE2B 584ecaf16b19274674e92a524a256d3045b9007683123c8bf7bc73d02ec91be8513c4a1c0eff5e0be094db74772b31b0afd4186fb5950914d5d9d76348cc8f0e SHA512 b1d9b74c0082fabd4cf79c43d79f53a2e46e4647d5fbe05bdcdb3821692a46a15a1d6418c24155838c739e83c646f9af0c636b99bfc4f84c6355792c959fae8b
 EBUILD arel-helpers-2.15.0.ebuild 1308 BLAKE2B 8c78d6cdd5c2b271baa996aa0b38e0ba51f05766bfc7cd21f0f0ee20ab0bd93bc97afdc8f2524bded0d20b087350b039604f813ebc0f6cb447dc5748e8dcf499 SHA512 e293a870d944e42fe0ce1d99bfca81f6765bc20cdd70f11ec5eea626199be44d18c9294b004b3ec77e9e2c740243b5001ed99e820dcfb98a5c597ac682ca79bd
+EBUILD arel-helpers-2.16.0.ebuild 1371 BLAKE2B 9b94e4c51a3cea4d7a233415e8e3096e75b6e964786c49d96a2d40d625eb91c0eb3275ce3d256c0f7aba99855d19718b8568a0f7c5f83d4d469192f1fba9176b SHA512 94b777af063722becee823b4926183e9b730ed9de4d0578170fa75fcbb9cd1bea1c86839769c376df97c0d64b770db75a3d73f16451b1390fe34e6dab0e3834f
 MISC metadata.xml 349 BLAKE2B af3bdfff6ea7b31174258347c1bb068f960b60e248a95397b3fc8a25a3a08207e66021fbade5082f37118203fd6865915364f9038885cbde2ae4f6e2e589f723 SHA512 553e72f50a6384aefded8efe7d9315c4d239755aa7c81ad5da3b2b0fd93eb00930d52c55159ff524e06868749d5ed839bef66642d39996ebf27914f73a121b00
diff --git a/dev-ruby/arel-helpers/arel-helpers-2.14.0-r1.ebuild b/dev-ruby/arel-helpers/arel-helpers-2.16.0.ebuild
index 62e4e4422c0f..347f1c25241b 100644
--- a/dev-ruby/arel-helpers/arel-helpers-2.14.0-r1.ebuild
+++ b/dev-ruby/arel-helpers/arel-helpers-2.16.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 RUBY_S=${PN}-*
@@ -21,6 +21,9 @@ KEYWORDS="~amd64 ~arm"
 
 ruby_add_rdepend "
 	|| (
+		dev-ruby/activerecord:8.0
+		dev-ruby/activerecord:7.2
+		dev-ruby/activerecord:7.1
 		dev-ruby/activerecord:7.0
 		dev-ruby/activerecord:6.1
 	)
@@ -31,15 +34,19 @@ ruby_add_bdepend "
 		dev-ruby/rr
 		dev-ruby/activerecord[sqlite]
 		dev-ruby/bundler
-		dev-ruby/combustion
-		>=dev-ruby/database_cleaner-1.8
+		>=dev-ruby/combustion-1.3
+		>=dev-ruby/database_cleaner-2.0
 		>=dev-ruby/sqlite3-1.4
 	)
 "
 
 all_ruby_prepare() {
 	# pry is for debugging, not useful here
-	sed -i -e '/pry-/ s:^:#:' spec/spec_helper.rb || die
+	sed -e '/pry-/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	sed -e '2igem "activerecord", "<8.1"' \
+		-i Gemfile || die
 
 	sed \
 		-e '/rake/ s/~>/>=/' \
diff --git a/dev-ruby/metasm/Manifest b/dev-ruby/metasm/Manifest
index fec748c69643..75a9a74a9b11 100644
--- a/dev-ruby/metasm/Manifest
+++ b/dev-ruby/metasm/Manifest
@@ -1,3 +1,5 @@
+AUX metasm-1.0.5-ruby33.patch 4743 BLAKE2B a5f8107297693a1104f3e1a3749795e76496e8806425094a23c7f1aa7214696764a1b0eba969bebb9f6c6b22befbeb4f4244fbd55642879e47353aad39f8df59 SHA512 e7b351126a3928522a9136c34147fd4aafd0ef740fc49e5b3ddd12c5ee90bf0af3e2f33f8c7af18548b77a69327cddc2fceedfa3c1d09a6bfbd5be8c1df20462
 DIST metasm-1.0.5.gem 803328 BLAKE2B 24ca2cff66257b063007b872028d4fad541584bee031dd4caacf2a89ee8f823e88dec8a2cf41815c72a5ef1b8db827b69fbb8ceaabee4d67de73aa04c15f354d SHA512 74a6eac47c06e7ff53f4e400fec6c6c73981bc58d09520ce7cdd657b6b74819fc5b9d6168edaf90eeb5c9b2087fd4924df1e21743809065cc1433428efbe1dd8
 EBUILD metasm-1.0.5-r1.ebuild 851 BLAKE2B bfd9c451426028a16187c971adb57a0119968fd20426a49870efb0e5231d1fa406b1ab96ae56eb72c4b9e97853634a2e7d7b45f98bd580288721f0238f04b0e4 SHA512 026cb02a85cdeac610395973889f6faea15ece38e359a3842d2b92a406d091c2cfca6c0dde2f617b48483f9b8265e6719d4337dcdd9a7d1f1ac7821621cf5a02
+EBUILD metasm-1.0.5-r2.ebuild 794 BLAKE2B e693aded116d6a0c6c2a8dbec23bbfbc976e0025f61e1e5dc7458c3d0d6a4194b709922ae676444de757fd6ec13ad7ab5bbdb6147f1d43855ff143e94ecb8a81 SHA512 625b2ff949947d4c65849437f5f3184f4ccdb42be441ed63696735d1c259108a81f23c70925b7489d96092d249e7fe12b596aad839364a40e3d1a37fff1c9d2c
 MISC metadata.xml 258 BLAKE2B 3c49249352f2cb11df010da6ecd8312a27047557ca5f2686837ad66933be9ea2627c40f91daedf8dcd9099c6cdc0dc2d2ba32aaf9d888c41fb60ee098e1c0c1e SHA512 ce517e35f3c0a2a9807ee68b0a8c84ca28db8dfabb41758cac71f9da22847fe20d259295f0681e38a52a24618450a0ca097939dc1022e3987bb0088762e48326
diff --git a/dev-ruby/metasm/files/metasm-1.0.5-ruby33.patch b/dev-ruby/metasm/files/metasm-1.0.5-ruby33.patch
new file mode 100644
index 000000000000..4a48ddcef208
--- /dev/null
+++ b/dev-ruby/metasm/files/metasm-1.0.5-ruby33.patch
@@ -0,0 +1,145 @@
+From c8f02d5d170c5373eeef98d6f6354ae7c726e29b Mon Sep 17 00:00:00 2001
+From: jj <john-git@ofjj.net>
+Date: Mon, 11 Dec 2023 19:22:30 +0100
+Subject: [PATCH] dynldr: ruby3.3 compat
+
+---
+ metasm/dynldr.rb | 64 ++++++++++++++++++++++++++++--------------------
+ 1 file changed, 37 insertions(+), 27 deletions(-)
+
+diff --git a/metasm/dynldr.rb b/metasm/dynldr.rb
+index 74bf786f2..a7b807703 100644
+--- a/metasm/dynldr.rb
++++ b/metasm/dynldr.rb
+@@ -9,7 +9,7 @@
+ 
+ module Metasm
+ class DynLdr
+-	# basic C defs for ruby internals - 1.8 and 1.9 compat - x86/x64
++	# basic C defs for ruby internals - 1.8, 1.9, 3.3 compat - x86/x64
+ 	RUBY_H = <<EOS
+ #line #{__LINE__}
+ typedef uintptr_t VALUE;
+@@ -26,7 +26,7 @@ class DynLdr
+ struct rb_string_t {
+ 	VALUE flags;
+ 	VALUE klass;
+-	VALUE len;
++	long len;
+ 	char *ptr;
+ 	union {
+ 		long capa;
+@@ -38,7 +38,7 @@ class DynLdr
+ struct rb_array_t {
+ 	VALUE flags;
+ 	VALUE klass;
+-	VALUE len;
++	long len;
+ 	union {
+ 		long capa;
+ 		VALUE shared;
+@@ -52,41 +52,45 @@ class DynLdr
+ extern VALUE *rb_eRuntimeError __attribute__((import));
+ extern VALUE *rb_eArgError __attribute__((import));
+ 
+-// allows generating a ruby1.9 dynldr.so from ruby1.8
+-#ifndef DYNLDR_RUBY_19
+-#define DYNLDR_RUBY_19 #{RUBY_VERSION >= '1.9' ? 1 : 0}
+-#endif
+-
+ #if #{RUBY_VERSION >= '2.0' ? 1 : 0}
+ // flonums. WHY?
+ // also breaks Qtrue/Qnil
+ #define rb_float_new rb_float_new_in_heap
+ #endif
+ 
+-#if DYNLDR_RUBY_19
++#if #{RUBY_VERSION >= '1.9' ? 0 : 1}
++ #define T_STRING 0x07
++ #define T_ARRAY  0x09
++ #define T_FIXNUM 0x0a
++ #define T_MASK   0x3f
++ #define STR_PTR(o) (RString(o)->ptr)
++ #define STR_LEN(o) (RString(o)->len)
++ #define ARY_PTR(o) (RArray(o)->ptr)
++ #define ARY_LEN(o) (RArray(o)->len)
++#else
+  #define T_STRING 0x05
+  #define T_ARRAY  0x07
+  #define T_FIXNUM 0x15
+  #define T_MASK   0x1f
+  #define RSTRING_NOEMBED (1<<13)
++#if #{RUBY_VERSION >= '3.2' ? 0 : 1}
++ // ruby1.9 .. 3.2
+  #define STR_PTR(o) ((RString(o)->flags & RSTRING_NOEMBED) ? RString(o)->ptr : (char*)&RString(o)->len)
+  #define STR_LEN(o) ((RString(o)->flags & RSTRING_NOEMBED) ? RString(o)->len : (RString(o)->flags >> 14) & 0x1f)
++#else
++ // ruby3.2+: len is used for NOEMBED strings, and the str buffer starts right after len (off 8+8+4 on win64)
++ // TODO find a better way to test, not depending on the compiling interpreter ?
++ #define STR_PTR(o) ((RString(o)->flags & RSTRING_NOEMBED) ? RString(o)->ptr : (((char*)&RString(o)->len) + sizeof(long)))
++ #define STR_LEN(o) RString(o)->len
++#endif
+  #define RARRAY_EMBED (1<<13)
+  #define ARY_PTR(o) ((RArray(o)->flags & RARRAY_EMBED) ? (VALUE*)&RArray(o)->len : RArray(o)->ptr)
+- #define ARY_LEN(o) ((RArray(o)->flags & RARRAY_EMBED) ? ((RArray(o)->flags >> 15) & 3) : RArray(o)->len)
+-#else
+- #define T_STRING 0x07
+- #define T_ARRAY  0x09
+- #define T_FIXNUM 0x0a
+- #define T_MASK   0x3f
+- #define STR_PTR(o) (RString(o)->ptr)
+- #define STR_LEN(o) (RString(o)->len)
+- #define ARY_PTR(o) (RArray(o)->ptr)
+- #define ARY_LEN(o) (RArray(o)->len)
++ // RVARGC uses more bits, should be 0/unused in earlier ruby versions
++ #define ARY_LEN(o) ((RArray(o)->flags & RARRAY_EMBED) ? ((RArray(o)->flags >> 15) & 0xff) : RArray(o)->len)
+ #endif
+ 
+-#if #{nil.object_id == 4 ? 1 : 0}
+-// ruby1.8
++#if #{(RUBY_VERSION < '3.0' and nil.object_id == 4) ? 1 : 0}
++// ruby1.8 (Qnil changed in 1.9 and back in 3.3
+ #define TYPE(x) (((VALUE)(x) & 1) ? T_FIXNUM : (((VALUE)(x) < 0x07) || (((VALUE)(x) & 0xf) == 0xe)) ? 0x40 : RString(x)->flags & T_MASK)
+ #else
+ // ruby2.0+, USE_FLONUM, world is hell
+@@ -138,7 +142,6 @@ class DynLdr
+  #define os_load_sym_ord(l, s) 0U
+ #endif
+ 
+-extern int *cb_ret_table;
+ extern void *callback_handler;
+ extern void *callback_id_0;
+ extern void *callback_id_1;
+@@ -207,13 +210,12 @@ class DynLdr
+ 	else
+ 		rb_raise(*rb_eArgError, "Invalid lib");
+ 
+-	if (TYPE(func) != T_STRING && TYPE(func) != T_FIXNUM)
+-		rb_raise(*rb_eArgError, "Invalid func");
+-
+-	if (TYPE(func) == T_FIXNUM)
++	if (TYPE(func) == T_STRING)
++		p = os_load_sym(h, STR_PTR(func));
++        else if (TYPE(func) == T_FIXNUM)
+ 		p = os_load_sym_ord(h, VAL2INT(func));
+ 	else
+-		p = os_load_sym(h, STR_PTR(func));
++		rb_raise(*rb_eArgError, "Invalid func");
+ 
+ 	return INT2VAL(p);
+ }
+@@ -354,6 +356,14 @@ class DynLdr
+ }
+ #endif
+ 
++unsigned long long ruby_abi_version(void) __attribute__((export))
++{
++	// mandatory to be loadable in a dev ruby build
++	// TODO find expected value in current interpreter ?
++	return 0;
++	// disable the value check interpreter side: #{ENV['RUBY_ABI_CHECK'] = '0'}
++}
++
+ int Init_dynldr(void) __attribute__((export_as(Init_<insertfilenamehere>)))	// to patch before parsing to match the .so name
+ {
+ 	dynldr = rb_const_get(rb_const_get(*rb_cObject, rb_intern("Metasm")), rb_intern("DynLdr"));
diff --git a/dev-ruby/metasm/metasm-1.0.5-r2.ebuild b/dev-ruby/metasm/metasm-1.0.5-r2.ebuild
new file mode 100644
index 000000000000..84a5ce21b825
--- /dev/null
+++ b/dev-ruby/metasm/metasm-1.0.5-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33 ruby34"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="BUGS README TODO"
+RUBY_FAKEGEM_EXTRAINSTALL="metasm metasm.rb misc samples"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cross-architecture assembler, disassembler, linker, and debugger"
+HOMEPAGE="https://metasm.cr0.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+PATCHES=( "${FILESDIR}/${P}-ruby33.patch" )
+
+all_ruby_prepare() {
+	mkdir bin || die
+	ln -s ../samples/disassemble.rb ./bin/disassemble || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e "Dir['tests/*.rb'].each{|f| require f}" || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper disassemble
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index efadcb25287f..03b6fee4fbac 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index f0cb7845e1aa..2d243f7e57d1 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,7 @@
 DIST diffoscope-279.tar.bz2 3146297 BLAKE2B 7dc1c2a8362db6c012be04aa2562a04079707502d6f61e4ee0093fe46042ad122fe73d1faaf81e6b565d369ba3ec83f6056c4ef62a6fe4649ed376d0404b2864 SHA512 564e731847cbc68a6d8612f543d9d40575c4e9240acc7ec405310878c9288566a5c6dd4aa87e2517db5ef1abcc4ab6e29d3002ee5cce281200d9381de103243b
 DIST diffoscope-284.tar.bz2 3149578 BLAKE2B 4969e394a32d076101d59c0ca730d4e3515e1f3c60031705aed7c043ea031442829435e20de9723117ab73a08b6eef81d97eb8f92f225eb7d9c702bc0060c1ca SHA512 c3a6e02340873e71a4b75412848d9878f3e63c4db14f1ed128744feff2240d688336bcd83b121dcfa8c12e332cb00fdfe0ae347cd5a88e4ec29b3591263e3f65
+DIST diffoscope-285.tar.bz2 3151919 BLAKE2B ad7c20368f8d3747b8b092d8761d6596809e39ee6ba09115e15f3b6c32da7e3cc590eed5628fb07cfc1fcf2f3b56ee7a4c3fd920c413e7f9e7a0522dfc6c721c SHA512 4b2eb41ddfee687408377185fb0ff5e88d6956c09a4dfceceb7c136596a3b00192be949c141f16f47e90f58da2f9ee1f51cd020f688e1bd6048462f357f14a03
 EBUILD diffoscope-279.ebuild 3937 BLAKE2B 04755859f8f8d4ce7998653c6d2a2e1479f8dc8eac1ff2e005cf0726d9536ed5738413b0628f4b1ff705451c9f9b9913cf15e33f19aa9956aa58deddf80b9142 SHA512 13ae14693b16f30953e5df685e24ca6aff0fb29b5c43b62758c19a84fd9ea37ee7c1e3e1a6d4c1a08d228b864dd1a966409392bca2ebaeeb1848630431d2fe96
 EBUILD diffoscope-284.ebuild 3937 BLAKE2B 38da064a3715a2c13b3a674416dc4ef91b39024e81ee13e01ff1ef788a988a5c946ec363df8d6b62cf11609a830c592e68c84a04f0f7d2fe9822e37c9d4be28d SHA512 97537df18723a72b2e91390bf7f4406b38b864ac695795597874686f360307841ea570a3d60ca11c94c0efe0fe13ec888699fe46d7fee21e639ef0674b4ce9c2
+EBUILD diffoscope-285.ebuild 3938 BLAKE2B 1fe168439f96d6c496b2ebcc7352b6d35a7d4f9348e86639e93825a15d7aaa1564f89ce67d58ec31848d64f19d8f48266b5b57c20f121d0a0f3bc2e8fab0a820 SHA512 a580e39916e09c66bb9d243347654cb69850d2feaf64e7144254b07be4a614bfec562e952bed52cec7d81fbf7f8406e9d72f5ab2d99f888655c8ed6552336e2e
 MISC metadata.xml 2086 BLAKE2B 75fdcf3b9bb7b9dd6222f07a04a96b2166c9a819ca5c6358daf4451bf73951b443596e05548ebdc163338eafbc75574e47635b3920ee8125690a310bf5185cf2 SHA512 552933e0c0e9cf23a8f3435a2587c6738f26e5153d773a745159ab1623ad5f39ef5d2647368918b9fdb25d61aab6a02a860c0f815740c1b70c973aa0a48a11ce
diff --git a/dev-util/diffoscope/diffoscope-285.ebuild b/dev-util/diffoscope/diffoscope-285.ebuild
new file mode 100644
index 000000000000..6f5fc7ca5b80
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-285.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2022-2025 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="ncurses"
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
+# We could use pypi, but upstream provide distribution tarballs, so let's use those.
+# TODO: verify-sig
+SRC_URI="https://diffoscope.org/archive/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
+mono opendocument pascal pdf postscript R rpm sqlite squashfs
+ssh tar test tcpdump zip zlib zstd"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	|| (
+		dev-python/python-magic[${PYTHON_USEDEP}]
+		sys-apps/file[python,${PYTHON_USEDEP}]
+	)
+	dev-python/libarchive-c[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/python-tlsh[${PYTHON_USEDEP}]
+	acl? ( sys-apps/acl )
+	binutils? ( sys-devel/binutils )
+	bzip2? ( app-arch/bzip2 )
+	libcaca? ( media-libs/libcaca )
+	colord? ( x11-misc/colord )
+	cpio? ( app-alternatives/cpio )
+	diff? ( sys-apps/diffutils )
+	docx? ( app-text/docx2txt )
+	dtc? ( sys-apps/dtc )
+	e2fsprogs? ( sys-fs/e2fsprogs )
+	file? ( sys-apps/file )
+	find? ( sys-apps/findutils )
+	gettext? ( sys-devel/gettext )
+	gif? ( media-libs/giflib )
+	gpg? ( app-crypt/gnupg )
+	haskell? ( dev-lang/ghc )
+	hdf5? ( sci-libs/hdf5 )
+	hex? ( app-editors/vim-core )
+	imagemagick? ( media-gfx/imagemagick )
+	iso? ( app-cdr/cdrtools )
+	java? ( virtual/jdk )
+	llvm? ( llvm-core/llvm )
+	lzma? ( app-arch/xz-utils )
+	mono? ( dev-lang/mono )
+	opendocument? ( app-text/odt2txt )
+	pascal? ( dev-lang/fpc )
+	pdf? (
+		app-text/pdftk
+		app-text/poppler
+		dev-python/pypdf[${PYTHON_USEDEP}]
+	)
+	postscript? ( app-text/ghostscript-gpl )
+	R? ( dev-lang/R )
+	rpm? ( app-arch/rpm )
+	sqlite? ( dev-db/sqlite:3 )
+	squashfs? ( sys-fs/squashfs-tools )
+	ssh? ( virtual/openssh )
+	tar? ( app-arch/tar )
+	tcpdump? ( net-analyzer/tcpdump )
+	zip? ( app-arch/unzip )
+	zlib? ( app-arch/gzip )
+	zstd? ( app-arch/zstd )
+"
+
+# pull in optional tools for tests:
+# img2txt: bug #797688
+# docx2txt: bug #797688
+BDEPEND="
+	test? (
+		app-arch/p7zip
+		app-text/docx2txt
+		app-text/html2text
+		media-libs/libcaca
+		virtual/imagemagick-tools[jpeg]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# Test seems to use different tarball
+	tests/test_presenters.py::test_text_proper_indentation
+
+	# Needs triage
+	tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
+	tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
+	tests/comparators/test_gif.py::test_has_visuals
+
+	# img2txt based failures, bug #797688
+	tests/comparators/test_ico_image.py::test_diff
+	tests/comparators/test_ico_image.py::test_diff_meta
+	tests/comparators/test_ico_image.py::test_diff_meta2
+	tests/comparators/test_ico_image.py::test_has_visuals
+	tests/comparators/test_jpeg_image.py::test_diff
+	tests/comparators/test_jpeg_image.py::test_compare_non_existing
+	tests/comparators/test_jpeg_image.py::test_diff_meta
+	tests/comparators/test_jpeg_image.py::test_has_visuals
+
+	# docx2txt based falures, bug #797688
+	tests/comparators/test_docx.py::test_diff
+
+	# Formatting
+	tests/test_source.py::test_code_is_black_clean
+
+	# Fails on ZFS
+	tests/test_main.py::test_non_unicode_filename
+
+	# Fails on (unreleased) LLVM 16 with minor difference
+	#tests/comparators/test_macho.py::test_llvm_diff
+	#tests/comparators/test_elf.py::test_libmix_differences
+)
+
+distutils_enable_tests pytest
+
+src_test() {
+	case $(tc-get-ptr-size) in
+		4)
+			EPYTEST_IGNORE+=(
+				# Needs fixing in Perl itself (bug #934443)
+				tests/comparators/test_epub.py
+				tests/comparators/test_zip.py
+			)
+			;;
+		*)
+			;;
+	esac
+
+	distutils-r1_src_test
+}
diff --git a/dev-util/flatpak-builder/Manifest b/dev-util/flatpak-builder/Manifest
index 575fe678dfe4..abb47751979c 100644
--- a/dev-util/flatpak-builder/Manifest
+++ b/dev-util/flatpak-builder/Manifest
@@ -1,4 +1,4 @@
 AUX flatpak-builder-1.2.2-musl.patch 1977 BLAKE2B d6e9374fcd7249c206714beb1f14f856d41576ea04cf4e27779dfc95dbef7def2f27e5183518d930ef34bf111ba4264188bef6e78169227e0f8a59d479ffc842 SHA512 a63f6df29d0045e13796a7c7b033bad1941411f84018b05479e3ffa14bada0826e891fd8e83b9e3df741c27d8954893bb85070be69e92ff3de48904746886100
-DIST flatpak-builder-1.3.3.tar.xz 522332 BLAKE2B 6b870ecdd92a7fb0eca85162a49a48f5bae83ba8a86a5e6663743e3a957240b2059e24ae7f15a9621aa784bb6d394620d58e9e9e3c1c1f5bcdac89b610e8cf3c SHA512 7b46382e559184ae57cffa082a0617013e59428b65ad064e741e357bf165029da91c8d527be6fc7349812edf8dd1e92f42480e6b0f3f6639e3cd88ccfb2bf3e7
-EBUILD flatpak-builder-1.3.3.ebuild 883 BLAKE2B 16057990b847c2ad5d5f167716c9ca2504dd15ba5addcfb5cb219c541926f54ae55f8352712f9eb40668229c9f93bd0e1ff87945dfbcad358001f9cb13cad064 SHA512 7419ee307fbfff0e934def31eb4094180001ef16322ae397d9bfef749b1cc509d536f16fcc06ebfcc7d41c788e72bc53c7d54ba1c43f15f0aae60aed3a4f6a87
+DIST flatpak-builder-1.4.4.tar.xz 530300 BLAKE2B ffc956cb60ddc085c478a3da78a2d0eb5f13e7add9d4246a316cb37a405a02e21e547ee3dd13a78a0cd1d90789ef6c0eeefdc7c2735c6c7147451997a2f38c70 SHA512 7ccc6c9cf464f1637063d2f7ca32464c81c148b50f5479a49c80fc364781ba82ab2e57135e4902f9e00dad25ac70000658c20c7e8c0a10a519eb1d3a86dad35a
+EBUILD flatpak-builder-1.4.4.ebuild 915 BLAKE2B ad60380961c163457bdd31952601b0916e77ccd0902ff014581d2a28cb1b84445b5f5afae38fa0d35dac7260fac5d2984a9a62f59f4465d4660a896775b6d78f SHA512 c103a2d99634868beafd4e5497b7bb604089252ed0b31f0500b54cd898181d6fb5f2ba3eee553b6a71eb7ab755eb7a0387185c3e9e761bd34251884b295c8a8f
 MISC metadata.xml 404 BLAKE2B 6dbef666c9bbd3347d28811890ab5b9ab1ebdf60895dc2d8146a88374a0c348706656e9758a92eaeb47bfa86f833313d669530460a1ee6ca7f81da1db542fb95 SHA512 bfb8bc1b79690c44e7e8171035e326bccc96e1df26d7fe12515e26290ef68b64f6eef1e86ab24530ea6b2c9cfc3240f1587b0d7c21686fdecf9ee8e53144b42b
diff --git a/dev-util/flatpak-builder/flatpak-builder-1.3.3.ebuild b/dev-util/flatpak-builder/flatpak-builder-1.4.4.ebuild
index 21434455c033..63c98370e206 100644
--- a/dev-util/flatpak-builder/flatpak-builder-1.3.3.ebuild
+++ b/dev-util/flatpak-builder/flatpak-builder-1.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,6 +21,7 @@ RDEPEND="
 	dev-libs/json-glib:=
 	net-misc/curl:=
 	yaml? ( dev-libs/libyaml:= )
+	dev-libs/appstream[compose(-)]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index 5f505e660e92..cc3fdd32ee7f 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -487,5 +487,5 @@ DIST zip-2.1.6.crate 107876 BLAKE2B 2e1f3f5dd3ec3911361e0b32227a0622fc40e12a84d1
 DIST zopfli-0.8.1.crate 50972 BLAKE2B 27cde48858dc65ec8082d4e0d81e2758f92d3dcc7a1c1f08aa6448e99f2995a865ac3259353b26e787f108c2f88ce3c7610413ea9d3daae6f864900d74565de6 SHA512 799e25c0cc9f0bf2119a7c03225b11ed94e7c3ac83f872a27da8ae15c90206245121c38f5e2b78fece131f5bb428f01fabbfd1b1e18ea456957940042d38f38d
 EBUILD maturin-1.7.4-r1.ebuild 12458 BLAKE2B 594759cd0026cc4e25b491729ef4b2b043f9ed8427bcee3ac308026319bac3537311a22168920d484a4b76314b94b61f14589c42dea0b9f86ca936efb90156c0 SHA512 32a83cde5975e60e1b873e73358936252e4f6b878553a2ececad5bb594ff49ceafb65f186f133238b78bf2fb812dfef11810550214275593a7f9c432c9e6090b
 EBUILD maturin-1.7.8.ebuild 12849 BLAKE2B 4f0427f2bf635264bb4bb682ba12d6d4e0e36ef0760dc210c88506d7ffb423ef9609fd2c5940479859300fcadc6bf616a7514f10aabad637544fbe536bc2412d SHA512 7bdeac94d354f1ba390eec81137f04f816e683a16b17ad22a8b2d14d20f9aef5949fc6da458c07baf93220600cc0b6328cbaa91e1f8e8213b53356e1f5ab0a07
-EBUILD maturin-1.8.1.ebuild 4611 BLAKE2B c91239c4c9458db15bd836cbbe4ed09da7d936d660171f820a77639d754367f7b084eed446b227c65d8e7c50859e6780dbdc77001b4292b96982416e35970d2c SHA512 1a4b8028b379dd8c3e4e0626199fdfba6787cd5c935421d31499ad1e4ce257cd3cd78a0e1d657629652a940c7a3e30b06447dbf1ba141c585c57e47d2a255b8c
+EBUILD maturin-1.8.1.ebuild 4609 BLAKE2B e2177e3709a92c661a2c90c273b047ad60d1abe90f548e98cc1fdc96b2c0a4731a2c717ae36898597c63b8eddb6cd9d69877bdd32d4ca6a257c59a188d8746d3 SHA512 82ef0cee43f5cb56db57cc9bf64b3dcc61c578791758173b319f202b90b3625976f5a9d0ade8528de9dde08f11ffde5d13ab7bf3610598542bb9eab7d7fc4775
 MISC metadata.xml 431 BLAKE2B 15731479f56d8b819c60e8e5541d3c4720462c5a90b199b803097b208432b18cc0143f8cbee471ce81ffeb8b54846fdb61fad083e7507f4f6c3630ac628546ed SHA512 7431db948fd5ab520fb6cae76c7e7dbb2c7aef907d7cde21189d1bb17c686cca7f69a0b84470b1c5d90f672e80d30fbb56f37beec1da04ebfdf025015c099ae7
diff --git a/dev-util/maturin/maturin-1.8.1.ebuild b/dev-util/maturin/maturin-1.8.1.ebuild
index 270a05dccacb..f9a362883ee6 100644
--- a/dev-util/maturin/maturin-1.8.1.ebuild
+++ b/dev-util/maturin/maturin-1.8.1.ebuild
@@ -24,7 +24,7 @@ LICENSE+="
 	MIT MPL-2.0 Unicode-3.0 Unicode-DFS-2016
 " # crates
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc +ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/promu/Manifest b/dev-util/promu/Manifest
index df7125b05429..bad96d1f2e58 100644
--- a/dev-util/promu/Manifest
+++ b/dev-util/promu/Manifest
@@ -3,6 +3,6 @@ DIST promu-0.15.0.tar.gz 33465 BLAKE2B 83fae1e8cf663fe9aaedbdf66d86f3d4d7db0b145
 DIST promu-0.17.0-deps.tar.xz 223468 BLAKE2B a6a77d265ae8ac158bfd96ff1f1ecf81b3481b31238a3edb5f8d4228508e334e5c6d8de03a42bf282dfd4832e1b717e5e9f442acfd9e01a4aa50495cfce27b91 SHA512 5bcfb24931f94f8ddf695ca7450d34987428ed090c1cf51025870a673d702adf07d29bd66c9e7118f615b480adcb3c35baa4d09b2e4089cc53447c6cbb54e455
 DIST promu-0.17.0.tar.gz 32994 BLAKE2B d7741d5d461af328ed60513a1ceefa827f42cadda7f51356840669ecd04563b9756cde8d29019b87531c11bd48bbc121f241d47fb9b1ee61823b0bb40fc4abb2 SHA512 8265fd0e9f37624dc1e6abdef87475b5116a7e7af260fc83bc3cda98409af78d4db9d409cd404e251cbf81c124e6a6cd5ab70eef6845ec33048da4937eac01dd
 EBUILD promu-0.15.0.ebuild 1100 BLAKE2B ed6b2f18a0da4625571705c49e3113d84b2bce9550677a9dfa20a515db58b0dcd9e83e18505de08443772da2e3fb104a7b157a35f46d4380042f27dbb329cd9c SHA512 452f2a21cef11a8796d532b642a040038d4949a7ddb0a44aa8a6bce967956b4da33027b1a3ad57a67f60b11c918540005abe9a6bcc584d598888b81e3103bd5e
-EBUILD promu-0.17.0.ebuild 1092 BLAKE2B 9c6b0531d20caef174f4427e01b9e1fdfd6ebfa8411d5456698cf82a26523343745c639670f1e5075d758fee2108d44caa1cda408b207c435cd80712335d6dda SHA512 d2be3dc063bfa2e7cc17adfd621985b20808c1c4b0fdc06aa9dded80dd4678b0ec1dd97941212a774c7ef99476023856eafcf34e9c2846ecbc871253f6d76104
+EBUILD promu-0.17.0.ebuild 1090 BLAKE2B 4d0bff8a4d103d897ad344de41459cff28211a51cd464c24edccb129601024104906f9252028f167e588f1ed5eed4c471f9deac3406b24f562fb5c9a221e4756 SHA512 c679e9c755528984e8cc06647746589bce41be0da6e07a2ef2ebae3f0588b514bc0f56f792cb9e9c1ddf6a1d1bdfa9ff5a950d5d413c4381c7e03ff3de944ff7
 EBUILD promu-9999.ebuild 1092 BLAKE2B 9c6b0531d20caef174f4427e01b9e1fdfd6ebfa8411d5456698cf82a26523343745c639670f1e5075d758fee2108d44caa1cda408b207c435cd80712335d6dda SHA512 d2be3dc063bfa2e7cc17adfd621985b20808c1c4b0fdc06aa9dded80dd4678b0ec1dd97941212a774c7ef99476023856eafcf34e9c2846ecbc871253f6d76104
 MISC metadata.xml 714 BLAKE2B e184975b8c6688cf1834a7e1272e04a97629cf744e4153f8d1b8e729eb636cbd6f62f122c84f46fb5b0ba2b0d1c5bd18dde06f94ee3d6bb75ab116904a51b434 SHA512 f5f4ac21fa934f5e5782d5d5eb0e2fa7ed9e7ea999201997c40393a832cbec98d65cca06a4784b20c0ddff3cd63bb915ff5120b365419f23f1e90dc78cce09a0
diff --git a/dev-util/promu/promu-0.17.0.ebuild b/dev-util/promu/promu-0.17.0.ebuild
index ccf9cff91854..96326724ef5a 100644
--- a/dev-util/promu/promu-0.17.0.ebuild
+++ b/dev-util/promu/promu-0.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ else
 	https://github.com/prometheus/promu/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~riscv ~x86"
 fi
 LICENSE="Apache-2.0"
 LICENSE+=" BSD BSD-2 MIT"
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index bc4b766b9ef0..5a05b4e2d042 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index cd975f44b3d2..76dc599b57db 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -18,7 +18,7 @@ DIST git-manpages-2.45.2.tar.xz 576428 BLAKE2B c89ebd25c0caf391fcd29cc8609252daf
 DIST git-manpages-2.45.3.tar.xz 576480 BLAKE2B 61eeccea65dcae72e0151459ad4a225d455fd6c57dc55394aa2e5e8f3179643f63eb64c8d75ac51ae467b8c277df2ac9777c55134efcc05805bef16019171b30 SHA512 c06b97a8f2c43c7a11355dea95e4766bc58978a70c30d5ee4af86e45dadd5be11d1ba30e1750535c067169af7b6497d2d03ae5cc1f36aff1b96a80a1f34dbc1c
 DIST git-manpages-2.48.1.tar.xz 590608 BLAKE2B 54ff646cd1d5ce93e8e37eef4682e81a1c95f99903b2d760f70e51f2c9f02378f6de5464a5fcca24c08f8327ec114cdd1684eee07fd2512af7e9615c47104a99 SHA512 b086ac89e77b1af58beff26576fb5c3a1dfe8641315ab0b60819dcf0ba9e5be4173deaa77fa1f95d8594895a583ed629c469714b0a5e87fecd36e5be397ba8f5
 EBUILD git-2.45.2.ebuild 16448 BLAKE2B eecc66b8793b6a99e40c28fea1ef68bbb25902981bf18a09d7e8f2e6c00a27133b3fc2318f9460acba64d341cf6ad8970d2e855e6c4baffc982ec8830db8d2f8 SHA512 47dd7ec8dbd7256bfcdcb810abd6d47aababde17e68343cf5941dd529232ca0ecd321c2d1aa23f17ce8bd501203d39ddfa1bf3e4bb63c84f9c06e5c76fff5179
-EBUILD git-2.45.3.ebuild 16450 BLAKE2B f306ea9240a0b1479f3849b3a18b432671b9470f4ad7b73778ca374daf689a6d82a3b956680f9aa0e5fd68d06085ab9e2737a908d150d1a5b3738067d1f03a78 SHA512 182ccd4d79ccdfd51bbbd7a548a572fc89f5a02d55955018df71d45471da20f12ce46eece03fdebd4da7235384585279befe9b3b4dee77fe2986961dc7bf8826
+EBUILD git-2.45.3.ebuild 16449 BLAKE2B 84b6f519cc48bd75bf13260def96a7f4c2e088f4730c4e8fdb97492d3912247fabed7a430aa6659a736fc7aec46d511d0bcc3ccb364e296774bf76d2309ddf45 SHA512 63164f504ef1caa2ec2d8e8b4731bba0fe839fb0660056208fba39b41b0b1cdb4ca04d3f6c0997a96cf4d78c656f6d4ba5066fb6a5e0b65e28804302118bbe19
 EBUILD git-2.48.1.ebuild 11872 BLAKE2B 92a624df4df88a3643f8195d05e22cfbef5a06b65f9585b1f5321fb4445aaafbfbfa0671aa618ebe7c05ded4c2d494e876e87cc4f49c6b60118ce5b66e2cc711 SHA512 75275bb877781c96fbccf0c590d3001104137ee4683de16a6f5e8447e73adbaa867ae50bd70fe73e9ac28eaf83992abb03a3d7472ee59d5a4c536df2d86a2f06
 EBUILD git-9999-r1.ebuild 11872 BLAKE2B 92a624df4df88a3643f8195d05e22cfbef5a06b65f9585b1f5321fb4445aaafbfbfa0671aa618ebe7c05ded4c2d494e876e87cc4f49c6b60118ce5b66e2cc711 SHA512 75275bb877781c96fbccf0c590d3001104137ee4683de16a6f5e8447e73adbaa867ae50bd70fe73e9ac28eaf83992abb03a3d7472ee59d5a4c536df2d86a2f06
 EBUILD git-9999-r2.ebuild 11872 BLAKE2B 92a624df4df88a3643f8195d05e22cfbef5a06b65f9585b1f5321fb4445aaafbfbfa0671aa618ebe7c05ded4c2d494e876e87cc4f49c6b60118ce5b66e2cc711 SHA512 75275bb877781c96fbccf0c590d3001104137ee4683de16a6f5e8447e73adbaa867ae50bd70fe73e9ac28eaf83992abb03a3d7472ee59d5a4c536df2d86a2f06
diff --git a/dev-vcs/git/git-2.45.3.ebuild b/dev-vcs/git/git-2.45.3.ebuild
index 505466c9bdc8..c56d4cad545b 100644
--- a/dev-vcs/git/git-2.45.3.ebuild
+++ b/dev-vcs/git/git-2.45.3.ebuild
@@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index e9d3c3de0c9b..f017ba52d367 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,5 +1,7 @@
 DIST tortoisehg-6.6.3.tar.gz 8857342 BLAKE2B 166d1305ed3ee54496b3e0b08fc92a34a56a9398aa618a0f2266e7413fafc371be3c308debc3260a15b59c147a00bbe0773df52a838c4a4f0028b29c1cb05090 SHA512 8de8a68a753e8554dcb9936f6ba237e0598df65e6039f7c608e692bc375258e64a443e27e63c337f361fc32c0076b79bd98a972c220089902ff4489ab3507928
+DIST tortoisehg-6.9.tar.gz 8862668 BLAKE2B b7f917a8c9f0ca575e27ab1670bfe940e6257940691c53fca464b4012417283c9915fe5f604b0c1a5cb7f620ce20b47e945bb9e88b301f7ac036c19fcb4508b5 SHA512 f9f7ed9c3a1cdf633c453a12c7f68505027975fbd858c4e9cd4ce09920126f22043c1621a5d949391d31a9a13331cee2466d718635aa16dc8558bac5536d14fb
 EBUILD tortoisehg-6.6.3-r1.ebuild 2416 BLAKE2B 61514cd0fce00d9a17db587de5fc61414cce2ccb76aafebba9a91d865018d34bff7f1f3dfa6c6b861e077fa0af575af0563004d6a55099c0aeb14ecd752d4160 SHA512 9909c2a0cdc5ba052ab2c557dcc8b40df4acfcf476e04cf023a35d247f42334c1c0a8c39db5cc65b48013f185507d64f8f2931c000981140fcfbbce2b87e848f
 EBUILD tortoisehg-6.6.3.ebuild 2356 BLAKE2B 56c0810624324e045c5c265369379f157d39927b2bb07ee96545b010868c07af3a93cb87fca598fa728d02840ff7965ec9539b95eaec11bfe7c1c602a7e7d80f SHA512 07e43187a3501ffb540c71273e1093e89dcfc0ec895af6044a8b632fa9da348d0f09a0cff543537ae53be1382d71dd0f76726bdd50b0b661f7e695be9f7ee1b7
-EBUILD tortoisehg-9999.ebuild 2416 BLAKE2B 61514cd0fce00d9a17db587de5fc61414cce2ccb76aafebba9a91d865018d34bff7f1f3dfa6c6b861e077fa0af575af0563004d6a55099c0aeb14ecd752d4160 SHA512 9909c2a0cdc5ba052ab2c557dcc8b40df4acfcf476e04cf023a35d247f42334c1c0a8c39db5cc65b48013f185507d64f8f2931c000981140fcfbbce2b87e848f
+EBUILD tortoisehg-6.9.ebuild 2492 BLAKE2B 45b85c1013ba2f1863fc48464e5c85926e177baf0a9781c62f2f92b32eabd35a13dc41b6270165e8e3d8e3b1636ac42d8a943876f8395e4b7c5144dba8a8b676 SHA512 98e6c79fa408d883dad55f33e5347d7af16184ea15a04862654c4598dc14cc5d2e86cb26c9bd7115219dc7766830de054162cddf681014b5bc8bcf2cc8299d91
+EBUILD tortoisehg-9999.ebuild 2415 BLAKE2B 03830dbc5c2590f87c011ab7387f461578e3278fa6d0cacdabd1baaf190f1558af5f204ba7dc27ec2c1e81cddfa7d16e9ee61528bbd5e3d7d2d7602ca9afd2a9 SHA512 75832fa375b6cc6af35c1c77f81f497e39cb4f82b788f06968c89e4488730fa0859db282033f2eb428d3ab3c7934a1865affa23b831ce9d7d486f8000cc57f56
 MISC metadata.xml 805 BLAKE2B b09f8454c68278c180c84a62c54410909d731307058fcfb973d48b304269ae4eac6d4e61d4f04857813659029869097e3ba5a4d2bb6fea698797b364ba588cbe SHA512 33aa011e53112a7e1589205bf563fefb3db2cc931f4643a03abfc6baafd1b57c59a4f712814dfd3e3e1eb6b299fb34af53bcb2d1c08accaed6989f23b3e41acc
diff --git a/dev-vcs/tortoisehg/tortoisehg-6.9.ebuild b/dev-vcs/tortoisehg/tortoisehg-6.9.ebuild
new file mode 100644
index 000000000000..026b203968d8
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-6.9.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+DISTUTILS_USE_PEP517=setuptools
+inherit desktop distutils-r1 optfeature xdg-utils
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	SRC_URI="https://foss.heptapod.net/mercurial/${PN}/thg/-/archive/${PV}/thg-${PV}.tar.gz -> ${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-6.3[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-vcs/mercurial-6.9[${PYTHON_USEDEP}]' python3_13 )
+		<dev-vcs/mercurial-6.10[${PYTHON_USEDEP}]"
+	S="${WORKDIR}/thg-${PV}"
+else
+	inherit mercurial
+	EHG_REPO_URI="https://foss.heptapod.net/mercurial/${PN}/thg"
+	EHG_REVISION="stable"
+	HG_DEPEND=">=dev-vcs/mercurial-6.3[${PYTHON_USEDEP}]"
+fi
+
+DESCRIPTION="Set of graphical tools for Mercurial"
+HOMEPAGE="https://tortoisehg.bitbucket.io/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${HG_DEPEND}
+	dev-python/iniparse[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pyqt6[network,svg,${PYTHON_USEDEP}]
+	>=dev-python/qscintilla-2.14.1-r1[qt6(+),${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx doc/source
+
+python_prepare_all() {
+	# Remove file that collides with >=mercurial-4.0 (bug #599266).
+	rm "${S}"/hgext3rd/__init__.py || die "can't remove /hgext3rd/__init__.py"
+
+	sed -i -e 's:share/doc/tortoisehg:share/doc/'"${PF}"':' setup.py || die
+	sed -i -e '/^testedwith/s/6.8/6.8 6.9/' tortoisehg/util/hgversion.py || die
+	export THG_QT_API=PyQt6
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	${EPYTHON} tests/run-tests.py -m 'not largefiles' --disable-pytest-warnings --doctest-modules tests || die "Tests failed with ${EPYTHON}"
+	${EPYTHON} tests/run-tests.py -m largefiles --disable-pytest-warnings tests || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	export THG_QT_API=PyQt6
+	distutils-r1_python_install_all
+	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
+	newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
+	domenu contrib/thg.desktop
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	elog "When startup of ${PN} fails with an API version mismatch error"
+	elog "between dev-python/sip and dev-python/pyqt6 please rebuild"
+	elog "dev-python/qscintilla."
+
+	optfeature "the core git extension support" dev-python/pygit2
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index a18ccd3822a5..888aa2f9a021 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 DISTUTILS_USE_PEP517=setuptools
 inherit desktop distutils-r1 optfeature xdg-utils
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~arm64 ~x86"
 	SRC_URI="https://foss.heptapod.net/mercurial/${PN}/thg/-/archive/${PV}/thg-${PV}.tar.gz -> ${P}.tar.gz"
-	HG_DEPEND=">=dev-vcs/mercurial-6.2[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-vcs/mercurial-6.3.2[${PYTHON_USEDEP}]' python3_11 )
-		<dev-vcs/mercurial-6.7[${PYTHON_USEDEP}]"
+	HG_DEPEND=">=dev-vcs/mercurial-6.3[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-vcs/mercurial-6.9[${PYTHON_USEDEP}]' python3_13 )
+		<dev-vcs/mercurial-6.10[${PYTHON_USEDEP}]"
 	S="${WORKDIR}/thg-${PV}"
 else
 	inherit mercurial
 	EHG_REPO_URI="https://foss.heptapod.net/mercurial/${PN}/thg"
 	EHG_REVISION="stable"
-	HG_DEPEND=">=dev-vcs/mercurial-6.2[${PYTHON_USEDEP}]"
+	HG_DEPEND=">=dev-vcs/mercurial-6.3[${PYTHON_USEDEP}]"
 fi
 
 DESCRIPTION="Set of graphical tools for Mercurial"
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 1e18196c3fbb..2c009188a9c4 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/commandergenius/Manifest b/games-arcade/commandergenius/Manifest
index a65135c9dc50..c2e0e3ba0331 100644
--- a/games-arcade/commandergenius/Manifest
+++ b/games-arcade/commandergenius/Manifest
@@ -2,5 +2,5 @@ AUX commandergenius-2.3.1-build.patch 451 BLAKE2B 5c82e9919262fd55ec89069c55de2b
 AUX commandergenius-2.3.1-paths.patch 528 BLAKE2B 0d3362d1f5099206a352c47c8625fc8bf7c5bcc371576340209eb4ef978c9cd7dfe0d13206fa2fe3f25dac094fd93e33a957d942a432080c77d50bab21b0a42e SHA512 f447166227566fe914c3d50f6f8c7b1dab6161b9ff633824c8feea0cc441872cd6245572e8cb2929a9f8345c0b8592cd3b3a7d77224ed9f5bc0076d82415f66a
 AUX commandergenius-2.4.0-gcc13.patch 755 BLAKE2B fa234216b53ece9db710d31fb1d616ef462c68051a07cb376a354089b0f4e106832d23b38e439fd089b20097cfc34fb0084b65293973f3a3f0ad7d93794cd869 SHA512 7bec5e8a7619add0a92b237f1cc4cf24b802a5b0185fae13a8fe543d0b7a36009d1fecbeb66122183f7ce6c393836b94e1748c912a994e34fd09444bb06ea4b2
 DIST Commander-Genius-v2.4.0.tar.bz2 62351265 BLAKE2B 0a3338bee2e494f415ce5072978f050766fff16e5df5e7b27824fb4d4c699d2e5a690924f339189325383bee273cbfa5424f43aa9dc87ae4abf63c7cbf1ea6cd SHA512 76eda96fade00d164d3ea5b95acadfb28a3b24864a5ce3f2c9317837a1027cd8d0282a474b8d25bacc26008a26a6adc5062ee655f9abd350d44db58aa70d3b3b
-EBUILD commandergenius-2.4.0-r1.ebuild 2409 BLAKE2B 85130227b1010e8a990d748328c6e1735f1a548cc48a2d7adb287ca715f7bc09dfc30171503679508974c6f0c0057dddb8e9ace05280954cc4058eefd6154ee4 SHA512 26f1048c0b1636244e3fbb40d3f51c3d2793fe6afdf657958475fe0f34ac4d91840b81f19e7f71145a2a2edeff51ee77804f647fb13e2a9fcd385ea3e13558ca
+EBUILD commandergenius-2.4.0-r1.ebuild 2421 BLAKE2B 8553a7ee4276f17d4d39979cb268ef92516d8e9317484b21b18849510efeed23c03e1e6c8af8606861f3a65331e0a9627a1209f42b85ea492b91ff4c2656c0d7 SHA512 9ebed44d791c3d3f0efe3c0575f9b3eab1ab3d7fde0a057c04dbd8612e25d1e77f9d588c54e4f4c722103981a7de21975af822a038e76dd9ddf64107d47cd016
 MISC metadata.xml 507 BLAKE2B bd158aecbbb8bf56cccd4564dc6a0d2e615e6d54bce9c0a4d826c42905056199256f7b03ff2c720a6c3c1543d983375dfa18769e299415461fa0262160735b8f SHA512 e4ec4b7b99da2d83d42450f552973a899d3f637d802658b2b90b0225f4087ee05acea913567a86777c7e96379af5d6282c935a9ec754d5ef57626feb1aab6836
diff --git a/games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild b/games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild
index 5d2aabf22c41..e45c058091d7 100644
--- a/games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild
+++ b/games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 # note: version >=2.5.0 switches from python to lua
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} python3_13t )
 inherit cmake flag-o-matic python-single-r1 xdg
 
 MY_P=Commander-Genius-v${PV}
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 0e13499cfaef..b1669b5f18ef 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index fd549c8798a9..84bfa71c0753 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -17,7 +17,7 @@ DIST minizip-ng-3eed562ef0ea3516db30d1c8ecb0e1b486d8cb70.tar.gz 770054 BLAKE2B 7
 DIST tinygltf-c5641f2c22d117da7971504591a8f6a41ece488b.tar.gz 5903179 BLAKE2B 0ef4b36cf26f3a5a544d0c739317b8cce041121b1dec58d1d9dbc3bbc892df284d80aa4c45ec1ebc332ba96b151230a5b0dbf95b95aefcf86ee7878c393eda5d SHA512 486bcf32be137dea5746117074dc51bc978290698de7831e1c4bbaa4acb56ed99fc34c38e69878a955b3e5f10f43eab07b0637164f822beae0fddd099aa0c56d
 DIST zlib-ng-ce01b1e41da298334f8214389cc9369540a7560f.tar.gz 2223118 BLAKE2B c79a138c31c74c291ae38a6c4d8983e0884169ced4147d7242d1a766f70777de0368ceba815ac2261bd2543dba55a6106b70f7e040fae4f200863da217f88978 SHA512 73f4e56410ae298ef211ebab52b1a0d3d5bfae91c2de3cd294b56cd0a78ab50e1203b396c7df462f360c1aaaa9392ec5625473d1e9eb084cc64bc813e28d12a1
 EBUILD dolphin-2407-r1.ebuild 7928 BLAKE2B d53bf2b8ad7adf794903b594c44c95af502e79129eaacfde4de7ae2db5eb6bf5cf67b8469226ffff05e3c49bd1d63e81fe8453c325bd2c6937fc2f5d3a1c6230 SHA512 9fca29451fc209ba148a1c8dd0b37be50f81a183f4d2af9409ff12af36146db12010953de1ddbf57f4ccc591c4bc6cf869dddecd53067d0963724af5a46d7065
-EBUILD dolphin-2412.ebuild 7839 BLAKE2B f2d0fac389eaf87117e580531259a22a3497257b60f0a6e395c39e75581da5ff0acbcb67a773c202d622ed6c195eb5c0c5952a7acd6d753e1e02af5f7863b87b SHA512 3a8c9686847dc27dbff2eaab5a0ee2dfc6dbbd9c4386f51b718f8991e4c3fb6740b9387158d26e11bbf430a096c5b6a0e688e3c55eb3c7527cc82114973ec933
+EBUILD dolphin-2412-r1.ebuild 7848 BLAKE2B 311654864fd94b9fbe5585c283340248ab75cfdadcc46a4e2819de9368082c9a3e1620c10383f63aa3024ab12cc2b8bf90e52ac89ccf542bd83bf30c27814780 SHA512 1e5414cb43524ffb23dc7d8289a7906a36432af9245d88f9e4fd2c35baf7b3a3331fefe5676a72375a072c62ce61a8a6eb904b2f2a27e9d3c63b4109739620cc
 EBUILD dolphin-5.0_p20220520-r4.ebuild 4980 BLAKE2B a28dc886b7061805c0ee5fed1eb5a8311658618137982a523f5cb9e3472aeea5354ea6349bf6ab57cc36cb7a470d45f5da8d957611b7ef9f724c49386bae75fc SHA512 6a9b1a6eba7a82329fcfd38c60daa562edf34a590b9118d977e3d417ef32fe20b913c0a5b76ec8340eb8513bb5337141cffd870f4f64d1da6c2899dcbf1b9319
 EBUILD dolphin-9999.ebuild 7718 BLAKE2B b7fd8abd6607f1d18440fd4100cbb72abd008e8aedad4c0c11de63f277abbd71382eafcde85350633e80f005b159f3ef21ac82c1848fdf5799bdbd7ea94628d4 SHA512 c0516b784832130fca6a4f9937ca84bc46890d9e65e06ace6b1a8eee1add86dec1bb865f319e0cfb7462610edee9c72286a84d0f157f70605534fadd2d843932
 MISC metadata.xml 1003 BLAKE2B 29d426769469da0b23975299b97d310f962b1c3c18a765389b47b8361821014f45b068991b1b21a57344ce34815a1ce609e6c552ed992eff9b84045b74872e41 SHA512 50c546c0a35693c1e1c3d8b53e697e19fc675dd577f6803abe04b1348e08576b0e79640e6978b31484182ecc24cc42557b301c90e2cc31b9c3ead055fdc21458
diff --git a/games-emulation/dolphin/dolphin-2412.ebuild b/games-emulation/dolphin/dolphin-2412-r1.ebuild
index ed35d8d995a4..c93526544485 100644
--- a/games-emulation/dolphin/dolphin-2412.ebuild
+++ b/games-emulation/dolphin/dolphin-2412-r1.ebuild
@@ -101,7 +101,7 @@ RDEPEND="
 	llvm? ( $(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}=') )
 	profile? ( dev-util/oprofile )
 	pulseaudio? ( media-libs/libpulse )
-	sdl? ( media-libs/libsdl2 )
+	sdl? ( >=media-libs/libsdl2-2.30.9 )
 	systemd? ( sys-apps/systemd:0= )
 	upnp? ( net-libs/miniupnpc:= )
 "
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 6ca58590fb78..62fad4ab19cb 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/ponysay/Manifest b/games-misc/ponysay/Manifest
index 60b59e6abc40..0d565c27d20a 100644
--- a/games-misc/ponysay/Manifest
+++ b/games-misc/ponysay/Manifest
@@ -1,5 +1,5 @@
 AUX ponysay-3.0.3-pr313.patch 16799 BLAKE2B 72f32e2e0dfe7829b313a500fdb7cd30a2630721431c603d5005d985b78baa7d4bcee1d7a9dc0b0bc262c7fd55f72e1e1727befdb165af324e41812631bd802e SHA512 06e62dde5b4c1cd3245f7a0ac0b6d0272ce6a458c2468c39a25a52aac89e96ff363f66041e6d5360c96a74dfb2f726f764258f1e634a3fa97c6f3b8c963d32d1
 AUX ponysay-3.0.3-python-syntax.patch 1584 BLAKE2B 5f13613d7a43df44662ebe9d6cb995bba3ee8629cdf45546e895bbda64bea03029db25d0dc75c2263f77fd51c3b8d2d43f5aa7d48c02089b1413f191e7888a29 SHA512 d28d85313881e2e48c3648db0f99686a2d5facd82cb771219737075043d162047190a4e7a9cadac15b20c6081add90029535e8b1e17dfdca191f6d8e994c25ed
 DIST ponysay-3.0.3.tar.gz 2139074 BLAKE2B 3ba477268d68ff9a92bad8028d0b960a2a6152057146368723fea432100a71517c0c343d34b2b1c580fcfa1945bdc273fed276cf4a10c702514e6699cda87a2c SHA512 d6ff905404192bdc207952a4a914458d7f25ddcfcea95763ae277a2a3bc7ab33e86a0a229c1b10ff7295b7a89d6e1b61406feefb6bdf9026f4076d0ed70dbe93
-EBUILD ponysay-3.0.3.ebuild 1573 BLAKE2B 9d2e3d5b82d5037683251d6641699cf90c2cef438c1674a4d22a3e8f9f3c6bf909a9515af43feb7e3ba4d6725369e77579bcb62f9648d93c3d7d90c1723cfc14 SHA512 6568993a8922966e620c9cfcb10cfea79cecf47397e19e9fadf5e18c85fc3bd2d4f6c4c63a9b84eb5981f1ece2589294ef2fe7fe77ef4f93d0c615161e6c9841
+EBUILD ponysay-3.0.3.ebuild 1585 BLAKE2B a788e2923669795a0f24cf7404de1da0f9cc77a5a5e685322ef1e23d1370824bf2a8c01fededa68f9e29683c9a613a10c396846519f2ebfc7d40f9dfdf1039ce SHA512 0804cf55d9feb045e58ceff469f244c496be11ff05d75d6fe07d57c9745165275217893c96e2517fe07daec9c9670843beae3005492343835d3f055c2ffb7130
 MISC metadata.xml 501 BLAKE2B 635e60befc4dd4592e1b31c261eeefe207ffc41818df2c5fdcb04d775d35522a9513a871d1e1066715dd87373e259cd036fb5523d81c09cce163a0ec776c3cc1 SHA512 94c2a5bb13b2ee021c02489199c2decf82fbd17ccfba999a0ca80437271516c8fc41cebf6aab56332ddc43e75a5b22734333ecd7ade4ab484f3d16221578fa55
diff --git a/games-misc/ponysay/ponysay-3.0.3.ebuild b/games-misc/ponysay/ponysay-3.0.3.ebuild
index 8c803cdffed7..9a1b444b8a9d 100644
--- a/games-misc/ponysay/ponysay-3.0.3.ebuild
+++ b/games-misc/ponysay/ponysay-3.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} python3_13t )
 inherit bash-completion-r1 python-single-r1
 
 DESCRIPTION="cowsay reimplemention for ponies"
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 602220ec4bac..5bd27378e8a6 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/railway/Manifest b/gui-apps/railway/Manifest
index a50e0381f227..8ca964cb0d34 100644
--- a/gui-apps/railway/Manifest
+++ b/gui-apps/railway/Manifest
@@ -9,6 +9,7 @@ DIST anstyle-parse-0.2.4.crate 23069 BLAKE2B e80bd81e351326a222238b3f559020a2430
 DIST anstyle-query-1.1.0.crate 9832 BLAKE2B de106e289c874bca806214e275647415bdd02e2878f3a80e7d337cfbcdb755d8c182b2879371f00f5cad97cdf68224ac11ca41cc89ad7ab3929f854a9f9e76a6 SHA512 321ddfa7b090142116c96bc8c70d81cec3e816922249ae0f07389e2d1b62c8b40636675ccfdfd23d52e29c162ae7d929637dfc7d697dafb79e596d04eb8cd90b
 DIST anstyle-wincon-3.0.3.crate 12179 BLAKE2B 37793975a05ad60bb2b670c208db11c5cda8a2a456242cd118748709d0a220b541b6f088676eccd19870cfb8f910d4aa1e7764393785a6db0531af4a3ffc8047 SHA512 55217c65fc9ec674e5b4dd70716a221bd108b507dce9baaeb542f0e0a47027ec7fe61f9cd3cccfda43e4a4cd785b42f13400daf89884c32d3768e48bdff2d179
 DIST async-trait-0.1.78.crate 29593 BLAKE2B e46d11867e564eadfd6cccb994878c911c0c8a33caf799ea0a0900a3e9ffda91d7989c64a2c1ef4953a7f8b27a744976434a6673c131716607cc672f1ccc1333 SHA512 67c33065f1702fa4a3abe979650938d954cab93029f7e6c9b4b70b549a7f2ae3d6691a07a36cd7a64854603fa86c9eba5410bcad06881b4ea28453e38c781ef4
+DIST atomic-waker-1.1.2.crate 12422 BLAKE2B fc6632f3c9d719b1d24a1c8e05947d94028909d1c629b80576e176e567636dd4cca699c7e91cae2df63541da574146b3ce766374e93f0ee429bb5bc89a4d3cae SHA512 e07e58db7955791259d0ec00fc4d53318aefb4506e062914819c4220c6dc75fa11a7af0289b4653aa1f9041eb975a025635190de68b4800a0e91e33cdb0ba11c
 DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
 DIST backtrace-0.3.72.crate 87877 BLAKE2B c4b4736cb9728e3c1b1d9035528abfd9b989b7fc42b7a2d68eb8fe802084f888d281624233dbd942c08024b35affee6488bb7ea859d8faea65f2ec191c250a56 SHA512 b0bb4759b56cf0953d933b1fdd4b597d10ba1e6c0f7fd4b6504647f9c996644cbf6b473e49a8ef4b85828cfd05ffd68c3e9356b509812c0935f15f1a6dbf0018
 DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cbfa2b225ec1d1602e4af14cd470c969e8b7049117e6fc51a5a24e06b1d27bab844486ecb76409d12e0581d5d SHA512 c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9
@@ -20,7 +21,9 @@ DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58
 DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1
 DIST bytes-1.5.0.crate 58909 BLAKE2B 2931f19e813eff73be407677622fa29e45f9b49434d5b3a04104b56563fc0e941fd8c5f996258a1aa660000ef014668d70b683b751af8e48d28d0aea76890c92 SHA512 6654cf41d8f0d7e19b05fd95044b9a3bfccd81f469c797c6aa763a4dd29e1b34064bed2e094548d147045cca7bc4706059de5bcf9f6579189e6068fbbf1c29a3
 DIST cairo-rs-0.19.4.crate 52285 BLAKE2B 916e3e4ee7df5c8601d298fc82dcd86cdaf869d1efdc6d0b2e52c5e860a596fd219e920a9bfcd44006d6d9a7b2e50097357a3f2cd9c085f0e622c0c516fb66df SHA512 332c96fd2b15994175eea9a04c21e0fd988b668d5ffca598b13ec597dda2b361aa92f166478a60f7a20b0aaa5df9b4a99110c6c6528f2dfe5b9a5c7c683a7e50
+DIST cairo-rs-0.20.0.crate 52332 BLAKE2B 19bfb8e31e8765dca374baf68113f95a0fc9c10505a8043cc19ed7e314506f87e2db6af23e5401c1da2d9b7739163c49953a93e6a73d6c684bf4682aa453e17a SHA512 172dec98dc76fbfc08a0ca2a5ab1f27ed13589505e41b0d4c0536dbdc1eee9ffcc029c682e59fabf6519bd7257c79e9b71521fd3c683af6e16239bc231f4e771
 DIST cairo-sys-rs-0.19.2.crate 11874 BLAKE2B 7c808030de1b61b6485078ac0aa50a3b3c7070349f35609df80d1efd9a07a6b6a5c35b0cb8b4444931701d7484a818ef6fbbaa6ea5f9981836c4aaf656c5539c SHA512 98a385b7b89e2c2faa87745806a89a2cea929cce9d12b1ed5f87e09c41e6b6aba587cdba0db1c2be886535aea62a2488317804dee76f467847823812a7006086
+DIST cairo-sys-rs-0.20.0.crate 11875 BLAKE2B 54e3f2e6ca3d8bb52fd36f085a4a28968f44dfcc76a2d31fd114a07fd5379b27111c9cb6d727ad7edeb4c72a9bee8d2de2d800d0ef382108e2376b4f875ce53a SHA512 e32181ebb9f6a6ce41311b40ee27cf02c6c0974f9c87727aaeba6686403a976ee74f6a23f97b89678b362e03241e251b63c4c3adae0ce1ea60389360512ecb7f
 DIST cc-1.1.6.crate 81585 BLAKE2B 412ef9d62c32a42164f8c2b827c10f0d41e75faa77e6d1dd8515ff5ec43abd1da75bbb400460a43a252c93dd0a597c2e44c8e899a376d963f0d3727db7ca2c24 SHA512 ea8bd8150042268092360e6396226ee5e83ba154eae99d299c897ed16e8543fcfe3179e22b50b0497bcf065a16933f4ebf7edcae7e6fc8be3788f0ae7f61c000
 DIST cfg-expr-0.15.8.crate 42108 BLAKE2B 846a67059fc30e8c1f70d8b5495443ca0ed373a333d394b92d79981b415888a2f5c745a028e702464bcf68765667c35513e51931b84d9d081873146a0a4edbd0 SHA512 1077d113dfe080e0e78e25c40f32c9f14988d2dbb76bb783ed3e8ce13c58e5dc0dd549362d2f197b69cfbffcfa3ebed385a0247f5928dcff8be7d0b055be1041
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
@@ -33,86 +36,148 @@ DIST core-foundation-0.9.4.crate 27743 BLAKE2B 5b695e671cc833170bc6bad436b2d0d8d
 DIST core-foundation-sys-0.8.6.crate 37629 BLAKE2B 683d5a84b6a3816317f87359532a8339f08bb4043f1d70a8588636eb5dbe6ebb3843e2a12d9a7e5fd1637a912c52a5aefbb8d44796330b09593e7adefd3babd8 SHA512 24a8958cb16b081862a9000affb0147b8b3be1a664b834c3dbddbff03e709de3f4060ff4800e5a35453f4392ccf33168e8b864be71b17be38cb264a39b915100
 DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
 DIST digest-0.10.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c
+DIST displaydoc-0.2.5.crate 24219 BLAKE2B ba3396c93d27a99a92ff4a0f01a8d192b419bad25e48d9427b76260ebf2f9982291d77f2eb24d239c0b1fbb097e866a20bc46dc1879fdfc6637ea49928444a92 SHA512 5ca35fa59f263162389c1180331e9df607d9374bcb056cb04bc46c98e4d87277162ddb2335ffa8a8c5f69218abc3eabccdcaa71c21b8dd9081cc4146f266b948
+DIST encoding_rs-0.8.35.crate 1381050 BLAKE2B 2db6797e4f226b3836c18496ed77f3fb113fbc075864fd264f23c4fec8396eb3a01c439985ba0586a4464ac4043ddd3acac80e0ecf897cb59569e5065ce2137c SHA512 4b55b53553c5cb6fe05ae81d1c6f3b0bab73ecd3d426b15c58b9de9ea8dd61617bf0bb2e6d3ae2514c7cb6e73019b1a083173d1423b3ece2d190770c597114c4
 DIST env_filter-0.1.0.crate 11553 BLAKE2B 8e358517c0aeda431239f14610925bcfd6be3bd346c7628e1818cdbaa1796bfdf2454db99cd06bc6ffdca95e7ff47c0a621d1f4c3bb50ecd1641f9d19efe4b4d SHA512 a0ab51c2b905466d23c75fd77b430dff2956556b7687ea434050c78a497cbe63018c5730be950724c0ca6aefe29bbc379ac01c8a7cd2779a69c5a03e92a21bf1
 DIST env_logger-0.11.4.crate 30529 BLAKE2B 35426cdef8a4c578c886adc72545aecbed964e6a108d0eb247804a86f50adc86b6ac4215732cb00142d3354ef6237ddf187dc29245a276039f08e78329795783 SHA512 7bade29eb9e4dc3e2960cc2ae91547297b2ea4369844aef6ab767644ccb983abd2fa811ac43c903c437a0fe03826a9f59121d5851229ca96ae6c0fc3ff493c05
 DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
+DIST errno-0.3.10.crate 11824 BLAKE2B f9976b538868daba3cd2d47ff2fdcda16b4a436ca767f865f23d1139e7f232aba263dd4aa38d573442c762999c8a8beab8a4a8c10649d21b49090fa65ced1ec7 SHA512 fa4b9a368f254cd90c6f69f6883af4c579829a6da6f31481a1b527ac9602c8ffcb5e9518cdc32c39b5589c151a20e75a7300c8a907d178346185ecc6e8749f3f
+DIST fastrand-2.2.0.crate 15031 BLAKE2B f3fe05ed1acfda1fbca7ebe3da2b26d05a35ab782db693ca58737dad537c53d16142422a04d2d55a6f9fa9a76abe4454923d85f6948601394f39cea5c90e835d SHA512 de2835aee8d5380a6e1c0f627a876594626e1379f2f7dbd3ad0f785d7c3f3f82162c9c20a68417324506f78264cb9dbcfb2d4d5dc9ca666996150979738822e4
 DIST field-offset-0.3.6.crate 10032 BLAKE2B b4b43d35f793c55e8c521de7bc1648501cfe46494fc17d0b6135ba3456c8d72a11b422a16735c681c7c6542084652c119661372628096d61197f6e387b66143a SHA512 3ec99bf5e860dc68f3fcd0abd2b0de2ae0b3174eb177458506aabeee9dc7b0b8b58b925e2c6108a8f18ab95f2e1952dd9474650a639e1c1d50ec3f72bbd30077
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
+DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
+DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
 DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1
 DIST futures-channel-0.3.30.crate 31736 BLAKE2B 57461dbb723fd53daa07b2fe6164125508cc3901e0138d2a60da5c814ade415a3611baa45c71487f1853812282ef358c132785ff40c630408e8544d57eee3483 SHA512 689531748821529c528772a6dd0f27362078ff5803d2e0b431ee5a0ecf8787b5a15262d65d52f48486ded46b88f7a9c477ad95cc2c5a3e8f5f9b9f53f367832c
 DIST futures-core-0.3.30.crate 14071 BLAKE2B 76a9fa5aedd0d4ae8dd9db9639839b6b342125759c1b9f9bbf58aacb4ecca316ff1f24ff8f3c15f559ffbf974e4c2cd02a5418cb4c4d7612dac8449c8234eeb8 SHA512 3c7259ddacbe02e47a84178b75e5f13523bd0c8f8bc0b2375f7ecca60b7075695ee0a5cc4e1c1de26665cf250271173be803661e2f2f53e2a3b96380a8efe7c4
+DIST futures-core-0.3.31.crate 14318 BLAKE2B 613d16e4f18547e45ed0dd56a7b908306393e479c379ff64f358844eacb1f8d37008ffbbfe6b1a4ed184e501ee9214db149d9cca31651b7d353ab4a99c8f5ee1 SHA512 d2f4c2476c4f480f724a880ee16566fcdd545579d3cacd2f16745812eed9ac4a7a88d59d4a38b163ef466c6f6b612b9cb06308a09d52256506a8a90e358db935
 DIST futures-executor-0.3.30.crate 17744 BLAKE2B 927abec40eab31251409149179baa95a8d025f9cdb848afa83f95439c4768abbf6da8e2163291a086ea0b83b0b650d1e19cb8e15f70369b70efdc70eb3121f6b SHA512 fa65c038e5eeee695b2673cd65cf7529713bef47da373290595b554bc287267ee5cd015ddeda5a22169cc8828717987364584a91a69685cdbfc0fc779abd764f
 DIST futures-io-0.3.30.crate 8910 BLAKE2B c9af4290f45a9fd0839e107fbdfa4abff4f9077ff45b61054670419076f1c4508d7d560d4d86f8cd7ce146e436e531b9f5e0abfed2c4f2406c57be209cfdd498 SHA512 077acf5eab1101917b5b4b4b83347d30d533110d9a34c2de6db1411ffae0f0530f457033c5a5c14249119e89375c9f12127790b46e486dcd003a12a6fad48bc2
 DIST futures-macro-0.3.30.crate 11278 BLAKE2B 6311039db4bd31242e4f45bb7c581bec28eec9da850c47ffd9235c4baef5e5f1c72155f49573b2dc942a9cf246949b79c7d35200d04f91a13b0205cbd33d96c0 SHA512 220b5cc61c744617479d7e8ef9888785a17b9bc26c517c9c4445a39e8be21f111f77e53bfb3d143df18dfde23feccee17e349a84b897eb4d86f94d7ae4f714cc
+DIST futures-macro-0.3.31.crate 11341 BLAKE2B d91ace97b854cbfeba1df90468fabf6313721ef72bb408ca6bee1c110b0162fe91da18d371b628513644f9d3956540d93c3e13bc9917550338f797967acc3967 SHA512 26c45dd8c037831ce3c41a326ddfd581784c2e7aa2805ca4d93b91e439f4d8c078293cd328bcd66d0283cbd5a14724bc624ec607c343d15193b00bd644b86166
+DIST futures-sink-0.3.31.crate 7958 BLAKE2B 7d42180cfe19ae42e2ff486d83ed46f3aaa4b333256d4c30c5a2ce0e0d0b05ae93516b029e6d07105b4296bf23ba29e6fcce19f0e38ecf59b53c6ec9cfe2e188 SHA512 79a57dbee5cfe98f2c003bd463d252648743f70d13e2054af072978b758c7cb8e5fb652fd2f36c760df358ad23d2893cef24ca6ae3df44def28f1d39bcf348a9
 DIST futures-task-0.3.30.crate 11126 BLAKE2B c2ded9b9b709fc10c44cfeaa72d4e7477e43331b14f3e72433b25126fef93f2812a09b4fdc3c246b7379d41d3764ba17fa87c3e9c131095864cbb5f54771a204 SHA512 c190fa0acf7ff15fa67fe172911cfae803b2a8c08168570a5518a40767d08134f147259a413ab25c45cac5dbf2f601a9753c77ab0eb2c180cad2fe48cfe3867d
+DIST futures-task-0.3.31.crate 11217 BLAKE2B 8c0e0aa0aa14bfc28e668af00a3fcc2532950ca865a9f3935717a4a3770cb60477cd8f4cd080675379315b649fbdc5fee9dce49502f0f24f44db481a24c884bf SHA512 4872fd2f24b07c626efc6fd76c01b44d56efecb9697f972d0877307b38d3ccb06277ff029df38981470ba1f8ac5f93086123ab3af44d3c49bd9c10b6c9158a81
 DIST futures-util-0.3.30.crate 159977 BLAKE2B 9012edf76336952dab02cb61db48dfc74b6cfc17c137c36372709e8d575b306a4d7c4da89328067c9482a645aceb7b44ef57deb21a0c25964a5515e738a039d0 SHA512 7faae5aa35641d858d0f5430e4a69acd4ba9037852ad73c5a890bffeed411d28820883e18bad4ca8f7b0a765f9f4c5dbeaf5d0cfaaf90c2c69846434ae091951
+DIST futures-util-0.3.31.crate 162124 BLAKE2B 69ca647a261fe24f90a4221d8629169a8dc7eff9dd1c4e07cc700a52a8609ce9b8aa3974b9b09e1ee64d0121d7bcb3efeee6fc15983347aaa0b0b23b068afc34 SHA512 429b1de584546b931b17d475aacbdb0c14824a57d960c44e615aa808e8c0f9c126473e313a7150b3de87ea91b7eebebb1041509f61b3493fee8a9cd2c75c4df3
 DIST gdk-pixbuf-0.19.8.crate 17721 BLAKE2B 16c30046912b28644fcb77bd8a203c45cefa3a009ed4477d78f4f00a972bf7d92b7b421dec0d8e4d28288c976cdafbd80f5f7046dd40697b8040f7711294b72d SHA512 e8f6f5e792502c478a0c86fa1f19ef12fb7fa67080d6e51f25d52e751a64cf8969e0216ccaa422106e2110475ab864a8596134c9f4d6deaa374ef8ceac9b6124
+DIST gdk-pixbuf-0.20.0.crate 17730 BLAKE2B 1671115fe410c82a21ce4ea41f67e42f1dd924bf82ebbb6855356e4ab48c83e85722cd4c788b46c2b7ad98818cf377f0991ba2b1d47d4db2f593095f06726d9f SHA512 dc6ee2dff7cb3eee7766bd8b0e560a0cba5c8e96d990be88001e59b60b4bc483b39370ca4285602203afe50b74f065a881052dcbd0534cb2b003e5bb139d0369
 DIST gdk-pixbuf-sys-0.19.8.crate 9780 BLAKE2B a21598a0a6a5579fad3a8ff3ada09682662b252a3c995bca1de5340553932c272882d261c3297cd7f3cf0812a2027d5c20e97ffaa636def860377a54ff99da91 SHA512 43b8e29886dc744b95e546743a187feaf915fa6c4a44c804cd45a133c7b2e332702eef7bf4e7286f9c922ca3161f39d7d76baef6d4237ab2aeb9775503648c03
+DIST gdk-pixbuf-sys-0.20.0.crate 9784 BLAKE2B 8cf752bde73f0b6d125e353e470721c9fcac02d2e5e35e0664aba3b32ca59916f31501162ffa608712e1145f95286ebac3a35438898bb02c9d31cce52b330f9e SHA512 7ff50d51c01f7239d56e27675b00094b5a32c05b958b474e835d49dec4c79ee07d15dc18cc5a59e6ce402e8e45b4d0a584f461e2285c73095b3953347a606e54
 DIST gdk4-0.8.2.crate 90346 BLAKE2B 719bb97fa54f0227540eb7799cf6f06b36cb122bf9914fd49e761c92914a9d7b669bad1fbe42e5130174217dde57d74fca02569f5cf1b8cff9391856d95361a1 SHA512 7443778a51bbf25e9fe949ae2294eee44341d325c82acaa0226d1222db075c07a3d6728a947455f631869dccdfad39bd5315d5df8130dc249549f8ae93545a20
+DIST gdk4-0.9.0.crate 90600 BLAKE2B 1bc2280e23cd88afd7d7df39d56ef216531428e18d157ba780a0ded8d631a7d0a17599387d3d8020abc4bdf0361b3dfff0863fd805757d7bc2f55342061ca2c4 SHA512 9b2415b91498d6e638abbaef1aab97dbcae1f0e1eb95fa57afe00c4661e3e4783c30ae023f9060cc858e7f7d9fd38b5f16a49286a6e611e24fd77109d36ef11d
 DIST gdk4-sys-0.8.2.crate 65864 BLAKE2B 3a216706e31728f0e00621b9f99f8883408594218dea0fc868828d6725316146d3cb2efe3128a495b76353ad54fa99eaeb33509478e3eeeff7be885483acf6e3 SHA512 31f12d8894a7aab75e4559312f1d60267df46b6abb7d6f4aaebe7bde874c6557562c974ff63a2bea1c2427fb7c2e8ac0b170c8c1bc4a52aa08901fd7cd9988e7
+DIST gdk4-sys-0.9.0.crate 65801 BLAKE2B 317472deca9fd67c39eb983563a8f82f47e5bc7762bb8ea1028aa5747324556203bd9d43e484d05c3bd0af8c42a222dabb4f89773474083468cc45634042ee4e SHA512 57c0910408c46aa8bf49d945bddcc77d85fd538c96a0bd4207517f265f7a86b50639ad5ba4f9947798ba3b72e2e56385e2d75aedd3296eb5f6a79dad896ffbf6
 DIST generic-array-0.14.7.crate 15950 BLAKE2B e74c785e3127095625951da192a018281ea9976aaeb11019f9088c3f27748c5fed1ef25d577150864486dc48b5138d6892e42f99979339f711a66fc70756c82b SHA512 363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d
 DIST getrandom-0.2.12.crate 36163 BLAKE2B 0afef8504932ea0ea051cde1d14bd5b79edde68d6ebae6fe88fa4aaa532605a16f466d0d9c0d0aa619eaa105600b6d5ee4e191865a3fa041549a78f78ca82396 SHA512 dd97d7dae1a7ba653abdaf2db719e1a9c8eb721b08b4af0f1c45b1ed5079069d1b57e4f6d9d879e7fae3a890763f4b6aea9bc2d945392b98e811e7b348589bee
 DIST gettext-rs-0.7.0.crate 14816 BLAKE2B 1aa76215ea30beacf9f047aab393ff55c434d84be7e3798bfb316fbfd3275d221245afa246488c497f7ab76e7c03c41b9d68d8006541db5024743ede7a6b4475 SHA512 650526a5f08430d2f4de5109ef87797d8be3eb14cb6cb21fe17ff11f1d631903649590f0d74e8ed5d5ce0556a26a48831168b86d9783735082162b427cba87e8
 DIST gettext-sys-0.21.3.crate 6501658 BLAKE2B cc7a29f1159e92daee55755cd5d720231bdd51979a94941dca31b22b4b12b2dd9e389002452f21cbafdb7f34eb25fa416a300359751adfdaf41ef2a1f8df3fd0 SHA512 b88873f92951875f21ede2bcafbd35ac317f6a8fd7502319f7522c02fa3e4157a53ac574bc22274ba565dc704780b32c1c6ce4b7e09e4f2f9e56e25bcaeb9e41
 DIST gimli-0.29.0.crate 275756 BLAKE2B 092e5bce9503a337451f63706e7ae7d12a4228db6a43d2c14fa6af74640a790ec70ea2055ac84db3919d19612ee6ee0453f64981390667abec97637679ff06d3 SHA512 a6b591d48dbe93a1fa6b814759a5cb61fba0838288840667aaecf01346a3ab862fbfe1cab51b057a425ba9a0ce35c8421b28cd5195464be881f38905062f1446
 DIST gio-0.19.8.crate 201627 BLAKE2B d1d60699e22f5fce4382e68854ada41b91f9811665c64d69ed247d2e50652c95eab00264cd6308d3fb779d271a1ac4ce71ff6105305a076d8a124d12f7bff723 SHA512 d3248acfb8833263aeeb59ae36a1c65ab9c95e3252f3e6b8bb40fd3034a0e43cb72bb1e8487144059fea68e5f5e026dedae04510b4ac77ec482692bc38af7f63
+DIST gio-0.20.0.crate 203066 BLAKE2B ea697205a473f48f77efc56be3e45529d35138d2f1a712db0141a98effcda0cc762cab7c0025bd864b36a82168ab159d19d656dc33824c34c9fbda6037da45e2 SHA512 3811918136dfb4bdf4ef589371290ea914853c8b24a37d26f3ec028101f88e83a0841e7fae1fc4a8142089e61e61709465f1ced908f7816e38bd661a0b8b9366
 DIST gio-sys-0.19.8.crate 81673 BLAKE2B 7f18fc23380b289586b74526bf882dd98bc278ba52950adb96c3b3d0d166237e612175291266f029f495d23868bc4db43c6001111b6187ebf715640792365d66 SHA512 edc4f900d5aca0263e17aa2f97b60284517ba0460c5c4c20408ef208df85f37bc7c52b523c45e3b401fe11617971166024f46646f230151b9eb61b1764b86b0f
+DIST gio-sys-0.20.0.crate 81802 BLAKE2B f077aa44ad1f918e4162a48f2b66f1cbefc38c18fa4482e4bf15b271143056ee53d7ab480a77755c83538efe27690312e37f8aa9f354d7bb0ba88ed90a583e38 SHA512 685af3d939af5730450b67e13fc43853a5053e4ea15c5e6569277eb088a34080392928de380aa703401880967adfffebcbb40833ea4a3f1e8e98672711284d7b
 DIST glib-0.19.9.crate 276765 BLAKE2B 90b0abd5d9bb933081aeb691d96fc8e84c30cb007f85563a62f0c01d50a8f627ba8b7b3adfba48466cee94ba6c0c5ead9386a50acbca8629d30e9d09e6ad20b0 SHA512 9eb9911b9ded5fd5a24afe54e96309d2dbb37abeff106f48bb5bb30cb7a28da2e224708d70a0c7c053071e8981c225a3d2b3e492e2793808bc478fb68812c72a
+DIST glib-0.20.0.crate 280331 BLAKE2B 814d470717fa20f2663221377cdd555953feed3f3bba3c3788af39d65bad58a8fefffd50778c67c4379bc5672d202997573c3316ea3b3548c3ce5564e98c7373 SHA512 d3c6cae4bd5cde2920bbaec199a388eadc25ad4d8e29a0054cfccbee16a0c57a8da86bcc69c1c73c01e95b2d737647e8bfade3a2551794f9a0eee78b133e730a
 DIST glib-macros-0.19.9.crate 70248 BLAKE2B 7d9f31351938150d93c899f357bb60363675b997e3d7bcd386f8d19da9ff5ede300088c0a677248764ad12f8880d430d94d7973d47f295a981c2944fcc276ca7 SHA512 fb362e522335f423cfc4b988bf98597960bcd77ae7c85d8a20ed5e2d92993cda2c8f74a1fb84ca1e5f5be81323f6f052c6e7c9949e3890405955487edf353d3b
+DIST glib-macros-0.20.0.crate 71092 BLAKE2B 045ef1f8d54b45e19b472397dfa1f733a9f4cc6a450a005239cf9ec7e860ca5c759af43862dd5f36c22e02c204debdb9752af0bbf1049eff8fcc9e08eb3da487 SHA512 ebdd945ea6c72dae10b3c83a60e316e66e17385ed55aba62fe2b9a8750cf9205212f8aea560141ae3cde5c681f03d740fcb04307e96ac10b887e4381e2654574
 DIST glib-sys-0.19.8.crate 63431 BLAKE2B 434166666c3c62a5e6dea942a0cdda191dd883ff64d19346c44bc5a7349ec9b9a0488adb9cb6fb561ba0cb823a0c58d3833cc237348ea55e60a9b18a06891a1e SHA512 b552706fa801888ea9e2b5a5e8b3fe391b9ae15fdac29e614a9ba8d643d6eea70139d9eb190a2425f52e518b4bea4ce81c7a5af9663f7fe92219be0f202681a7
+DIST glib-sys-0.20.0.crate 63568 BLAKE2B 4bd9a44a3b4a747b20af2954d4a89cf73a729d2321242f053c61b1efedfd105685f88591750e7bc550db43004e2fc0ee3c7eadadb481347364cb8e88d8439114 SHA512 f852f8e19a142cf8a683f8e2fafb451315c544e21cd8516dbdd20448104713832a22f9f15ab4fff073002cb2a741c5ca4b84d1e1abe9f933bb1b251662911d32
 DIST gobject-sys-0.19.8.crate 19068 BLAKE2B 01b8269fbe2d06c8b244551c594edfe926a0226db241c887f79211f0f114020b1475760908efe009e89320a93e3ca84e56e84556fcfa56a7d23a7c027747d0da SHA512 c6034085c7661a339519531b41397f12c6846185f60c09955ff12dd1069cbe953dec554571cce7fcae9f7f14f5d6180a3cbf6c43a795c8049b00866bd9823c91
+DIST gobject-sys-0.20.0.crate 19076 BLAKE2B 0086a250c5e606350f509a1cbbea30db483be82f594d0f4070a00afd6a5eb1da94895a2b1142107b743c3c5509322416872ec4189792abdeedd1725fe35eccea SHA512 095ab51796820291ded1050f20da24cc13f591290708b873bfa482d39b393e209a669beefa638c6a0c62a1ce522a68522c8daf19de42c164c10b406361591ea9
 DIST graphene-rs-0.19.8.crate 17316 BLAKE2B 93256a3fa3c03328e96ddfc2c45c3736df4cfa4eafa32cc7b700f3680508b1f990940b9e1693a64bf36ed0a13a234819a260873b1a29b7004fdd6f0fa3f2dd04 SHA512 2d13f5625e7ea3b5964e1aec77d1141f2a59caebe793c1f2ea73abc3ddd8655cb27f88fed7e4e88766c0e31fc50f1bf8c5ca5085b6b2f0ce81bfef6f907c3eb5
+DIST graphene-rs-0.20.0.crate 17278 BLAKE2B df07f2ecb3bf005593da24bae41fb54c247fd86767a643943a83ba8ce2b66ffa692ed35999542a007376d7a3af7fbb330b949a3c5051912aef40a51eb040ea83 SHA512 3fd37ad887adf78daaf96860b1d62b88e38cc98711835a726d2de931b5f9e650bc8303297c884d187384d2219807abba70663391a5d87d9d134cfeaa0290d9aa
 DIST graphene-sys-0.19.8.crate 11653 BLAKE2B f06778e6abf2b284d6aadc240489d12eccf7ddde78ce1209e9afffc394c0a8dc68627d83f1f76ba14a363d5a85508706530d0041533b5fc83e19c0ba64a2050f SHA512 39efe035d614a51c2ce06abd6ce6bb5f3c99cd505bbbb8ebae5eb9fc42864fb4c5f2a43b8b11c5922aafde4a950817646c2bf54f083868c2b6bb148a41b613c2
+DIST graphene-sys-0.20.0.crate 11624 BLAKE2B 3b93f2c71e2c24fd2c23508795136235f91216849b044f9ccc14970ef6c54580c94fd53cf8d5aaab44659292aa2b876e6ddf54d2377d7c6de98dea4cdf792680 SHA512 ab4f97485c1ed09fd4f7a1cc01d07e492f5f5af0fd3db871717f9337cbdfa3aaf9691a7085286d59c8e4c4fb43ba1d7f91f4dff8da61d30a4f11bc5766c0274f
 DIST gsk4-0.8.2.crate 32331 BLAKE2B 1a1ba012bb3630aca86b7975f52dd4b84a9aacc484738b88157827bfbf6819704381dd68b821c0e52b9bacf84a292aa6b1b3cfbca5b080439495dd8c2c2a8949 SHA512 86b5136dd4c83ec437b19982fc37e681de9dc86ddf481634e85d589d4e4d00e7402350f6250a653496550e840691a0bb8f35f3ef764f1bfcfb0186d26643aa21
+DIST gsk4-0.9.0.crate 32606 BLAKE2B 2b2b62ca802a6dda33a993922df2e2a7c772496dd14554a9348f3fe0b87ef3b6eae8029e9800eec8d4345513a6b6ae5d6ac89ca7d86ac5d8b1f02d6f7c99eaae SHA512 5a73a3fdeaaa767ed8cf9b34eb643fd57bc14a082c6a059cb1472e30103df0ecc9baef2dfed42cfebb302eb94f6769b19b369745cf775865045c06d96933f443
 DIST gsk4-sys-0.8.2.crate 15321 BLAKE2B 79757ee545e53e2606f16084b3468bfbd1551c1d52fd81007b316de1b87a38256cce5329ea33d8eb0b538720bc1abcee31dfce4aa1eb0429f05f3c5a29eb5865 SHA512 37e6af37daff2ed055f7ed2e3b75a8557f294d1c583affdcd910a03ad921811b65c276aea30a66632dadf2921aa8fa8c701179c0e559e05f25670f40a57c8f17
+DIST gsk4-sys-0.9.0.crate 15364 BLAKE2B c8f5e2303bda9a899d9fa1b74603153ddae4ae4d57e2f4f3f32d047b6d5441b869c4a9c86889d8d9599e3a23440235100a269b56d49817f22a0e1d89e661d603 SHA512 a85427aa00c24068ba41706b5c4de6f6e5b7a811fd115fd492bf9b437f56c72d699a31a57c272130c0cfbd851644642fbd594c194ed877c8cc75ea30427b6f25
 DIST gtk4-0.8.2.crate 466329 BLAKE2B 98ef8bc707d8c772cf9a5d8f52d17e6d37d0ff7274f25406482e07dfbeb5307c03bb3c004ea5597d2396cb58df6545e156bc94640e91b40574539866d189ec0d SHA512 9520c5bf8b7379ddc9c6ee1e96d0e77be7ec47a09bf03612e2a88c637a6c99f92744d5eaf32d9bbf3ccb522600c556bd48d6cc3081e5482440e56681008d37ed
+DIST gtk4-0.9.0.crate 473369 BLAKE2B 2ebce7d909b407a287f8bf7d901f3653bd7f85c3e1f97c5bc645a391569d10c5a2948d19105d5169e36e61412193c7ea746c64768cc9afff2abf1fb948f89560 SHA512 1a4f01c1febd8a306761befe88ada029b6fa8a1f6cebccbd1998bb37aa83a19d2bac93c620ee6b29e0647331c541cbadf99e9eceb728abda55cc52801222f121
 DIST gtk4-macros-0.8.2.crate 16529 BLAKE2B 5ec1a22e1c2b2277ceb6d406fe35df5ab3ce10a2283237267ce3be308ba622f5b1378df3f30d7454e39d93148377489624ca30e1d818ed69e519c3de20b0e65e SHA512 df9bc0c68e13662cc53c35fc39feac53b71ab10adcf7dd9e72bb941371696835d30eeb1d2558dc936c8572ba98ddb8d65d684570eabb2536ee74571cb62f3a34
+DIST gtk4-macros-0.9.0.crate 16532 BLAKE2B 0f5a41ee91011b280c8456bbed0469c558266a7c8cface669e607e18f56102c871a23c246ae2b6e0b8c001f8c22b35d759d877b0911861ad8af72e4ee6d7dd26 SHA512 301072a02973fda5bf321eec80befd2bedcfb507eca10c91ae40cd3e338c0f5f01a22ea863906b39d52dfa353974f6c038685334dba734aa90d9edfdfcb4daed
 DIST gtk4-sys-0.8.2.crate 109719 BLAKE2B 2078ec7cc8592e113488d29aba02d1156b606bbe0215f6eb4fea8f90fa3b258e8c5a6972276529fe2b27dd03912d03927c398b857671553acb1e8b9fa2d4213d SHA512 e41e81518da71ce9476589fcee7181ca58d36b10327dbb07fe0ecf0da98f170dcd2afbb007c6e820f241697979e5c0dbfc9962731abbb83b282e106715d984da
+DIST gtk4-sys-0.9.0.crate 109822 BLAKE2B 82d40d92bfc98e57bff67f263cd740207bf5a2962b4ac825c46c3f58e057bb7b178aa6edcf2a4f4a32b4bdc272cac0eb70a000388058050ac37db12057a39e0b SHA512 4557df841122dc15a0ff1bacba7ab9481139a6f77c77607a8fd1fb5632960337f688ee6c0474bfd167fe285a37d0c4d516c868fb1afc3199479f2bb26cf29cd6
+DIST h2-0.4.7.crate 174114 BLAKE2B bf146baa6f998b6d95bfee77f190be7f85af5304a8b8b9931674a35a0ba0a1262d26ba097149327482dd988f8900e996086a820fd828fb023e52adb104e21bce SHA512 0d56fd3a67473d98199e0d944d2bc094c36638f3a2d986942e6bb2e1c8022e7a53f184d5ac5e8d435ae97da481ddb8d5b2a039c70180345c8006290fef39a59e
 DIST hashbrown-0.14.5.crate 141498 BLAKE2B 7d7f31b6377c901de12f78f0004a347e3e3b948b1336a54b6abd8dd2210db0ac415efcdded421a00723f16563a7b833b5d1db3cad5c12cac916e273bf3e588b3 SHA512 215ea860bd3de80e2dd2d4647c9dd31c0ac895ea7c08b87256dc11d36407e412ffefaebc6cdbec024057dd4f24b3762b4fe427be307e15d1e68ccfde89a99742
 DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
 DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045
 DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
 DIST http-0.2.12.crate 101964 BLAKE2B c35c2ae5f9494cafdfacefd778b4b6824588e74685fe5204bc6efa87b667d00b28f59cae667115fe45ae332d8542e7a0c2c7c42fdeb302302f89b00cb716f380 SHA512 e32dd4600aae7e26f1d530871815b30fa0b9bf95293005649bd9a7bc4df7f69a1d8de503d1b8873e67a5496e644d0a47db2a0680fa1e9058bee4dcecccebee58
+DIST http-1.1.0.crate 103144 BLAKE2B 7a8c4ffd3ce664e1f575bf4042ac0f15ff42b200fa8c6aa27a6686d77be2de7cd3df242e36f8cb45cdb822bfa96011d5d5dd7bb03122ae5bdcaa15bbf9d40051 SHA512 1c29f25a8895a69d815e21df427dfff7924e9040d01c55cc3256dd0b5e72b670fe75b1414223fb971c16082e4b26217142628be5e0905994da4f08b52e7f4a33
 DIST http-body-0.4.6.crate 10773 BLAKE2B 828a43f8ec79a7187cd6f5379edd50127cefa8e80e9bc1205e80c567f506f4778387dcb1d2808e68f1b88bfc7e2d6405ddf9ede9403d35584e31bc62db0b7756 SHA512 fd74fcbd25044aefa183e3caad6cde0967cbb00b6d80addec2589d037b752cdafcdfd02d29d38a12b5c7d87cf1cb5e5ed80488057735b9dd73e03904006a5462
+DIST http-body-1.0.1.crate 6125 BLAKE2B e253f2c85c0553382db955ce9ed18072f8916738962083223f2466034803553818e7f5a11649ebf5ea9118e7ce1067bd9b999379a03a335b88c810bcd312cafc SHA512 3d9a711619e5b14d2188fa42bbd43653dceeeb7e172cbd96d36fdf37846fa2c1efa0fad019395a4fa6da2e139875934aa56caf7332dc40546095b0a774ca39bd
+DIST http-body-util-0.1.2.crate 12821 BLAKE2B 43ed71d7b7247d8d11f6f204bcac1b3b81c002cf7ec89e6c381554132293c11e6ca148cdf0dae8bc213409c9e0523dd388cdfc6f636dc1bc5ec7a0f7d3796dd2 SHA512 1f3eddc475791d860848041075d9df8a3d613c9761b2248364e406c84b070b9d2e4d7e8ced61d7445d97919d5cb96d5c1424e8298ddbe6069110c6d4a5c9246e
 DIST httparse-1.8.0.crate 29954 BLAKE2B 82c48fdd6d28e94c42df180415ea3e30d471ace2fee09d7d8d33aff0a8e9a15d3029c90f3bb036b4f587c8902094a2ec21e4ca6ca7b654a82562bd84fe208ef9 SHA512 849159d9876e0474c71f3c7aa3a7271699b807b293832d88d52e4326ed410b25f9d7b9ad75a143a51fb5c8ea5016c2513348edbc050d3b62dc9a6737ae98ee8f
 DIST httpdate-1.0.3.crate 10639 BLAKE2B ce0b401c69f76252639c10f6c2e4a823574a58565d7c5cc3633c72837aa4ec3630b34b148de4378ec498db196e3b2e1413ca0e5a4d9247855380fe19a8c20f94 SHA512 0586888fe89f40b838d5ceb083084d0b8058feff1d2933faedb96896dc86eec68b541a0374a508fd11b86eeadab3c62f88568ffe2c53206fad438373a50b2e5a
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
 DIST hyper-0.14.28.crate 197204 BLAKE2B b99c91eaf65947642e217d159372750ce57e332675705cabfdcafdcc9ed3cd90130a9c600118c76e167b927a481b2120d0f4b499772e4fa710803abbec5385cf SHA512 deb26e3815e6315dd193c4db22efe1e73e44bc7c1d400bc7654e950bd074a200b7cbb730ca30faac0940c88529fea60d5737a4fc7ccd4fa24c2ecdb2a0b450a7
+DIST hyper-1.5.1.crate 152653 BLAKE2B be470a4a902b464d95f30e656f0f54c8a426308f03f118aecf583a1994fb12ec8229e09b43168d856adf6d3dd39d8dd0f97945d4202f4badf4a3076eab1e4dfb SHA512 ec90992a7569e8e7fb3e4a9250131a272851ec0938da48730198ac41347f82e7a308b1c4ba8b864de58ac849367d4360dd2d8a03cde58b330329949e87ff85d4
 DIST hyper-rustls-0.24.2.crate 30195 BLAKE2B 79d5c6512877c98f3040a6ed26027e5345d42cd55ee9e9bb6e020cb7bdd4345556d910c338ec759a6a9a2907e645aa841d5666879ba8254ac6506a980811a7d9 SHA512 f30e83408376b985ee9df26728f8183a7048d4586c5fa3d797cc837931e13300018929583a087767bd19d4bd60d85ea1c2696601c236fb65be9a6805ef6fc193
+DIST hyper-rustls-0.27.3.crate 34834 BLAKE2B 904bf8cd3150b29f59ce29224f39d74d41c940d0588847e0e16cdb84b12f941abc1d504c3d2f51729fad38a93a69125406e14c05488b06982a371f2333f78c02 SHA512 1a9a9501f11d826ee5960deb1a4a572c724ab6563220bcc6544215de04ce189649a79bf18fe8299bb9cc30e925de52318533a9dde4d4aaca402088da18080295
+DIST hyper-tls-0.6.0.crate 15052 BLAKE2B 2d9baa91bb89078e58b6a3af87af6796c110cc26f79604d56552836b3fc770ea63b215b44623a57394d1d60382d65f9ac0502e68700ccef4a2d4b19414497545 SHA512 6b99b08669e689005a27f2ca70a12aa51298a6a4226de072cd84fb15275339dde8e2054838541096484d732a1d2d913bfa945ff3003054eb62ac4c2d0a8ecbd8
+DIST hyper-util-0.1.7.crate 71121 BLAKE2B 70fcadc43d452a14273b7425a98d8d945b65368f9085661fbb3359ab7fd68104baa47c99494f9740e9b59edc51c84a11553f1883d1c4dbc4bbbdcda6d87d823c SHA512 908b8ddaa75fec5467114d0cd74cbb7d37f8e6a6c97d61c1fac5d14cd77a8ad68d1b183365759aa89ee8f35dcfa813245690d04dfc4025bf55440ed2ab8b0900
 DIST iana-time-zone-0.1.60.crate 27074 BLAKE2B 6f534056e220e2f721fc7c7f3ed24152eea7f07d1f4cb3609ca734ade32a2d6b18fd0164ed831170cdff192cbe48653b2c4eb0903fb6f157292b3b5bf47299bb SHA512 5619b994d3277f56e65322a7903e4c5e03928a87bdb72831cbef88788aaf5573b8460abc0a4d5488c5df7052bb978531d973dd66002b0ec4a3af468928c9b722
 DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2
+DIST icu_collections-1.5.0.crate 82762 BLAKE2B ab89336790ceafe62dd72f0aaef16a6eb47fa5e41424ed990e6c059ad431cdb3dcea943436aed0bf9c6eabd7aba12d255a2233fbbcf9cf5f666ef1dfd5b79a16 SHA512 127f1c91101ba69405b10a2590579606df766166fcf1fe6aa9a74c4900296425cba5c47a391a53a01b02026af5581f068fce4a7a400179809f7ed9922b94c0db
+DIST icu_locid-1.5.0.crate 55131 BLAKE2B cde2b988f0af200b8e7851a66b8ae08881670ad6ff79c5caf5135a04c200e5ecd0acf27d8856fb0fce46d502527d506095f469c28f325b9b9d21d2a3657149be SHA512 4b85f0e7cc73166a542b2e502b3ffae1f30d2a9609ab83acf98e90b0edb37fa8ae4592f61ecf48a0ae0779fdd376abeff59e1d5cb97475012eda99ce2a97da57
+DIST icu_locid_transform-1.5.0.crate 29094 BLAKE2B c7bb5c5ed273a6a97279d4599f612dccdd796f3ae717411aa5b21949721989986d8b766041b9c7e49a91cdd42a48fc965effb8d7fb6d33554926d203a6535953 SHA512 1779078e2ef9859bee2bfd5414ad7e4b0f0a40e6813f4ccf8de2bbe8c764fac7f99ef001cce22332a8b3840af22e9c7fb7cc0341cf8ba61303794ebe87071e63
+DIST icu_locid_transform_data-1.5.0.crate 44727 BLAKE2B 7fc5408510886bd7b7d796850a542f2c1d759d2c67492b695245d46b34930e3918513cae2699963f603d2bd02484960b05afd58cefb6c3152ec201880366d44a SHA512 1c00fb962eb4b8c759b1120313bb890f4388d579890d7450b798d6266a7d6adcbbebc8a8dad2f267668ca6f1c059d0bd2209eafbe2a72f4558c85258eba57405
+DIST icu_normalizer-1.5.0.crate 53113 BLAKE2B ccd58f24469da1f237ed9a349f0b3bdbb49b8f5b1995d6254c6e3eab53a71208ff4a0b09bdc68082cdbd288df66499efb19555f41d12a19205d724af22fb504c SHA512 22612b86a24e3ea222469392763ae9d40dcbb37191dd8b9fa1c64332463a4299a53275a1cd3deb7e0f057d137f4312d990762f9925d0ceafbc8839d67c425a13
+DIST icu_normalizer_data-1.5.0.crate 50561 BLAKE2B c7b8c5751c6d6df03b23d63855335ef67b34a0b13b15f1f8a8986943b5131874f5205155889e12253692b39918256fe2cfed70dfe2087011683ab9165a5fd786 SHA512 222fbb819791fb4ec7889e45ed3032ac8d4753e2e9cdce9d0b3f79128baca5ce64157a8a58ecdf39cfddb6c2395001e3cc8828ed51803e85cae133c247cb338f
+DIST icu_properties-1.5.1.crate 64479 BLAKE2B be7d3a1663664095f4af654723ebc74f385a6423fbd3acad325ba0d6188dce9d9321eb323c1b1d8e6d75fc9aaef3d873b609d7049525d2402456c6331bcbf486 SHA512 7e347c0a02a41a3add950290bee90a339091a713546d4369c2995022e64f127f54204b0d46cbb88f396b3bccbd4cf12720a93d8551b73926f78fd5ec01829cac
+DIST icu_properties_data-1.5.0.crate 227993 BLAKE2B 3b3141507077dfdeb4f89316e63e1a651fc5570cda58c6c2d566130858ff67f900c3b151113e6303962fedf1d6b6d617601b21a08c4c0c98e6bf135aace6f299 SHA512 c651d0a50c229acafa648ce234a73bc1d0a85a8bf2369fdadaa62badc741c35e8a7d5392fb1bdb7b720fe2e0f883d1309c78de4ba913691969e5367a4e8bafac
+DIST icu_provider-1.5.0.crate 52722 BLAKE2B b1e53ac677e2db5870df0a91de405ebbc635c3f7931960f3bd744b57350c7536116f3861d4177faed2145b79c1c957d79815fadc2dc85faa656a1f0bb338a16d SHA512 6c11d89c7d2b788a44757f02b0e298b558ebe174fe917664401d91109cdc7bd1aba5526b3cdcee1f066018de1b775bc9dfc294bdfb40476c53d552bd6f29d6a1
+DIST icu_provider_macros-1.5.0.crate 6436 BLAKE2B 7405924dca41db72ce422437434a4affece69f888e5c18d2a92f761a8d83b180f40c8de9a34ec15d0e107b63b2fe0502cebd0a0ae6f98d9d6ee37d197e754703 SHA512 a0dd58d731556a010428fe4aebbc9dbcd626b46d380cf28ba5236ec8824045a20f6f2ec986e0c1e791bc8bc2b692a10306f448279f079b4c37237e4a3c3cef63
 DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c
+DIST idna-1.0.3.crate 142515 BLAKE2B 6835a64772e5d301c2456a94f8f5f40ebe6828aaeb1d48e3fbe015917dc3ef95ac7cfd0e1f1763e23950482f4b46ef7987928c8dfddebab63947d5a29fb490ac SHA512 e75ab18297878df11d82bf3623b005a3dbf7a6fa38c8f78830c219adc7d6f4ac07dce24a5f1186de69035ec316421319e487396cfacb053674137342d72a4126
+DIST idna_adapter-1.2.0.crate 8206 BLAKE2B 5e8d7dbfea699584542cde53039df9d8c3dd408efa2534f11fce7086f679872c45d9905d6b2cfe523148eda3bb0cd4820a7b14317f91725f3d9cdb475aafbd57 SHA512 1d8b54c19878645749a1bae768dacf353b07d266f2cb3bfa1071a7afb56ca68f534dc1d54cae277b777bc97e5986f297cbe2051a82e14f553ea73cd723d9da7e
 DIST indexmap-2.2.6.crate 82420 BLAKE2B fac5cf6339dc3c0a40b100035a5c874cc7b2efeafeb31c51488d25156e392dc9db86a497e76eead351d2126f69d060422faa9c55d73407a0de9f5be18d234123 SHA512 53211c4a9003d751feb6dcdf1a76495764cbf32d24bbfe2be7023946622ef4f2b07a6de57109e5d24ee01892f4b2be0e0692e10cd31fd39c4ffdff4d37abe9ea
+DIST ipnet-2.10.1.crate 28407 BLAKE2B 50c27384d58bf57ad2c3dd0ffe44f1ceb1ae302dd40e451b0c0d69f227050fae17c368c417666c1ec9d087caf775132db7387d5a6c919a0863c78a151912ea64 SHA512 7f55f23b2b0936e3a7dafa2db0447dcf1b63a092df4af8f6fd88a02ecc8f0a290b0d21b18fe777eb573201bf82f56ae475a447650ed0803af676b1e0c0970cb4
 DIST is_terminal_polyfill-1.70.0.crate 7451 BLAKE2B 9efe76f14d61a5af6d3cd30d5e64209971d4292d8d2c12f4a621ef65324a5bccbb7e1d79d5efa75ea7456431241d6325cdeaa0af802b1480c6cd9c1bc5a35994 SHA512 c07d5076978e4c5d8d6a191d8880fb62643161979c473564881feb17726cd9ac8da25c40094ff12727dbdb064fe88fbda1867120a2c3fda1051bcc39380645d6
 DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
 DIST js-sys-0.3.69.crate 81083 BLAKE2B 529c94cd2289883b3b43a848d47d8ae025ad0909548a38ba93ebc684ed3edafab16842b922da6c8b6be5ba39c36a1c05057dd3dd93fc8936d5dac372937ab8f6 SHA512 506722e6dc13484828a4147d974822ff9d103d9e7db58a48181b0957770d9fc43b97605ced105c5b680d8b2cda5fa1705f605707611cb48ed8a45a96d5f196b9
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libadwaita-0.6.0.crate 108068 BLAKE2B e375459d88713e3383756813f87518bfa09888804116a87e83e9c6182b6a13c1062ecd919cc6cd6e51267ac6e3511f62546aa66291f4ca9e3775ef8ddcdf462a SHA512 2f1cf2a54bb2944febdca1f0f96148bb8d776971788a1a86c27135f1e5591c7353f70a55b4d2d6b07c5509e3cae5bff7cdffd22a187cc1fdd3509ae5b658c0f5
+DIST libadwaita-0.7.0.crate 116886 BLAKE2B 3b584283b59dd2dc4aa74f2da8dae4b2a24da21422941e0bd8243c1427f7febad805a03736509e26924470fc19c64767b0b730f3a2e9dd9ca974c63ae58edeaf SHA512 f2c6fa23b497f6c68eed658896c562c2c3405aa2c1cf7ff913b72d212043f96b99cc745287c30435f63170b2e03b903a83bc740933cd37add09a32988da1e878
 DIST libadwaita-sys-0.6.0.crate 26809 BLAKE2B d171abed78b4a4b81066bdda075e412b9257a5cab8fd745e3e0f7432305abb38396ff405c857c829668748755e54c98178364ede107c407bf87ecde75238b648 SHA512 725f750677f679e6b9293df45be404805ed93fcc922e2aaebc7a33b6afdd8b32513fb1d7ac9073cff7ab10714be572eae77e28b8ba21309627ea5690e8c9be8f
+DIST libadwaita-sys-0.7.0.crate 28601 BLAKE2B 5913bf2fe424d16bb0e432fe951b78d850325d9660bc95270c8710349b2f80f21180669726b0675aa86668879d26679e90bd7577554ef1749497a900a5528d21 SHA512 308431e3d34a72f534d46fb23e63030b811b680124b547616ab003bdb2c173557d414d791efecd7386f107f0249aba8d803c3187c2083e18d1f1c5bd7d961a47
 DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
+DIST linux-raw-sys-0.4.14.crate 1826665 BLAKE2B 804af73daf396bb20da14f831f26ce06325181de14f0c277350bd22d21789f2bdd663a964cc0e7c5cbd2e084285d02a401a6bfbb3e8a8f079c120f9488b56f99 SHA512 28149660bd975ede05624af3582d5c78f498239f5d89713c2c32f5372fc16f4ca024dec35f81ea973a2cf986098890395dbda06ac6cf4ee29df3f9a0e11eaea7
+DIST litemap-0.7.4.crate 28257 BLAKE2B 52989ad353a782e9592357530dca3504e3ef5475bd2f1b2c795b60825d971ee6d3e6da51fbb6bbc26cb3c3303f6a751a3e15d1caa78c0cb888288a965666279c SHA512 5009c486a87b2f52237e15e2e772365424e4780c146776656d8e1551e52bc8e06e5c1cee8db1c59ef20d0463962fc07ba5221a46020a82df17a2f623a175f58f
 DIST locale_config-0.3.0.crate 20808 BLAKE2B 68b0519639c816af82b941a417d4a74896033e9c5110081d495e1cc3a3e7613ddaf2a665770c6199749b89be131a35592dc4cd7cc2789928199b22205300aa9d SHA512 c7d77156e957559172f589f90405b2e9f5306041887990a60a31630af2de81c00fbba2bcdf52bd163fe431f85694dc6d2d380671f38f2724d7e4d178d89998da
 DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
 DIST malloc_buf-0.0.6.crate 1239 BLAKE2B baa59345fd372db162773adbb441caff1f6bad965c3681f244161deaee76282fa09b9af0d0642cd39ef35689f85f5bd7c2efb7ba8119a58e86c7cd12d81b2c6b SHA512 463b3d7666cdd7de618abf0cc4e488060c84d6d93c56d4e922169511a0b03de380ea988cd998f5a162b244088902198763351ac16dea3762f0fa0840fc29d6ed
 DIST md-5-0.10.6.crate 16161 BLAKE2B bdd43889aed114cfa97ed0c70bc97b89fda28b14033a0a26bc7309ed744ee907d59151ab92e9cb95f0ff0ca1cfe2af360c48f1b99fc8a246a25c803a4b444a0f SHA512 024a9e14aaf860e748f64dddbb8aec01bb9f40d702d8de31497fde1d66a663e97ca1b06b600d8a818a0c707d1ef02eb0f210befaeacada458acba69ccbf476ca
 DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
 DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa
+DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a05873453e919f2bbfeed9e5c06104f24db9cef2716f302198020870eaf96b2c62aff55cc11d8ca4f4f614d7c8e17 SHA512 e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1
 DIST miniz_oxide-0.7.4.crate 56119 BLAKE2B 68facfec9ff405bebe99f52bcf3aac6788f1b5eef313ca393e2a15e1158bf294003cbe31efea4c793e644e8ab4e00ef67d38f7d32849ab6f01a8e19d31c30221 SHA512 482bf02d7bfd25bd8abe5e5959132677202d8c5dc014b9b0b64fbdc204be1b8431867095c140a1183dd1ca59f6ba871a355422fbd148ce34d62960cad2b7a978
 DIST mio-1.0.1.crate 102654 BLAKE2B 85e2fccd36ad7b9a986d308a5911c7209246d7fe035dbcf6f0dd8f89c0a3c925046271378aaa7b240e84249c009c75e55c32ae18aba0d91e432fc2ef34e51e4a SHA512 e3b98cf7d33f42198a57be4490732132c7b8dd3fba64c99e3874f3f52dfc926298ace992c0fccc5029f47fafa0eeccb460c77fa2f8485f116ba0f353321fcae2
+DIST native-tls-0.2.12.crate 29517 BLAKE2B 76f4bb2aa8fefc306a04ff50a62d6617f71c3c34aa83ed35f11714ef2306fd82f76c7e26ab7ce50f8eabed40602ba02589dde2d98b55ea6113b45cc539c84bb6 SHA512 15fbc9d02134d3d55334d2f02fe4f64be50db991d75720b38d802088f06cf5f844cba6b25dfd7beb92f2cd367ba477ec2098e3c7336c4e5a5a7fd39c753fc723
 DIST num-traits-0.2.19.crate 51631 BLAKE2B 78637360cbf32d172510a62bd9442708af9730c0296a2bb4ebd200c08facd49bc31bf8ddd58967e0df7273a938832b620265d9f8f4d26ad16049bf6dac1cb4e5 SHA512 180018a5eceb45085e4e8d103ff21bb4d5079cea874c42a0ad4c76c99d275d434bbc1cc289f0cdec172866daa89dbfe0871410b2cc3407233fe1129786905956
 DIST objc-0.2.7.crate 22036 BLAKE2B 14a41a5ed6beb100d68601af12914dfef67a9f580f80d70c4578ad9df98a6b4496bc3a1003dec762a27f0ae71afe2c9e8fd41ad715bdb310722c8fc092563599 SHA512 7178870c8e4e9154b4c7b4953b3164946b7ce72c956a02b9ba18889353c72be735824bd73e44a485e42ad5f97994820d9153ac684629342755a6a63711ab5988
 DIST objc-foundation-0.1.1.crate 9063 BLAKE2B 876dd217b612278a522f2d08434537d468f8b0fd1efb0e58d0b58216e20f7f9fc80a5ff034ea25d9216d4d53b2d65552684ae5d5212f18d758c7937c91742a84 SHA512 976dcab4e62ad1c387a81723d70b969fb7d332e1f7dbeb2ea9a26c62fa999d91ff6d8f737ac5725a7611334862df16fa8b15765c036d7acfc3e42a745d051f34
 DIST objc_id-0.1.1.crate 3258 BLAKE2B 9a74fc17235ffdd7987c2735a7a9d136376fd13355f0561b4ecf234784aed077d1ab5aa11c1a82fcee7d47d4d36e471ca4ba3e5bb725a2ed0049a5565967326f SHA512 ec36fae6f5cefda00f3e44618b3c9fe6ec8f528f70d1a95def6421704bfa128a6e5b4a32e9dd686bf6ff60c4f87fe8094aa5e1c8070bcde58b17fdc06f49f9f5
 DIST object-0.35.0.crate 317792 BLAKE2B 0f18cf2fe8ae4eac322e03708a2e3e9b5cb8a788aaef47ea8776a406fe4df10c5dc6a46d86fe6d5aeaf520ebd3d8333b99163e1e5b824d145f374b5f1d620d63 SHA512 4230b083bca1f7954c3c50f6fbd12e03d7e4a5ea47aa55c08d0df94bbe0e2e61187413bf59eabfb39ef680c35e11577408ecf58d460e4b97e5ad58f376cbfab7
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
+DIST openssl-0.10.68.crate 276578 BLAKE2B da7c42f8a87150c76cde12316fe1c170593e76a4bd55176ca5ab7a43c57d5457246bfa91bf7bbf73ca47c87a066789226529fb7ad57c5e93c551baa67f6a9eba SHA512 2b0c7f5a888b0e398ebee9c0fffb6fdb8408c36f96eb99182ebb9e162106c012334554304ddaaa6689d3ae41cdf638ba08187a40088efb95a5e9f6aca032a22f
+DIST openssl-macros-0.1.1.crate 5601 BLAKE2B 69dc1c1f3b7bc4f934cae0dce64c3efa501162e5279efd6af3b74f7a7716c04b6996b306b310f1c045cfa2eff2895314a47ecbb020a817e461c6d77d0bc11e92 SHA512 57e75c84f78fb83f884eeaedb0dd135ecb40192dad2facd908e6a575c9b65b38a2c93bca4630e09ea5a82c77d8bc8364cb2f5778cbfe9d8f484cafe3346b883c
 DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c
+DIST openssl-sys-0.9.104.crate 72287 BLAKE2B d9af8f2ae8a8dfd53b3bb68433a4dd2a4b30038858ac58aa98d7a23b2d23e0b7c7d8fc36c1733d0330bcb9f51284667b2c32fc5a5bd4d9e1a5df7b98d610a997 SHA512 e812d5323bc0ec7376f176a980dd9856dad6d36513e854d333b93ce8a14c20a9ca61be88db82ba2a8ae4e086df5c3fe6965ed10ac155eb7b502e0225c0124278
 DIST pango-0.19.8.crate 45388 BLAKE2B c5c515667f25df967f981ec4717ef84f3fb391bfdc3ec416f8a60a0d840e17969a0d9864de9707a2f9769675e330ae9bddc3e41b952583af294b5f6d28effcca SHA512 b62c21fb56fb1ee12019c06a4df4796068d58e38b8863fc429c66b6ed13238e4598244d2eb8676e057192415f76a8e19b9d5ebf0ed115b8ffa9d3620485b238d
+DIST pango-0.20.0.crate 45513 BLAKE2B 635dbba9026ee7f7b5397a1553bcb250d5f7fb33c59c4e93ac6b77ca940e1bd83fd2e86286f26808f5ef15d88b4b784562d3f7e8fed1e031e77ca56b207f6f3e SHA512 7de44af6602a36484a42004806c119c6ba406728d11d5b2d32480674411b8034dd115eeb04576ea4bfd7d4846c48b6cdb021d33424bc10b8e04233599a81c5b8
 DIST pango-sys-0.19.8.crate 24861 BLAKE2B b6b94df2aa85635458206a2a982d538339c14bb1c0e3fff5f76c93460dec033a897d3b314e983ed55e19dbba3c6676227dd4b9ad9b4c5d0143c016248479851c SHA512 edd8bb23f88cb1291d156cd8317aa48483cd23d43ec4dad20801ddc0579813e5c8ca7fbab88c65fa4c6a76943a357f30dcf1b0582e15d98549f90ec5f51ea1b1
+DIST pango-sys-0.20.0.crate 24881 BLAKE2B e581f4a66a6b0ed8a2fda5526b7b53608fb2229119837300f932d7c5b1432f722920cc594ab746d26f71e92dba5e5f99c5f478a51e8c79443e3acad0c8141e2d SHA512 73807cb48e6f80ff19451e82efebb901771fdb285f38b042ae346f921ac43ed1cb35e45f56828c00155d56c4c8da721f40da34da62e018ece9c2e4de9e0d9d42
 DIST parse-zoneinfo-0.3.0.crate 76590 BLAKE2B 441e96b120e9bb4f666ace28f2999974e3bc6786a8b834b07601b4a13506505a93d2647e446f1871bb072b8a1d1c2075de259319c7c1699244dc4e0b89392017 SHA512 e87eb0feca1feda438bb44d92268779053feec9b0823a336ffc593f508fb6e918add1023d4abcb23fa334efe8a07ab41143f5fe841b4f62ac000feb23c6d840e
 DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44
 DIST phf-0.11.2.crate 21569 BLAKE2B c809201298f1c5046874b3bbdd30e33f2bee2e4b977152a2c5faa91019ee5a1c8fe1d42cf91f6d0b0dd52015fc66f0a84c1b3ae014291ad7d5ba647a78debded SHA512 97752bfb44f3d1f9347b4ccfb6fa2fb80b3263d6f67aa703c52ae90d693c537a0db878acef828c79bd4c41e8f7ca0ea45588dee073d12c9bb0f2980c511b65b4
 DIST phf_codegen-0.11.2.crate 12977 BLAKE2B 5ceceead850a45fb0f6ad706ca26e79267bba0ffc0870b8a31ee8a586b37dc421d31e5af3453d62eb85efada260a2eb9ceb12d2f76434dcbaaee2f71cd43d38d SHA512 0a11be13927f6d4303a2f10bc3a0c986dfcc4bc91c9e885e8912d077e434098f75ff4ed9633085ccfbeb052d573721750fb80c7a19ee1e75fc09660aac2a6c5d
 DIST phf_generator-0.11.2.crate 14190 BLAKE2B a20d6d3d815ca0eb5ef18780587b9963459887a3ddfe3408c99f5ad7c382da014cc0bbbdca24fe13c780460f3e4ec4580665004afbd300fa470a91d3becf1a5f SHA512 122ee5ddb1f65f386d35e438396eafb7c9f2b1254daa11aefe0a6a45aa0662190c0b7fce32b6e003b04d022e60c2af4e355f995d5ddbd1b58df93eedacb809b3
 DIST phf_shared-0.11.2.crate 14284 BLAKE2B 3c3bbd24de77b032d194d0b0679a84a4e2848d41ceea5552f73e51e3ebddd5e61188393f126f668689dccbbfa92a8accd9c09a77de39eeaf72b8993dae280dcf SHA512 f2cf9e8ceabde75bb7548e5a47dece9a8fb7eea4a6c5568675e7bd735860c3e51181d749a26cd3dcad1476ec22d524ccb77a956dd267cd0f2b7dfb81db9abcbe
+DIST pin-project-1.1.7.crate 55438 BLAKE2B c7cc110f906d29e25325ce1fee00777917d0d07a4b53e65bd6e25d54df96bcd8fbab0ec33a8b994f8e0574ad78fc3c590ce46eab296653af560b629a5b93d51d SHA512 ca3cb06148fe20d64d37f6f115f838da2e8fd0836b8f08b316518f4f5e679b3776cc0fddc393add0f147bfc74756c03a2273dba7000e218698f9b6cf4b2eb093
+DIST pin-project-internal-1.1.7.crate 28549 BLAKE2B cf09f51caeab7b9bdc8e21e9a4b711666ba4f1fef47b9168fca4ed4cbfa1fd4a2d1a258c3c9ec9c5538e38c454e03b54f6c03d3dff976d0156418d7ae7f5dcbc SHA512 7ebeb0cebc01fefa327e40470df1d0bf40aa3c8f5e3ece8786bec5bde0df7bce3a12039267e731f56964fb8b45d38f2e8971be0e3753159ab47b99fa5176fb29
 DIST pin-project-lite-0.2.14.crate 28817 BLAKE2B 8e9875967059faff399fbffff82cf8835982c46ea8df942acf50b038e3f500e04d3d8cde39da5a71ebcc38b869553f8c49830e484d1109b353247a4cfdeda89e SHA512 f90a6b9f5ab8701718f72677a4f3597c1b9f32e5fa53198b47a94696227ea37815997599abaa6058b217c5b32a94602582c6b13fdb66e2d683bc98921de95293
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d
@@ -120,10 +185,16 @@ DIST proc-macro-crate-3.1.0.crate 11084 BLAKE2B 9a9d02f0f34a30668ba94e34d51199c3
 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
 DIST railway-2.7.0.tar.bz2 302731 BLAKE2B 3cdac3475a65ae6a490b9766a7792f611c597733dbc8fbb73af344e7a40822d92579c8fb7845e1fcf613246e0d4fbaa6553983d9ab1550930fcb4c9254c5b91b SHA512 bb1dea1c4fe586ec59c271d0497c1780bc9114b961eeebd57c58d0af5128e59cdfc1990404c48f54ab028fc43d4f822801956f51c9c305bdf4449caf5afa3255
+DIST railway-2.7.2.tar.bz2 317907 BLAKE2B d792c3870421316de2abddafa242c32db7b5d0aff1557fe9e73b76c4db6d92149ad0661f77d4bd32ed3313840bd9543763c0ac45a2673299338bd136131f5042 SHA512 545621e7446d415a9d68e6434dcb3f1613381a6fbeaeb0d0a4aae63dfe3f47dcb098fb87227ec638f2dddc76e9d8cf0a247b5b257a6860a7c3c81add21481208
 DIST railway-api-0.1.0.crate 4740 BLAKE2B 35a7986aacd02b24274a1fd9c6d1e2fce40b087e52863b5a2c1980593f7e6a83d5b56027957ca310d1d397526735b27c21462818db047d5b5e71df4d940d863c SHA512 89f9a0478610ac1df8f2caa003ddd413d4c2c4ca5f16fdf962a9655c1fe98db6d2324c4093ba28eaff36918fd3e1b8cfdd911a2875a4a2858fc180b45a649097
+DIST railway-api-0.1.1.crate 5279 BLAKE2B 87c0b0a998e072c14ec9f716c72ec189c5ceb21952046baeddfd61f52295ea7bebcce40141cb1be79e6009bac4ecee7c5c617b4ea9906b3a799172aff6210660 SHA512 4a1ffb927d61c926027e035fee91515c8a8a00ef9596a605b7f1691bc537053299442fea7cb21f555c8d406e944b74a60c8d945b6c5ba73f5afd63b6a13ba44d
 DIST railway-api-derive-0.1.0.crate 3247 BLAKE2B ef5114105d92d479965ac18c0a4725e3e0db34b418ade0f91ccfdf77beeb82ed93cc77e90bfbd6a4dacfbaafd6d34fd79119aa9fb613f0f42f3777efd86bbb04 SHA512 dc18bc93a606b469b2d008220812c1e7a6eae12526d2f191ce33915f6d7ca35ce96f04754687247222c3bd7a340f138565fc43c50a97f57457b720d39d3cf482
+DIST railway-api-derive-0.1.1.crate 3409 BLAKE2B 59116ab49ab9d5f34ed98ac0d100969b1c3d548493599fe84b6b7157d92924d67becbe25bc0b746bc0bd2902431d7306405fb11b9cd5d49b0d7c91a06ce65b61 SHA512 5426b1128ca99cc389ffa7cb2e149c9bad099934593376dd2deac770f0dd50a67787b00b01c871122770b2de8d403b51be417488183e5120836a25668b6727bd
 DIST railway-core-0.1.0.crate 9042 BLAKE2B 2c57803a5c7a5596bd533ef1c0286b00b257490b95f1904449711773ab7df388aa2259a25f62df470905d04a32fba94a0e26208aae15873b34c38d7ba85dda36 SHA512 b7102b8f76d2ff6cef4766a47e492e6bb5e7bdbba66ed08257b6d622fc463de7d55dd886fde950d7dc9afb5ff7a6ea64e5ae3c194f052ecff99391211b8c5445
+DIST railway-core-0.1.1.crate 9755 BLAKE2B 203b799aa1ce7b7fde6ac47ed6d3c3bf69eadc7294d69fd285ee58d5e7ae3a9c73a82d09c6a02c4e1ea038c694235b86a4a2ba0dba4419ea6fc0599ba8cb6fdc SHA512 f161d0fd30f7aee0c0b31fcbb166e80c80bc1e9017169b33ecc40e2755aa72bb05a08c80116775ee5977f7ea92a15383460e8cd7cb53236d00ba205f46300474
+DIST railway-provider-db-movas-0.1.0.crate 7603 BLAKE2B 058aafbe4f19489cce5d635cef209a00e1c600283aa465536c3ed5e443574887cdac464968df846eccaa515d3bf17e6633e2ec62cc9f0df4d7ee63622c612e29 SHA512 761cbb2c8a8166518760418e3dbe36bbdcafbb1177946e02ac0b9f416401ae82a746001c27506cf7dbfc7ccafc830a50b4d081b99f0ae3adf516bd543f6834cc
 DIST railway-provider-hafas-0.1.1.crate 32706 BLAKE2B 58e3449e7624afce0451ff043da13ca20bd762003448765111d1e2736eeb489961376c920a5b0b3a9b7b51e735da35e2039c19068424f1d6472b46e0dfef1402 SHA512 83e16e232a286ef97b51b4bb5d82589909414f222a4d28abe97cc374d744d11ee94f1523a1d19f2eabb4c90e078fabe70f1154ea579addae79dbe5becba55263
+DIST railway-provider-hafas-0.1.2.crate 32211 BLAKE2B 85f919a93c44b73dfe3c347f490f57e8a1023a7b2b8dd6650675194ca98d834784cb025bbb75b2f9d0b276207b29108319b424ec325797141f91489a222167bc SHA512 6c9000813038ca2a9b39ff3841ac5e2195b60ca32b8f4353522ec48d16afd745340723c9f692383e53b2f7c5ba3cff613b6a0576128b660a55b8579b1bd0249d
 DIST railway-provider-motis-0.1.0.crate 6805 BLAKE2B 6549e70492b52cb68b8a68e63f575fd5a333e80eef9cf62c2d1c43b26c15df858d4abb25d15060b6d4b5fd90fa1ec246086bb7bad090affc3d5aec932b0f79ff SHA512 27cb31527f4b4f77935f11e2be7564315014116ef2d295a0cc8399502637d7103a9aa5116c00579eb9f9d17271d496e55f63ad0e910619ad314c45896bb04c3e
 DIST railway-provider-search-ch-0.1.0.crate 7473 BLAKE2B 4d058377960cedd08e5d581d65891538b97e7e9138a625a1e2736751b2e298cc4b56ea846f6e98facc004a06ab969b42e2b499a27e5aa892b1e73661387d73bc SHA512 0e7d192a495668b92f17fe95421500ce00ace771c5d3bea8a7fb93490c6d53c7f7280c2cfbade7fe69de4c7a5f7911cc2a30a6a5374c5c572c10664e90cd8dc0
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
@@ -131,15 +202,19 @@ DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808
 DIST regex-1.10.5.crate 253805 BLAKE2B 9f5418b577209051640c3614a98b15604a1e71144763a6f00caa7757f0ff67fd833a7d14fe9d6acef96386a2a4eb60cf5d490472e73fd62ca8bb0e78d4f9f125 SHA512 177fddb001e14281510e34070f88f8e5167278a46f1d93d9286d9606b7673346f504e4064d7ad53558e6988a400c728e33b663ab398fee12ae23fba7158da5fb
 DIST regex-automata-0.4.7.crate 617582 BLAKE2B 6295d866706b623b2025fdc0c407086fec15053229d708713d0ec165bd526ba25e7468d0009625cbbbc21d20345f0af2eea10addf6de633e8e6a02dddced67b8 SHA512 b19d00d64bb8cd833cfb35fabb162b9481716f4b7f6035c1c8f1de4e0f90e00823d006e057aa3505aeda48c9e1802e61173c4a2878891129a3a918727e43b0d3
 DIST regex-syntax-0.8.4.crate 347577 BLAKE2B 400323cdad2a7daa8d4006e4dd7a7b1234704df0f80ca0f4bb19447f8f1d270053bc8aa613e48291ab3a78c7eb02d7afec57bfc8d966a48b372a4c80de9b120c SHA512 10719c138d9aa304106fcbf77da0b01645d1b6fbc621abb639dbd43ed5fc3dbd22aaad8b86df55a60e7b2b4fc347b6f41419131d7b047273e146073250d892ed
+DIST reqwest-0.12.5.crate 177108 BLAKE2B 57d8af4b528339f05fda286cfdfff4463ddce2ca206c2bb01316fa7f12201ccd1eca8d8c4af0297a3d6547d94912d2dfad2193b633737f35022d438ebe21d8d8 SHA512 19ded1f2251ab7308533b670ed57f33f2f8ad59fd937267e55ff92a15d72efa3c091c4cd2eb1b8d2e8be3a7cb652dcdbd9f6954cfcf218c834107693557a3824
 DIST ring-0.17.8.crate 4188554 BLAKE2B f531b15cc5cf88f2ef00b1708473a7e98a42dbbd026027ef2c42f2d8bdba0eb1665621fc98db618252f6a131bd54b1493987a0285bf2b9a22eba4c9409ee1cab SHA512 e4966409a4078ee43bfc9cc659d08ad28419effe2a729c8c275361a7fe0620a3c727009bcfb1d0bab265af2bc107b50c19d868a4e80da7a8bb55f97e8b214358
 DIST rustc-demangle-0.1.24.crate 29047 BLAKE2B 8248b014eedb26cdc0b748544ba91b9aae9c992a6f93b4d3ac256b78f691d572f8885a3575492ea556698a241d2759743968293079ca02bb6a5f318b0ed66dd4 SHA512 eb897c35300b87766e6105917a907fca1c5b1f7691fc03c6c1aaf38075ac883a73d1eb54a245d13ba59c7b0f0333d6543e23fc1b1c542fbbd5c750a84660b9e8
 DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
+DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d238b8fb64ad4a90ecc4d8952fb042c0bde4bf13d52630cef34e73e96dd32cf772a8601b4f6eb5e2961f0a394add SHA512 717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f
 DIST rustls-0.21.11.crate 284815 BLAKE2B 1d14027e1bffe6f0f1190330eeb19dbd4eb2df1c52e7b78dc2e35102d008a55724a3948d04b2598b2b698e1d934c90be337799831dcb63b04d7daee89b0f484b SHA512 e16d817d94b28e7d7d5b466497d8d52b5a850ce289b3d899bed81bc69246ef3fde7ed5a8e7a64babf5566c8b3666124dae67bbcf14f2f2f3ad84a021b938dcb1
+DIST rustls-0.23.7.crate 381800 BLAKE2B 972e0a53af5f92c7555cafa0243b2048d3f4a9383beb8f0ed08b706d218c187121b6a9d81ff319dc0aa3ff94a0f6af991c6223083896b4c87561bcd972b4448f SHA512 dec4e5e505911ae13912c48a6591c5d975eadadbf3d7bdd562561d561271b6be4fd5241fc1ca3923cb114d61921a89b5d0eda6f6bff37135c3579ab9b2e83e9d
 DIST rustls-native-certs-0.6.3.crate 24438 BLAKE2B 5f019685414f19eb709ad61caf5b3df4c8b498aeac499b1e841d081f3bafbdc66a7f3892c6cfe699d5d2b702c3d1fbc90f0f6720e4cd5bf8366c91f94a02141e SHA512 53a3a4b96f05dd06c575b2eb62eb7b6d026bda539c87c0e2a4bc84fd332c6401a825135fecdda39c489b0c910ffbe4d42c93844fbdd8da4fc2badad400b27264
 DIST rustls-pemfile-1.0.4.crate 22092 BLAKE2B 9a776027d6e43a336ecfdd6713d4b1e6642378f81b73c97752563ee1d2cac5b3988afd48c92d25d55f655a6fa248436954aaa0e0bd9c7c679c987ce7df0cc99f SHA512 bc748ee06f2c101d8e54e8c4555e88c5ca824ac7bb0182f8e49bfe1fc66d418d2a3da8e454f3741697f491ad0c7bc8e924a752697023a191c1bb6eb98c48aa37
 DIST rustls-pemfile-2.1.2.crate 25928 BLAKE2B 790545dd6347badda8f67bbe67b8d4d7de9f24c134857840d7ba2335f2755cf03c05b26c16c8b1e397b3257cd39a6d3a333103c2c3ea32ccf4118bc3d42995c2 SHA512 35127c68250c31f2fd6924355ec37d5318d8a86ad38da48e68b3ea6e241deeb019eb967c510e95230be6d6c3357b0a85aa022942d21a50423632f8e2496177cb
 DIST rustls-pki-types-1.5.0.crate 29362 BLAKE2B 74a1ab3f98ebf77a6baae88a9d862837840f7b43ad43bdf9957ea552ce135be926843067789a33cc18f87de3f800ec509120f0f8c037017e6a111f36f651db70 SHA512 0c6804a96a6424316b21e1160e3c18fa5f5c91265e8c5eeac3e9b307026a2e50a96073a71ca033dfd95b516fa7d335cddb35f2b5c167fc78a33aae7f1b999757
 DIST rustls-webpki-0.101.7.crate 168808 BLAKE2B ab7177449be359e17f1f4553193e96e71b8e26e1298a0937af658b1a6f9485f051183d1bf8262d52430ea4c3b96263d1fd903c7a5f046bfe5f87b6b97ebb0672 SHA512 680e3d52f699c9d6200e2e738a4245a5114fc7122546c07d3f15f1e6741a52275061b3e016c2240f1dc3eb9f701f7346193bd82e827274fb73b8e9e0d5af4e68
+DIST rustls-webpki-0.102.3.crate 197543 BLAKE2B f39081c4e5938f3ec6dcedaf9a0c8832f6b2a16dba9c04e6ed082e6f7f46b53ad98e01068ec672ed47ae763147b7f0488a33e33fe7e375f53e1892cf614428b3 SHA512 ce8485bc60f2e2c87e96e0c21da1774d403b20e08db169854c56ebc6c61abcd50bb88d2798c83eaae93ee12081168f4ef934ab8681fa45522c41eb3facc440fa
 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
 DIST schannel-0.1.23.crate 41667 BLAKE2B 3f34ecf4cc519f5302f0ab5207907a275c68e6fcbb47630aec4ed5d5f1a1cc7475f6d7a8c22361e9878002f9f54314c1f630ab0c1f77ea309714bdb7ada6c9af SHA512 dfce25e3b8bc09d8dd1fce2783fe02ec83f74697cb24aa212ef9369a628685ba488f821cb3e5f863798e0e59995038c8d748f74b89f7929eb8cfd804d5066b84
 DIST sct-0.7.1.crate 27501 BLAKE2B 12f63e62f49a0ed0c5a62c1c9b42a83c1df43401ed1de85f993167d8fc52733908e58ea1fe76cd7ff6128d4d6046d7c0335434672ed1865c8ddb1b3fbaecb590 SHA512 6030295b3b11411f5a7e518db1066282bf11a279c27414c5e959cd430e9fcbb7358e5d69bcc68c8bf696d4c1d9579ed7218b7f9dfbb61de2271c4c3d3316fb7e
@@ -150,26 +225,41 @@ DIST serde-1.0.204.crate 78253 BLAKE2B 6fdebf3cbcc0327b404caaae43c87ba2b6105374a
 DIST serde_derive-1.0.204.crate 55871 BLAKE2B 8f0cdb244a820712d557a3273e505c4461f4d7db89e8394040b4c66ede787b6b38b4c9923b38959ab4042c9076b8af72008c0dd15ac93a0ecdeb99da8fb526ae SHA512 bbb2b5e60e2af5bc7528b937ffaf0d3ffd433dbd9cb2592c1e07090620309057e4f11cbd6112fc1d2c5557e1bb3c0f4d59eb06ff06fa021ec683ab880997140e
 DIST serde_json-1.0.120.crate 147062 BLAKE2B 54f93ef2b0f1c9e7c5a8e8797fd298c96513913a20c3e08a21aea39a15ffb5ad0269d5daab10fceea7164ba432e355b89d89dea2985f86bd0e73ac3920f827c5 SHA512 dab44850326f9020d6f6dd3fc8147e22eed693527fe9cac2c6bc8f6a030f461061e8e54d2780382ce32cced63b5a016372a4f9938effdd1631d8f3dc96014e3e
 DIST serde_spanned-0.6.6.crate 9120 BLAKE2B 6748b04f30cc63297fe01cacdef743b688aa0777b600d603919d05676913133450c97a179c6cbd4a62534431b74c4bcf63a60c1185ba89cd8266411d3824aff9 SHA512 e07254723645c80d10c1ab9a7282251fcafa0b5144991568b1b1f85e7c8c8bbd82b5992f2ed73fc7a988f6a0175fd79fc927c6b28b7420e83269c3364d7ead4f
+DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60
 DIST siphasher-0.3.11.crate 10442 BLAKE2B 771221614bbd56f609b9743da4352dc7a2cbd0f6257952fab0cd052e5e5b258a4c95a0461d6d1b579dec90b72d66a0e58e036899b3db8341ae753a421a4cd4d5 SHA512 601121bd41da896142dc6ccc74a6eec3ebee3e976857ab8b5d21e915fdc8bc6e979af66a489c406371fbbbfc7a13338cc4b3744aa981206e43c53998f3e1699b
 DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40
 DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
 DIST socket2-0.5.7.crate 55758 BLAKE2B 148d2e2b6610895ec555b1357b340576984eb76cb3ea719f85af50cc4215b2ea2db739e2a61434c09360a0c1ff8e05911764e18dc4a59451c0aeb0eb60b8403f SHA512 ca37157bfa970cf3cee8b45c7fe64930becf2ffbbc309ea4613be968400279b70edd084d159f65b76fe1130917312d81455023c0d7c1bab7a59c79542aef9dcd
 DIST spin-0.9.8.crate 38958 BLAKE2B 8648bf2e48fc618758e3de67f0a493bf3cd22a8d18666164b0d850ed7c0d73650f7b0af783019dd361116bd60c61d24895cdd2c579383cd2700de0e32a23cdae SHA512 b15ad66ba9b308937f34ea166b799676fa45c67224e10cb57530fe33d2a8317ff3e3db3223a3249fa2862cc141c964d2130d3f39910a86ac5ef8aaf8ff4bc6ee
+DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
+DIST subtle-2.6.1.crate 14562 BLAKE2B 3cf4940b7a01f04715da1057f6a92b1043a6b86ab2ee7f9fee0337b680ff781201d330409460f6f90b3f81bb5fd4b563e17c762c6e824ba3b0af99e4ae7d66bd SHA512 f5946ebd9bcb8776ee3446abcbf4afb3cca5d8bd847cadda87e864333ac7ded537a3efa773e9648adf20ce4add2c1da85172cff88c1e1a3a6cb051401b00c6bd
 DIST syn-2.0.72.crate 267069 BLAKE2B b0b979f78937a10a6db45f96d5d93c595427a4e158d658a2186419d89b219a4a405ade488d88d9ebdbd605ce4b706aba7088ab39a77294f3cf9847bf032d8f91 SHA512 c3d26bf9787555bc6fd8bd789855d252e80ad28a413593e13bad174adf86087ff195a6b4227bdeb6d1a1c87b0af8e965d6f2d04b8d45e7383b6de49990b92e89
+DIST sync_wrapper-1.0.2.crate 6958 BLAKE2B b2e162f982ea827229dcff468bcf31c6286c57ea3491a909784cdb50b0ba36c3a1a6fbdc7b34fc2aa9a7df1d174393d61ea9dc7ab3439a5e1a1884e2473a70f8 SHA512 aa314a6ab3ba028d2a169ea55a50eecf3b73b475a81c91330430ece9f1734296562627a8c32fad51b5a26796931f364e2803b3a13075ccd9a0aa614d5220903c
+DIST synstructure-0.13.1.crate 18327 BLAKE2B b29ee88c559a2d58fa46b7af155b448f001649ea79a1898f0ac87e69108b87c65cbd287d8f9001f360df7fef06ff39c937b48d33e487a30c8eec6a46c639c0c2 SHA512 09024193b44fc9a8901bda845b9f86c57dad65d0f53e309b2e7e968538fab6f67db1c86e5e52a2eb8fd116dc073e3ad10983bd60764662ec6ba94fee22a958aa
+DIST system-configuration-0.5.1.crate 12618 BLAKE2B fa75a24f8db6eafe578bcbf162fcd110ca059c58af24916acd64959b48d8541e0aa95ce2c929a8a50c62e7e8a967de9101640d1da7805fce2f76b7c5c86c4544 SHA512 af77ed5be890e826b9b8f975bd2e63f3905adb24a597069a887ff2a861820f1ed40582b918f35c3d4eb063800e179b93e5acd7d5b48b147e9b16e3cf4c12840f
+DIST system-configuration-sys-0.5.0.crate 6730 BLAKE2B e40c4b5e7897cfe30b2fb6daa9b44fe2b83eb2a12d798a1ad8908b51abc735566becb0e001f52f5f8a0d3596f62a9eec631341c3a9cbd132a4f650f988c74b93 SHA512 764168ee5efe1ba82e847ed74a14d1f5f1892735e98657c3ecaafcb4b405d4f779592dfaade252f6a577ca2cfd5cd5e467c0b6326bbdcfa573c3ab01cdc8fc34
 DIST system-deps-6.2.2.crate 25546 BLAKE2B e2f3c546565ae26554bfdc284eff2145b1248bed90f5b4315d9151777c96794f1aae0ec34cff0d3c922d1ee287e637c1b6c8a96dd48c2a2bb8a58871d2967347 SHA512 a81020d5cbccab3c618f17d691d76a058c634ff9e3615cafdc95ec002d8f1533586ce9ea1ad5da8ae3945be7dfd3d962cd7dbdcc95f0614ed5156bfb3c6c9c42
+DIST system-deps-7.0.1.crate 26165 BLAKE2B 0d81375fad410b3ca707d6e6af4d5882f9f5081a21c1b5678e6147180b56c8b76a3b06cc657edd020f2337cb562f1faa481ec2b5a6c0e49aab3ffab312b6082b SHA512 86c998921b614d19c760791c523ebc7ad106ba28c411e68f7e93ab68f01bdc83d47b06ce676146a08776e069b3186ba29f58ad6a0fc27f5871ec99a9bfad43af
 DIST target-lexicon-0.12.15.crate 26384 BLAKE2B d1ba50aa9d50647c6f778df86b35db1a4dee56fad918e6ef216688d9ac716dc5e8b40bff15aa89a99e4874e74d7e2731ad7fd9ea7094652def8abf57b74f9811 SHA512 32cf3e2da1c28003e1b6347abc8ae4d8182bf5b719ef84772271fc871dbaf96ec98c03b555a748cb8ab76584e67e17532757193d1d84b057cc90bed525727fb3
 DIST temp-dir-0.1.12.crate 5792 BLAKE2B f38b732e2db664729c31a815e56d48ea3a9c08d5c8ac4cb7c040e85acd6b5de2e37b2da2b5451ed30cb9996b33627d65695a390bd44f90ac44c29b4d05522fce SHA512 464b0e076308649bcf9a4c30726f025702f538131d384d7ec901e6e53d68d67345748cea83472902a3f4bf190a934524af92da91ea4ea0af20509414cbbf7276
+DIST tempfile-3.11.0.crate 34153 BLAKE2B 3a89580e05600ff2ef5637d2ed76ad8f1a769f6dae40cbd23f7bc2cb9d0807d03713ce1571df54c866c8fd9a4fb073990e4e98cc8ffee33aa4d8343c2d39733c SHA512 47d4c48c4f90d116a2f7d5ebf29ea623fb0a0fbfb1192aaaa53a83218ac910b6c836d6d4d8233b07d06e14de70fbf30d243152b7ac22a03d180905c53b6ad9e6
 DIST thiserror-1.0.63.crate 21537 BLAKE2B eacab5745d948416bde165d768f55c10c132572052db405ae3dd3e6e3b5ce41f36d574192ae68fecf6002ae5b14fd0aa135fe15e1614f3b51a294d5edc67c9ac SHA512 d5c2360075947cc0fff3253b5532f03f3102d6c9ef52dfeb3b400771116937e466a62ce67ccdf91532bf096f4882322522349a727588fd87b932326c8e758753
 DIST thiserror-impl-1.0.63.crate 16047 BLAKE2B 290b56ece5c592fdab4d20e9ebcc8dfe3f76b00aa48ed6c216ed0ebcab86b1ab4b4d676d0f52329abaccefae12bd47b4a81966901fdcf4ca5d0632d5021adbb8 SHA512 f93b7f89784d72d8b6e36050c22b88b7fd8de38e9a90fa6fe3f45973ea1566ce8bf82e959951377e3bf584a32afc97812188be25983a028be138b1700bb8c102
+DIST tinystr-0.7.6.crate 16971 BLAKE2B 33a248261c4cded41a81f0d6e6c8df55437f042b37f235c39787986ec562f0dbff50b282ad0f1483daaf49c4b33e6618e139a6677d1238c21f4e12082562b4ae SHA512 a33051848de248cac0a2d151760a78cb3aa62c787d84ff7aac38b11c0660e9188e4d43d43a77fb8676e49ac6102015e9c3db057848d809e71981851875d0fb25
 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
 DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
 DIST tokio-1.39.1.crate 779585 BLAKE2B c832c169cf7be04cd26a18f9639de766b5976587f4fa77480040cb2c595e3066c16146674b2a299088a6ad1e085eef393d75e3d170235fe63b80a96940ec1fc4 SHA512 834ec9b0f977207167222d8504b58db504925dae1cfcd6047a0557a8380e6fea16f92d11c3967158787450de9e0ffd943a0faae4051df4b59a89d132d37eb03f
 DIST tokio-macros-2.4.0.crate 12501 BLAKE2B 9b358adb86e828faeb956d24a1ebf68b51a69bce519ad9760ec3d3b8eb1cf4435afd4edc5ddbf634fe152bc77b8675182dda3f076f1011c5b5b97850c1fa1689 SHA512 f4a445f6c2cc7c1cfb5825919cd3dea3af52720c7793c20601d05870e7efbcfe0c6231fba7ada49b5ce46757f0e1475b3667914ff33c2fcb25e9a40151bd2501
+DIST tokio-native-tls-0.3.1.crate 20676 BLAKE2B 4c752179aab8b4beaa6aa212dc8d9e4a2b7c12be0dbf80406f20f92fd12844a3390e88a1536875596ab44774a67ce35115ca4622f9faa977c80c4261ab4c06ea SHA512 bda2e77671e030a021f628ad760b3fbdc26e7483a5f9ef6c6892ae0fc38b538d52d527805c020d578079896d50fff0bbc036a87cc91604904840d5b7dc181914
 DIST tokio-rustls-0.24.1.crate 33049 BLAKE2B b061bc5895b9d7e5aef96512667673ac6fb813a4524b1f6620af9e2598425662b15b5e07d3896499b8a24d820462d15b71a2b9cc804886d546c8ac5957f28529 SHA512 93098f34d117107214e2e80e0e6c030423850ba160d1858b5149c165643700d308dacef7723e45b79fc911ba13bc1bf363c89ccac047cc6636e48a9a5a9502fa
+DIST tokio-rustls-0.26.0.crate 34253 BLAKE2B faec8cf5b55c5b68549659e82e656d63181b8384d170690b8a22e00b9b7bf4f63cf3f2a0c7a78ed7adc9122253765cf8aa0adebfe620f642f08268ba66ba610e SHA512 101f2083e04feffec48204388c4be3d51fd6dc45bdd04bb75bdfaba48cbdd89529e14dda194ef45b2d78530cc74f128a763fb09165a52d738eb17adff7c56664
+DIST tokio-util-0.7.12.crate 115177 BLAKE2B c6018d9d228ca74f198767ea9be53569bcceb369e4dc9ea10b31e7baa0a4a6368f1ee23532121499e31f2da3f825184ef7f8e00911efb1c2e37295c1ea3ef19d SHA512 df30a9b0cb435bbf3030c1d5bfd4391310b96833acfc623f5343fadd694fc44601fa07663fefa2cfc6719d444632890efb696727d9c1049376fc6e01f1814c78
 DIST toml-0.8.15.crate 50652 BLAKE2B e2aa6e1efc9f5d730659d79c9ccbed7e3f6e2150cd2f3e00dceb017e61fa24ba69dc9cf6b9594d89d23791914e4b7016826875644acc523722f3b770aa50c6fb SHA512 3aca72fd693d3d16fba005a03934c2473c72e175425f0214b43f795edc9dd75fc855daecffbe59279608931010948b32aa720a8411f8b6a68a06e27763e4c94c
 DIST toml_datetime-0.6.6.crate 11698 BLAKE2B 8db35da8a3f6fec053bc82995f4abeb8d2855f2e94ed6ef4a4a6f47e956ea2cb6f8d0edd5c1b1cdebf83c7c218d9f2d80f48346e62fa7985532cba925891edd5 SHA512 710182bcca90f0d830423df41ff0f8e7bd10b866fd7ea1f6d37a315c7b4732a3b6fd61cf411b28051959034534010f24e250e10282c4e5a2539c2858f447aca0
 DIST toml_edit-0.21.1.crate 101661 BLAKE2B e794b6121ba7e2b1b3f50966cd40eebacee6968b6b28986cfe4cb7312b51ffff19f74826910d8e4ce307f74940f11e71e6afdd768ac196427bddf44595bbc797 SHA512 10cd3b16f763f55294923ce8f166f96fbd67a0acc4a93a46fb3044d8a38148097c592ebb405ced87030d35154abfcc971eacf0172b624ab477a11e616efbaa07
 DIST toml_edit-0.22.16.crate 106618 BLAKE2B e461b46de9da1fd443588811ce788875f3318dec3921a048cc84b3ab1a5a75c773918e85578a5185aa3d713d62f6e90c3764a49d184fe48ebc50d6a127d5d8e8 SHA512 338d3aae648a4855503b39f10aecbfecaf63fabc3cd904d42e5859ce22af840f734b29440bc8b72a31fcc3c689f6d8417ee4e3330713d461b5480d30699732a6
+DIST tower-0.4.13.crate 106906 BLAKE2B 6a8f4455dcc69f6c03af703fcfb0e6b214c2ce599611ef78fd41cf411ccf06bdce241e03a1d85d36cfeadc72db9f3d9b7ed94c4fcec466c070f2357ff6e27360 SHA512 592f23eee5efa6a4f0d2ffb0d965da7e0f75a90a4320a0d0dacdd5add66513ae40902d21af2bf683573133ee984866987df2ae8eb8e632cba7a9d196985aff8c
+DIST tower-layer-0.3.3.crate 6180 BLAKE2B 20435102dd62113c3e961bb28d7b18ac6f8ec6d5f0051f511e6f5eb044b20016f247ddd1b8eae9dc9f1ee259d8cc31e0bbddd26f5a22fadeea4007a3011b8500 SHA512 edf36671076cd29bb32c29351b648afbf3e7134316988a697c7807db62de7a63cb0339e4db7c0f36ed60d8aced7f3e493318cccc272070c037b01e2dd189b934
 DIST tower-service-0.3.2.crate 6847 BLAKE2B d4571704eb4bf7f729f4535a04b7eb94f644d71ba8c5604297843351adf4bcce7ff64ec4e5435783ee6ada1b0a5c97726cfaade391525c6b2bca933cd5e8ec19 SHA512 f4578421603067fa708c4ad9eca5ca096b5262b6d51a404f37d9fbb6c64f027cec6114991e4b7f8324cb756c033971a384f1804add28e00d0cd6b2ee01d9e005
 DIST tracing-0.1.40.crate 79459 BLAKE2B 33693ee71564fe5925a63dca351e838dfd8612b4b1e49a33a70095e56ca63287c13c772661ace0e540d08c92942d7cbdc51ff2cce4f4b372164d9aa20ec05dee SHA512 5622188a45dddc0d6d3a8244a9b12db6221f4180944ce1019d18f4e613e4bd113dae5d45fb57dd0754f6e8e153b047cdf00c8f200782bb2b868bc2d423d99275
 DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d359351f4d33609b4291330073b6abf4b63f5e1bb1a7dfed3bbf4d6913ad5217e96999416261af8a70609408a29109e4db6 SHA512 164f79cacfcca533a53b7dbbdc2015aaf851a16e00c72fbc4e5f515b6a6dedfa464e964810009b54f08cbcdc5a314e50245ac7b1b01a71fce4c63db135bf5521
@@ -181,31 +271,58 @@ DIST unicode-normalization-0.1.23.crate 122649 BLAKE2B 22ea5ce3f5a2b371c3c878232
 DIST unicode-segmentation-1.11.0.crate 102740 BLAKE2B 6ab5de53073ff56da4924e8c6ecbfa4bbd72a66b8d86f2c32b2f0ccfefee8064997a6b5311af5de2b71943089c9f52862e3cb13cf366cd645f57c96f2ac8673a SHA512 4914543cf022680f341c4a235f6d9204b3ac9a9098f34a80ee8c94e3d8ccbb82e78af016978eda910987533044593ac629a35286dc80707d349b33e405e86bef
 DIST untrusted-0.9.0.crate 14447 BLAKE2B 8e9c3ae09435af0885bc4a6e3c8943805b48cfc00bdae228c7c43093254e1be15d7005d1026561ff369ec37865d8458203f421a9c89ae3db077f655449621aed SHA512 5929e4079c1c2ff933ae8d8f59a2ecc7a424e71a20d1b8821f75925af68bdf82604b024c008e5464b02e25ff093e561a352b685e755b3d0b27e4c30254689416
 DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3
+DIST url-2.5.4.crate 81097 BLAKE2B 74943c63809ca41a526a146bedae66f91f390fbd2ccbd90f9397d8074ee7ec26535f0f67170eb1d7232e139d8d795fde99be37f53f1bc32c6a6a4d46aad1369f SHA512 8f1d62bfdd45f52fa12ad657a521a3478d0ab54d187346a29dd59cc66a0f140ca96d850948e09f6316f08b44b3fc68526c58bd620fed5d065b7e8528df3cd46d
+DIST utf16_iter-1.0.5.crate 9736 BLAKE2B edcd9776113d4d2b267a9cbd58cab11c5497ff1a8252c4e695de619fc8e5eee1595343c857651774b3670d13392144e9d7df579f2e226842aa7e4e023a76fb65 SHA512 44dcbc5a7db149392fdaa31862be240f78fc5d7616f54be32cfc8f3adbee310e8681ae1bbe6edaad8a7fe6e7759dbac8ae4f69d0dbdbe5350c21dccdbbe975fa
+DIST utf8_iter-1.0.4.crate 10437 BLAKE2B 1e7a8b9241ebbb62cb497542b970473780f735010a0af900771a43abceae4e7f362d21d4f79f7c00630e4549400875ea17574b2cbe4f5ea19e8ed428e3b5577d SHA512 a72671995b3eb295581c60dc632e4a25ba257227fb5d58a8bec322428b6d69529bba79a6f02b8e7ee6698b7779d9d6695f5badad73e07c254b00c9d6256c9090
 DIST utf8parse-0.2.2.crate 13499 BLAKE2B 095b5d219ab8ff04c06fd6303e03d913ae36a57845f0b2ca3217a40e31a54cb0fb5ecedbde165d28f5f60f1553d8252986d7098fa83befc84a7cb20bf3b76144 SHA512 f3dbf78fe924f1dc3cf9498b6e43fb10174699463f31091a7a8136d8f31ec84fc00e80e3d8551b7e86257e8b3573cfddb56fc0de797fdb2cde0e962a8f239266
+DIST uuid-1.12.0.crate 49085 BLAKE2B fd9a0d254fe4e2c1aa2d5679fe60b27b5904623d49fa3d7226f38e7521335390dc744fa238de9e7c24ea4cb1348134889065fd77562db01c8bd04a4cd56a4508 SHA512 b58084646e3a81244ec2debae20735fbcc9e1bc414a7b8fdf057e8cf1c0aeed362f42806266fd7947054c2af031ad2edb48a0d34b0d319790b0dbd9409099020
+DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
 DIST version-compare-0.2.0.crate 13942 BLAKE2B 054f7d717ba953f4dbda226aa22332fb40622a776a6f53450831f027273e5a64bb8e87d42a9af1c64a6f035afa76565309c5a8810a20b8a5e51a7168a2e91dbc SHA512 b799c1713d4bf7af00f9c6d562d39c5e916f37350c2f3f57119277725b81c93246d0b1410d4ee981694bbbb731460b6512a813fdde1cf25949cd45fb3e70bd6f
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST want-0.3.1.crate 6398 BLAKE2B bcc1384bbb86db27b5e082b29a8dd4d89c37b40f6cdec4df8a86c8d205b418468b6cd42a78bd14ebaba057b28e151c00b474c098d7596f49a823ce33510c13b9 SHA512 f93f765113f035e134b967e8eb3f4511b8e03e793a47899b614d826afac02348fc02865c298a10410ecec4eb64f35f66c22bcbdbe36ed0c4c1665dca1db4d526
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 DIST wasm-bindgen-0.2.92.crate 184119 BLAKE2B ca256c686bb3854492bad6afe3cd27dab314561a1ea2e0205579820066b462bacdb2cc01075fb420bd20eb33b03a648ce1ff46feee04d8759ea8aa990ff8232a SHA512 6e46501276c0d4befbf930c816d6ae6c3764e3b5ce0ef4aafa627a6ea371f1a056ecc15970a817e9e9bf51c0a2ffa57df427d758b2d367beb6a474d75b8939a5
 DIST wasm-bindgen-backend-0.2.92.crate 28348 BLAKE2B 425497aa7a023b70549c55d5a15dfed80877c5503863b186c0a9d11b29551c4606c1cd5961c7dfdeee2eab5662952ad7ad215513e93abe727a33f84b30bd181e SHA512 22e4f5848d62bd1fd55f4f054ea1293e223b3cd6f916bde2523eec10388e733623492c3a3246d61831e696dffdec5d000b95e9aa1217be6e38dd6459872166aa
+DIST wasm-bindgen-futures-0.4.42.crate 15380 BLAKE2B a20ba9f2bc814d7aac031f1cbaec90289f63893b76c60b536a65af85379771e102d6c3d949a8528328587ac776d7a3b684c12a217f9e186bf10046a1fcb34652 SHA512 0a77203499381b6bc4e9258480d7ef499d9c26b195baf38d0b7b228872f844d24c827cd57c8e2b0176927fd5957428084f53fe80cf60b35b7ba02d02b27a4682
 DIST wasm-bindgen-macro-0.2.92.crate 13835 BLAKE2B 1f2202fdaeb78c32813eaf08b2fbd7aa9c469228386df71b8ffd81a46374e39a7104b79991f702505f9b7e97957fda8574517fbb03e3f9e93098c4d6e1e46be3 SHA512 78d2ddac88a9ca3ca5eef8a7af81cdf2366187a67d844e69f65f6893d1949f9723ab5f2be762c2217a5c21aee2f3dbc2d5d55ef0c9cbf0dec0d52d67a6ba7462
 DIST wasm-bindgen-macro-support-0.2.92.crate 20092 BLAKE2B 8e274a4053e7afc680740e811c3941478caf5342e2206e3d28cdea9f9514bedbfa4f2b6bc608817306a1c455dd7134b7e17f0f04499f6bfb5302f29b041ac7ae SHA512 92543d2aad0b25798ec20e68832b823610c2c01401088cd9cac1684a86ddd1b567b3e2712acb862060f9c645a0df509b01d9834fd3e13cdaab97960f66d8daa7
 DIST wasm-bindgen-shared-0.2.92.crate 7263 BLAKE2B e54895486b9a31cc4651b7bb042059cc84421708346c06a9764315ebd4f440a1077520c7d325d6889a690b2c06aa185d40cede2dc4d061b363594cbde20fac31 SHA512 70e3a22731ed8aec428433bf30500eb3f62e3b7f4f1be34d8bb3b6f34f99690fc85d49eb413caecab807064494cfec64242c6a42709dffd638046e370bf86e07
+DIST web-sys-0.3.69.crate 728877 BLAKE2B 9f1678cbddb15f5a37331216a43785c72896f87e8ce62c6b9e69007316ca6eeaa7edbb33b9f2d9bf96c98de2a1e10afe491d8734657b186e2c3905ad1ff19ad9 SHA512 78b79ceb6a47485c766ad660bb8b971ba549424542a020c35c7db64a19f7b161617e464eaea0602f433b6ac4973b8d1a86a56e76dcda179ccea60aef1245347b
 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-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST windows-core-0.52.0.crate 42154 BLAKE2B 9670bf02261b4ab2a24eff97dad11e305deac823cacfae286965b62b11bc035f19a55ca710eaa4359c8a4905433a94fe62a836b77ddd68f244ad6ac2c9657f58 SHA512 0c8f1c7e63c11bdcf1361150ecc83abbfba8da2c6d28523799bd286bf8aa1df61ffed19175e8cb3ef516a9afb6248b640c2101a2e0c09a99bfd7a18c6741bd36
+DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed
 DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03
+DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709
 DIST windows-targets-0.52.5.crate 6376 BLAKE2B 1d39fd86380ab086c536d88e67b60956410b345790ccea62a25e6a700757b2a9cfa6dfeb7b86934cf47b981ea2e5f42dddf49780ad9829a551dc507fcf108641 SHA512 d00d7bc7eec3c10272e803ee5c9ea0d9b07c43311124dae975b4f5aae7408c5f2ccb2fe6e68228ea3d4e70b6b658382cac6992ea177f43a9cba2ef95c4fda0ee
+DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996
 DIST windows_aarch64_gnullvm-0.52.5.crate 433266 BLAKE2B dee1b69cdf1fbd4143136909e4df3adaa7b80d7630a01ca9a42fc5ad0d5a4d9a9e2873b43c6d8e55de59f237d9199fad0768c4e1cda3b1e5354847bd70d4c79e SHA512 b4cf511025458fe30d5b11368af285610e1654a8986ea9f78fa81b8bb87d38a00c4869441c62692534df66d06baf14c8a4d17f8eb06468eb260b99e2fda6439d
+DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff
 DIST windows_aarch64_msvc-0.52.5.crate 827944 BLAKE2B 3bcb16d527be1dfdf18a9105ab259a064f00e949937ca423c8dcd1d2b90090d85aa7e42ca6ccc50c9baeee1aa144123d0a04643f9ff1147e62b2fce28b8a697b SHA512 c8974f81e37a43d92c4a8b142705e36b7acc58d9150d80ffa3997433da878044c467a2d9167ba792d37a183a0082d912500fea8c8fed743f395b63ca62a5758d
+DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a
 DIST windows_i686_gnu-0.52.5.crate 875699 BLAKE2B 528ea431d080c5326e4c6ed316d9ea3e38b40c2e1322a12a432506a2c11555a94537661a0941e90c20eff4a9ce42c12539876dae6e77a1df18b522529928b309 SHA512 cc3e0362fb62dd5e8a855bda3be0177708ec8629ee9685f1f9aaac3f71a8cb082387388bdf49b09d3f5ee24a636b0b4f933d2c8bb75db434ee0192c8ce0547d2
 DIST windows_i686_gnullvm-0.52.5.crate 473064 BLAKE2B abe41ee330c05ee1366b3a835d15c6db3964ffd7b340ee69d215056b0d4b65c67f2782b0c04a55db64001098de87c93e2d447e25ef2a27f2cfa6685b8cf20c88 SHA512 da45c882248070911bf55698f62c245cb081a23254cdcf578df053905adb9117454235e52dcf1dd97c0d2248f92ff1d2fd3e18844a7be8d93ba08590c1eca22b
+DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e
 DIST windows_i686_msvc-0.52.5.crate 895404 BLAKE2B 02555169f8c5b944231a877de8693fc871ea0d7d33f52f60e164bacb35cec13d463af07c57fec4667948047cc222d8bda7f6a0be01a07e7184b69e4adc2b4577 SHA512 08c96f8e9385ac121549bae8ed228741b32004be20b2955d163a98d4b62af464f1682cb813681fa22823d20646f19335cf0a66203a876b105e119e05a4db0634
+DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74
 DIST windows_x86_64_gnu-0.52.5.crate 831539 BLAKE2B 54f84c19988addeb7cbbbddb940e430e7345944589419592b99addf9b83bf6d801b18f4e80399b85bbb0b0ccf4608e36d9a50b79d8b1d6ce2b93745856e06eba SHA512 d9bf91765d02d2727344e42081f4bcfa73be97991495126f7e633f27e56a261ada3a8b865a559cfe71f9bc9aed5b14504f89138796766937b3521009726dfab8
+DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
 DIST windows_x86_64_gnullvm-0.52.5.crate 433246 BLAKE2B f34328a6d100e092ecb34a6305daedf4fecd71840432f104e8707f049b60d784584ce4f02fabdd0281fdb8bc7ebed34b38fdacf3be9c8abd60084e9a4ee9fd56 SHA512 22a978c40df9705cd94e4c52f2b706e477e667b564c608d0adb144b38cb486c279c09d1eb1dd2d6c7bd3401b75a2dc5eafe0f7d642ffe6453f394d1f59483a08
+DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
 DIST windows_x86_64_msvc-0.52.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a7338c289c9af16ea80b3e5fa567980d2a6a5ea6a1cd83729ce6fd67e4da171873083dbeb1d6e16a287620f0245201f9cb29c29b4 SHA512 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6
 DIST winnow-0.5.40.crate 159316 BLAKE2B aae5076d59b3459c901d918d8aaa97ba8bfcc993b8484344f52e45f1f37deb96d6cd3a1663a67f3c367be2b05d633286f270274c621bda9f3ab72b98bb652cc2 SHA512 525156f08514b0110697360be6e331a68d08f0cb65ee4ba3ac9d101dd2d42a8c89601e7409bdb5652c5b05145626506651010f58a854c47712065334c61ff39c
 DIST winnow-0.6.14.crate 162768 BLAKE2B 15e8b8c2d658b2ccf5e5b5c6a6909669c98a589263c306b0c851a4cc9aa53bf4e4c354fbf7b25cf595ff5f2407e00300e1ab3bca5508c3c6f3f84f674e6e760b SHA512 7360ba0d835223b9850d6939686cabf41065542567f3d4197ea80076e11ce2e2d8ca04c179e2c571f7536e4758e828719b76cac19d6fc413fdd7d40c7d0dd992
+DIST winreg-0.52.0.crate 30148 BLAKE2B 7b458d356ed1385b23ace88d8a7e2a4e2e3211ba4bd22e6488b60fe508ab2b5f6d93c7547e45e0564f512391a8fbc2af1bbd3e3e3a773865d87adff67b5b2fb5 SHA512 50659afe4fa9671696bb5c6a50d62e493ef5359a324a71f7877e2ff0b522560ad65196ac6d2f7f4117edb2e47e84adce7d1de5ed2ce273f132cb2d5006472e25
+DIST write16-1.0.0.crate 7218 BLAKE2B 548796314339463e4b71f8af3d344e45dc89480e103180b6d56c90fcb816ad1a37ab2ba20766c4b9754f2cc686752eb1f3a5a12ec1ed4369a9cef749ad4f3e97 SHA512 655a207b8082bb88e462f992ecb4833cef9d590da06d6356b41d109df2862b49ee5705189c78a607b549e7343035119d158020d58fcad49608e51659357a83c1
+DIST writeable-0.5.5.crate 22354 BLAKE2B e4ff9862c070b413568ce0c75d1eccafcf1db8578eee4795ea9046dadd643f8a77258b437be288b93af247199d63455298ac2cff909226bc432f91c0aa863921 SHA512 818b2546c8ec25816aeaf5e31a1ded927d197bf7256e7c5073738c2709bc58a95d382a0256eb38a99235ae83729b578701261866d42ea3357a26024906e196c1
+DIST yoke-0.7.5.crate 29673 BLAKE2B cd2e42103140e080a29bf579fe5176b36a192f9b1309c1f2fd7557fe93b2f6eadbf6fca4a6a3b1a7b6288403d2f643841dfc7a5b6a4476776943950abe5c1613 SHA512 6bbd99671d1a5a5217890eaa267113d193b3636b265393afb6e72a313f01704d462fe017264f061405e8e84c188b590094c29e3fcf19a63c375ae165d1a0bbef
+DIST yoke-derive-0.7.5.crate 7525 BLAKE2B 9b6b97eaf3c50f0f5ce8cebf685a1a17d4c21eb9b26d38eac99e0a4c0f9d592e95a7843b7a0b897945a14c4eb78ffdf2c0972b448d31d7bc7b077f27aad81d9a SHA512 e30b06b020aa283080905004295fb643c539b130d0d53bda51927b95e79ba562336aad30d8a6202d9a0c62d5b64559a01218c6f02f3faada6003d4b03c205cd6
+DIST zerofrom-0.1.5.crate 5091 BLAKE2B a2b938197957755c4a8ccfb258f60f90931a0a342d9d4bd098c7a25e1c9069148a51ddfffd2b72a6a9856d8c6e66fe1482ab2081a5f3478b4b318062caffff42 SHA512 11f16a1003967b3f30d7b32ffc8541ec05fb335690b08cf4f7554c624ad4312ee0961c83390a997e2a73aee06d8bb09a0ff4e6a5e489f8fb925141e732006544
+DIST zerofrom-derive-0.1.5.crate 8285 BLAKE2B d19bf1b74be89f4d27eda36ba6407d598358d3d69bed64f02903ab7dc509faa006cde9c13e19f5f3cde09cf9049120575263996c922b20da366a11e18baa42dc SHA512 75098e0f1c690bd8476f819f4ea2a7645b88237042a8876259bf4e025b070a4b105caf16ca7a824c5dd6c4690b693fcc74bed9ac0b5e6fdab05a5bed1b5cb298
+DIST zeroize-1.8.1.crate 20029 BLAKE2B 092eba034cd35ec47290020e0c2b213177ff5dbe14ab9e7f0b4ef3cb1ecbc42fbec2b951414e26ab00bc65aaddc2c93eddd5a1963b27c6cd613ac71c65d5cc24 SHA512 dd40ebe98b98fd742608d4066b5ab66caba94b2e679428fcaff9fe547d8cd6ff2360dc85d671ee9183e32fb79cb554d00d6aef9eb8f3d8ad0ec92d0435aa4ebe
+DIST zerovec-0.10.4.crate 126398 BLAKE2B b078784d6f178bbb9de1c3c1b6c7ef996f00bdd7dfd2924bda921e62f3e09e953fbf50f8d0da99ac6ff6d134f146253846f5663549dcf8df08eaf34b9d4016b3 SHA512 db12bba1d7476ddead92e6dfcdcc30e2e0defff4f263a740244eabee265a2cab265473a663d3dc3210f48e113b66d951da496dfab7965ce1bc792e5f2db422a0
+DIST zerovec-derive-0.10.3.crate 19438 BLAKE2B 9f7df8a4e4a0b62ab25aed967b26509db4bcc5d5b10b3bd73305099a4c49a60be8921484ced1a34d9b7ae30ffa5abe789686f432416a8f1cfc07de1db1dff594 SHA512 caefbffeb35265db9f74933bf07109d57f0da48156cafd4f330af78a5c7eb9ab0831a80789ad4fb119875ebc6cfd7e3de68c9984b77dca5151f9be41f1ae6e09
 EBUILD railway-2.7.0-r1.ebuild 5249 BLAKE2B 4b794566f92ef8002fc1e54da28d1f2d2cebfd3bf5cf92933609ec35d2f1c0cb9820e0c64ed66e59b32eda834782215ff919af58889de6e841b6110f2a263664 SHA512 666a95fc0e51b011faccd226161f7c7772d29b700a2559299d89a61a9ae32da3337b4fe6cdc89e9c43d3545e22994a282e73a020dfad2f0d7bd4320d228b677f
+EBUILD railway-2.7.2.ebuild 6661 BLAKE2B 47032e001b519f74c5ef84c426354d63c06774b0e779478231fd264eac76d1d64fe6072062ed2d91b4ace90334e38be9323efa3a23cb7d61673b262f80778845 SHA512 f0f9fcd01319d121943c6ef32b283c18d239c4bbe729339d9bf6ac4d5cb619ae13870d49ff2678551093f6eec925446f2578a550be413076d85568d13dacaf5b
 MISC metadata.xml 339 BLAKE2B 7e3f4310764b633f771093e4690d779d980c865a590e994e128029157f201ac77e5f8e8c9a73522ff71a23a1457c4e04e8883aea24ad2f8eb84022fe14d78b49 SHA512 28fb3dc417e915edcdc1117479b946af17c4793b1a1f5b9ddfb3774594954db1d9cea172c91cd559380688e504dfa6c14fe31afa8db49091cc470a04b97859bf
diff --git a/gui-apps/railway/railway-2.7.2.ebuild b/gui-apps/railway/railway-2.7.2.ebuild
new file mode 100644
index 000000000000..2ae8a45bd89e
--- /dev/null
+++ b/gui-apps/railway/railway-2.7.2.ebuild
@@ -0,0 +1,346 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	addr2line@0.22.0
+	adler@1.0.2
+	aho-corasick@1.1.3
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	anstream@0.6.14
+	anstyle-parse@0.2.4
+	anstyle-query@1.1.0
+	anstyle-wincon@3.0.3
+	anstyle@1.0.7
+	async-trait@0.1.78
+	atomic-waker@1.1.2
+	autocfg@1.3.0
+	backtrace@0.3.72
+	base64@0.22.1
+	bitflags@1.3.2
+	bitflags@2.6.0
+	block-buffer@0.10.4
+	block@0.1.6
+	bumpalo@3.16.0
+	bytes@1.5.0
+	cairo-rs@0.20.0
+	cairo-sys-rs@0.20.0
+	cc@1.1.6
+	cfg-expr@0.15.8
+	cfg-if@1.0.0
+	chrono-tz-build@0.2.1
+	chrono-tz@0.8.6
+	chrono@0.4.38
+	colorchoice@1.0.1
+	convert_case@0.6.0
+	core-foundation-sys@0.8.6
+	core-foundation@0.9.4
+	crypto-common@0.1.6
+	digest@0.10.7
+	displaydoc@0.2.5
+	encoding_rs@0.8.35
+	env_filter@0.1.0
+	env_logger@0.11.4
+	equivalent@1.0.1
+	errno@0.3.10
+	fastrand@2.2.0
+	field-offset@0.3.6
+	fnv@1.0.7
+	foreign-types-shared@0.1.1
+	foreign-types@0.3.2
+	form_urlencoded@1.2.1
+	futures-channel@0.3.30
+	futures-core@0.3.31
+	futures-executor@0.3.30
+	futures-io@0.3.30
+	futures-macro@0.3.31
+	futures-sink@0.3.31
+	futures-task@0.3.31
+	futures-util@0.3.31
+	gdk-pixbuf-sys@0.20.0
+	gdk-pixbuf@0.20.0
+	gdk4-sys@0.9.0
+	gdk4@0.9.0
+	generic-array@0.14.7
+	getrandom@0.2.12
+	gettext-rs@0.7.0
+	gettext-sys@0.21.3
+	gimli@0.29.0
+	gio-sys@0.20.0
+	gio@0.20.0
+	glib-macros@0.20.0
+	glib-sys@0.20.0
+	glib@0.20.0
+	gobject-sys@0.20.0
+	graphene-rs@0.20.0
+	graphene-sys@0.20.0
+	gsk4-sys@0.9.0
+	gsk4@0.9.0
+	gtk4-macros@0.9.0
+	gtk4-sys@0.9.0
+	gtk4@0.9.0
+	h2@0.4.7
+	hashbrown@0.14.5
+	heck@0.5.0
+	hermit-abi@0.3.9
+	hex@0.4.3
+	http-body-util@0.1.2
+	http-body@1.0.1
+	http@1.1.0
+	httparse@1.8.0
+	humantime@2.1.0
+	hyper-rustls@0.27.3
+	hyper-tls@0.6.0
+	hyper-util@0.1.7
+	hyper@1.5.1
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.60
+	icu_collections@1.5.0
+	icu_locid@1.5.0
+	icu_locid_transform@1.5.0
+	icu_locid_transform_data@1.5.0
+	icu_normalizer@1.5.0
+	icu_normalizer_data@1.5.0
+	icu_properties@1.5.1
+	icu_properties_data@1.5.0
+	icu_provider@1.5.0
+	icu_provider_macros@1.5.0
+	idna@1.0.3
+	idna_adapter@1.2.0
+	indexmap@2.2.6
+	ipnet@2.10.1
+	is_terminal_polyfill@1.70.0
+	itoa@1.0.11
+	js-sys@0.3.69
+	lazy_static@1.4.0
+	libadwaita-sys@0.7.0
+	libadwaita@0.7.0
+	libc@0.2.155
+	linux-raw-sys@0.4.14
+	litemap@0.7.4
+	locale_config@0.3.0
+	log@0.4.22
+	malloc_buf@0.0.6
+	md-5@0.10.6
+	memchr@2.7.4
+	memoffset@0.9.1
+	mime@0.3.17
+	miniz_oxide@0.7.4
+	mio@1.0.1
+	native-tls@0.2.12
+	num-traits@0.2.19
+	objc-foundation@0.1.1
+	objc@0.2.7
+	objc_id@0.1.1
+	object@0.35.0
+	once_cell@1.19.0
+	openssl-macros@0.1.1
+	openssl-probe@0.1.5
+	openssl-sys@0.9.104
+	openssl@0.10.68
+	pango-sys@0.20.0
+	pango@0.20.0
+	parse-zoneinfo@0.3.0
+	percent-encoding@2.3.1
+	phf@0.11.2
+	phf_codegen@0.11.2
+	phf_generator@0.11.2
+	phf_shared@0.11.2
+	pin-project-internal@1.1.7
+	pin-project-lite@0.2.14
+	pin-project@1.1.7
+	pin-utils@0.1.0
+	pkg-config@0.3.30
+	proc-macro-crate@3.1.0
+	proc-macro2@1.0.86
+	quote@1.0.36
+	railway-api-derive@0.1.1
+	railway-api@0.1.1
+	railway-core@0.1.1
+	railway-provider-db-movas@0.1.0
+	railway-provider-hafas@0.1.2
+	railway-provider-motis@0.1.0
+	railway-provider-search-ch@0.1.0
+	rand@0.8.5
+	rand_core@0.6.4
+	regex-automata@0.4.7
+	regex-syntax@0.8.4
+	regex@1.10.5
+	reqwest@0.12.5
+	ring@0.17.8
+	rustc-demangle@0.1.24
+	rustc_version@0.4.0
+	rustix@0.38.34
+	rustls-pemfile@2.1.2
+	rustls-pki-types@1.5.0
+	rustls-webpki@0.102.3
+	rustls@0.23.7
+	ryu@1.0.18
+	schannel@0.1.23
+	security-framework-sys@2.9.1
+	security-framework@2.9.2
+	semver@1.0.23
+	serde@1.0.204
+	serde_derive@1.0.204
+	serde_json@1.0.120
+	serde_spanned@0.6.6
+	serde_urlencoded@0.7.1
+	siphasher@0.3.11
+	slab@0.4.9
+	smallvec@1.13.2
+	socket2@0.5.7
+	spin@0.9.8
+	stable_deref_trait@1.2.0
+	subtle@2.6.1
+	syn@2.0.72
+	sync_wrapper@1.0.2
+	synstructure@0.13.1
+	system-configuration-sys@0.5.0
+	system-configuration@0.5.1
+	system-deps@7.0.1
+	target-lexicon@0.12.15
+	temp-dir@0.1.12
+	tempfile@3.11.0
+	thiserror-impl@1.0.63
+	thiserror@1.0.63
+	tinystr@0.7.6
+	tokio-macros@2.4.0
+	tokio-native-tls@0.3.1
+	tokio-rustls@0.26.0
+	tokio-util@0.7.12
+	tokio@1.39.1
+	toml@0.8.15
+	toml_datetime@0.6.6
+	toml_edit@0.21.1
+	toml_edit@0.22.16
+	tower-layer@0.3.3
+	tower-service@0.3.2
+	tower@0.4.13
+	tracing-core@0.1.32
+	tracing@0.1.40
+	try-lock@0.2.5
+	typenum@1.17.0
+	unicode-ident@1.0.12
+	unicode-segmentation@1.11.0
+	untrusted@0.9.0
+	url@2.5.4
+	utf16_iter@1.0.5
+	utf8_iter@1.0.4
+	utf8parse@0.2.2
+	uuid@1.12.0
+	vcpkg@0.2.15
+	version-compare@0.2.0
+	version_check@0.9.4
+	want@0.3.1
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.92
+	wasm-bindgen-futures@0.4.42
+	wasm-bindgen-macro-support@0.2.92
+	wasm-bindgen-macro@0.2.92
+	wasm-bindgen-shared@0.2.92
+	wasm-bindgen@0.2.92
+	web-sys@0.3.69
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-core@0.52.0
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-targets@0.48.5
+	windows-targets@0.52.5
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.5
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.5
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.5
+	windows_i686_gnullvm@0.52.5
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.5
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.5
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.5
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.5
+	winnow@0.5.40
+	winnow@0.6.14
+	winreg@0.52.0
+	write16@1.0.0
+	writeable@0.5.5
+	yoke-derive@0.7.5
+	yoke@0.7.5
+	zerofrom-derive@0.1.5
+	zerofrom@0.1.5
+	zeroize@1.8.1
+	zerovec-derive@0.10.3
+	zerovec@0.10.4
+"
+
+inherit cargo gnome2-utils meson xdg-utils
+
+DESCRIPTION="Travel with all your train information in one place"
+HOMEPAGE="
+	https://mobile.schmidhuberj.de/railway/
+	https://gitlab.com/schmiddi-on-mobile/railway/
+"
+SRC_URI="
+	https://gitlab.com/schmiddi-on-mobile/railway/-/archive/${PV}/${P}.tar.bz2
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="GPL-3+"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT Unicode-3.0
+	Unicode-DFS-2016
+	|| ( AGPL-3+ EUPL-1.2 )
+"
+# ring
+LICENSE+=" openssl"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-libs/glib-2.66
+	>=gui-libs/gtk-4.14:4
+	>=gui-libs/libadwaita-1.6.0
+	media-libs/graphene
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-libs/glib
+	dev-util/blueprint-compiler
+	sys-devel/gettext
+"
+
+BUILD_DIR=${S}/build
+ECARGO_HOME=${BUILD_DIR}/cargo-home
+
+QA_PREBUILT=usr/bin/diebahn
+
+src_prepare() {
+	default
+
+	sed -e "s:get_option('profile.*:$(usex debug false true):" \
+		-i src/meson.build || die
+}
+
+src_install() {
+	meson_src_install
+	dosym diebahn /usr/bin/railway
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 63997bae38e9..f70c2e2d0c2f 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/gtksourceview/Manifest b/gui-libs/gtksourceview/Manifest
index afd2884712d5..e06269578ec6 100644
--- a/gui-libs/gtksourceview/Manifest
+++ b/gui-libs/gtksourceview/Manifest
@@ -1,6 +1,6 @@
-AUX 5-gentoo.lang 3889 BLAKE2B 1797c9e3ef615b36f3098104295fbadee18b8434d299bbab9603c5a00abdfb51c3a7db2f937885d8aa191067fd6e2ffbc1cf278b0d9333c67bcb07e24be5a7ba SHA512 a4ca3f24df56556c5d42aac19d36608d20466287b9e364154b1877c2a5aeab82a374fdf7dc64afbabbf9269d5a8fa88e1dd59d8a24a52fab219db09ec29a3d98
+AUX 5-gentoo.lang 3790 BLAKE2B 98e8183ae36ab25a27ad664f5d11c738e0ae736502a1eaacab86bdc61e69d0b064fd9928fa1a4a5cf663ed1761c313c5459a47b7eb8f14877ea9c8cc2422fb37 SHA512 c48d7265ffff0eaaa8d8055b64212a92b67bbbaf4ba9a5b19ae54a4bf5696e5c89d6d7e8ddac0e78b611922e56d7dc12e19769494114582684a97412eede8c8c
 DIST gtksourceview-5.12.1.tar.xz 1265500 BLAKE2B a9200d97cda514c62a181e3d07a0c71719710299d06e1cbc29c6b7817eb6167e7b7bdc64f32121fc54bd7093a918600c0fba70b5cb4b93906f6aaf80fd6521ed SHA512 64c347df505c640feb2d5885a3fa047a3a5dc6bf86b031ec9f8eec5544bc9d996ca3bfd41aea78ebfa9171a206a64d88773d53f1bc8d0f2171429c1ee788cd40
 DIST gtksourceview-5.14.2.tar.xz 1263508 BLAKE2B 049be85f6dca2f8209efb1ec2aa66908261b9f3e44df02734cc12f6bceca7e192f2e5773cbc71f39edb1319613ef95104407fa743c8e8512d33c00d0520a57a0 SHA512 cbdfaf3db9873302e2d38adb3fd63515b713139fb195a6135367b57f024094a6ecf581b046efbdc6417690455c88bc89b49dad4f36ec32ccddf7218ecfe87652
-EBUILD gtksourceview-5.12.1.ebuild 1851 BLAKE2B 5c2e78b50f2fc9563aa4e57edd8bdafd0441af3ebe4875a6dbdcc886348aee95c2386eb0306706ab300b4a806e9736c85fa4720e34da5d3efe1b85a5bf06a4b6 SHA512 47e5c83854f99e0f60ffff9e301eefc1b5fb2fd46610c9b980e356b98255ee70283e10877b9d6e528baf98a960ce5119f5c1006632f97654cd7d0e1599725f3f
+EBUILD gtksourceview-5.12.1-r1.ebuild 1851 BLAKE2B 5c2e78b50f2fc9563aa4e57edd8bdafd0441af3ebe4875a6dbdcc886348aee95c2386eb0306706ab300b4a806e9736c85fa4720e34da5d3efe1b85a5bf06a4b6 SHA512 47e5c83854f99e0f60ffff9e301eefc1b5fb2fd46610c9b980e356b98255ee70283e10877b9d6e528baf98a960ce5119f5c1006632f97654cd7d0e1599725f3f
 EBUILD gtksourceview-5.14.2.ebuild 1853 BLAKE2B 526c2b2cc02863b4d48f6c3870a6b38ec6fb69ec81650e235b233cdd064a2197e22397cef176fe4fcd4b1187eb59b5df7a42ebd8315e7972516f88688607c0fb SHA512 e3611d8fa2773a9084d4d9fa81928a9adba7fa5af5822a66b154c281d67dc53c8f944f38afca820fa6c51ffa62fea1b3e66b77799ef2e47a815c4d89d3ea5388
 MISC metadata.xml 483 BLAKE2B 4a540a461cade35f65793fedf3ef6ff73d4fb73d15127f752e0878c488c837c2616d1aed9f39bc94ea1196221cc94bc3372ecc985f83bc6bffa467aef8c4d185 SHA512 366ceb666c38841efd022c74452626c98bc99cbfa649a6d79416a08e8694194c8ec00419147a79f3c7742aba9d90c77194573e9a44b72ce38435ef456e43e643
diff --git a/gui-libs/gtksourceview/files/5-gentoo.lang b/gui-libs/gtksourceview/files/5-gentoo.lang
index 4889b4ceca29..4e8c14832e27 100644
--- a/gui-libs/gtksourceview/files/5-gentoo.lang
+++ b/gui-libs/gtksourceview/files/5-gentoo.lang
@@ -7,7 +7,7 @@
 		Leonardo Ferreira Fontenelle <leo.fontenelle@gmail.com>, 2006.
 	Rewritten for gtksourceview-2 by:
 		Rene 'Necoro' Neumann <necoro@necoro.net>, 2007
-	
+
 	Distributed under the same license(s) as gtksourceview.
 
 	TODO:
@@ -87,9 +87,9 @@
 
 		<!-- extra portage commands -->
 		<context id="portcmds" style-ref="command">
-			<match>\b(e(begin|end|conf|install|make|warn|infon?|error|patch)|die|use(_(with|enable))?|inherit|has|(has|best)_version|unpack|(do|new)(ins|s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)|do(python|sed|dir|hard|sym|html|jar|mo)|keepdir|prepall(|docs|info|man|strip)|prep(info|lib|lib\.(so|a)|man|strip)|(|doc|ins|exe)into|f(owners|perms)|(exe|ins|dir)opts)\b</match>
+			<match>\b(e(begin|end|conf|make|warn|infon?|error)|die|use(_(with|enable))?|inherit|has|(has|best)_version|unpack|(do|new)(ins|s?bin|doc|lib(\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)|do(python|dir|sym|jar|mo)|keepdir|(|doc|ins|exe)into|f(owners|perms)|(exe|ins|dir)opts)\b</match>
 		</context>
-		
+
 		<context id="built-in-command">
 			<include> <!-- do not include "sh:built-in-command" as it is replaced down there - which would lead to an endless loop -->
 				<context ref="sh:reserved-word" />
diff --git a/gui-libs/gtksourceview/gtksourceview-5.12.1.ebuild b/gui-libs/gtksourceview/gtksourceview-5.12.1-r1.ebuild
index 368ba698a8a2..368ba698a8a2 100644
--- a/gui-libs/gtksourceview/gtksourceview-5.12.1.ebuild
+++ b/gui-libs/gtksourceview/gtksourceview-5.12.1-r1.ebuild
diff --git a/licenses/FDL-1.1 b/licenses/FDL-1.1
index a03f60403947..247a2b9574e8 100644
--- a/licenses/FDL-1.1
+++ b/licenses/FDL-1.1
@@ -2,7 +2,7 @@
                    Version 1.1, March 2000
 
  Copyright (C) 2000  Free Software Foundation, Inc.
-     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
diff --git a/licenses/FDL-1.2 b/licenses/FDL-1.2
index 68d93f4f67fd..42a2ee9cf026 100644
--- a/licenses/FDL-1.2
+++ b/licenses/FDL-1.2
@@ -3,7 +3,7 @@
 
 
  Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
-     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
diff --git a/licenses/GPL-1 b/licenses/GPL-1
index 1ca5119e5a01..e65a4b54b713 100644
--- a/licenses/GPL-1
+++ b/licenses/GPL-1
@@ -2,7 +2,7 @@
                      Version 1, February 1989
 
  Copyright (C) 1989 Free Software Foundation, Inc.
-                    51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -215,8 +215,7 @@ the exclusion of warranty; and each file should have at least the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
+    along with this program; if not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -242,7 +241,7 @@ necessary.  Here a sample; alter the names:
   program `Gnomovision' (a program to direct compilers to make passes
   at assemblers) written by James Hacker.
 
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
+  <signature of Moe Ghoul>, 1 April 1989
+  Moe Ghoul, President of Vice
 
 That's all there is to it!
diff --git a/licenses/GPL-2 b/licenses/GPL-2
index 0e845b5e312b..e5afae94fab3 100644
--- a/licenses/GPL-2
+++ b/licenses/GPL-2
@@ -2,7 +2,7 @@
                        Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -304,8 +304,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    with this program; if not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -329,8 +328,8 @@ necessary.  Here is a sample; alter the names:
   Yoyodyne, Inc., hereby disclaims all copyright interest in the program
   `Gnomovision' (which makes passes at compilers) written by James Hacker.
 
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
+  <signature of Moe Ghoul>, 1 April 1989
+  Moe Ghoul, President of Vice
 
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
diff --git a/licenses/GPL-2+-with-Pyinstaller-Bootloader-exception b/licenses/GPL-2+-with-Pyinstaller-Bootloader-exception
index 9236991d7380..97dec0b0aa80 100644
--- a/licenses/GPL-2+-with-Pyinstaller-Bootloader-exception
+++ b/licenses/GPL-2+-with-Pyinstaller-Bootloader-exception
@@ -114,15 +114,15 @@ GNU General Public License
 https://gnu.org/licenses/gpl-2.0.html
 
 
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -131,7 +131,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -172,7 +172,7 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -371,7 +371,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -393,7 +393,7 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
 ================================
 Apache License 2.0
diff --git a/licenses/GPL-2-with-MySQL-FLOSS-exception b/licenses/GPL-2-with-MySQL-FLOSS-exception
index 96a2205c6ddb..a3aecf74b126 100644
--- a/licenses/GPL-2-with-MySQL-FLOSS-exception
+++ b/licenses/GPL-2-with-MySQL-FLOSS-exception
@@ -1,3 +1,7 @@
+GNU General Public License, version 2.
+See GPL-2 for the full text of this license.
+
+
 MySQL FLOSS License Exception
 
 The MySQL AB Exception for Free/Libre and Open Source Software-only
@@ -97,343 +101,3 @@ removing the FLOSS Exception notice from that copy of the Program, provided
 that the copy has never been modified by you or any third party.
 
 $Id: FLOSS-exception.txt,v 1.5 2004/07/15 15:24:19 z Exp $
-
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/licenses/GPL-2-with-classpath-exception b/licenses/GPL-2-with-classpath-exception
index 5da7859773f4..8e25e4d99440 100644
--- a/licenses/GPL-2-with-classpath-exception
+++ b/licenses/GPL-2-with-classpath-exception
@@ -1,328 +1,7 @@
 GNU General Public License, version 2, with the Classpath Exception
 
 The GNU General Public License (GPL)
-
-Version 2, June 1991
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Everyone is permitted to copy and distribute verbatim copies of this license
-document, but changing it is not allowed.
-
-Preamble
-
-The licenses for most software are designed to take away your freedom to share
-and change it.  By contrast, the GNU General Public License is intended to
-guarantee your freedom to share and change free software--to make sure the
-software is free for all its users.  This General Public License applies to
-most of the Free Software Foundation's software and to any other program whose
-authors commit to using it.  (Some other Free Software Foundation software is
-covered by the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
-When we speak of free software, we are referring to freedom, not price.  Our
-General Public Licenses are designed to make sure that you have the freedom to
-distribute copies of free software (and charge for this service if you wish),
-that you receive source code or can get it if you want it, that you can change
-the software or use pieces of it in new free programs; and that you know you
-can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone to deny
-you these rights or to ask you to surrender the rights.  These restrictions
-translate to certain responsibilities for you if you distribute copies of the
-software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis or for
-a fee, you must give the recipients all the rights that you have.  You must
-make sure that they, too, receive or can get the source code.  And you must
-show them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and (2)
-offer you this license which gives you legal permission to copy, distribute
-and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain that
-everyone understands that there is no warranty for this free software.  If the
-software is modified by someone else and passed on, we want its recipients to
-know that what they have is not the original, so that any problems introduced
-by others will not reflect on the original authors' reputations.
-
-Finally, any free program is threatened constantly by software patents.  We
-wish to avoid the danger that redistributors of a free program will
-individually obtain patent licenses, in effect making the program proprietary.
-To prevent this, we have made it clear that any patent must be licensed for
-everyone's free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and modification
-follow.
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License applies to any program or other work which contains a notice
-placed by the copyright holder saying it may be distributed under the terms of
-this General Public License.  The "Program", below, refers to any such program
-or work, and a "work based on the Program" means either the Program or any
-derivative work under copyright law: that is to say, a work containing the
-Program or a portion of it, either verbatim or with modifications and/or
-translated into another language.  (Hereinafter, translation is included
-without limitation in the term "modification".) Each licensee is addressed as
-"you".
-
-Activities other than copying, distribution and modification are not covered by
-this License; they are outside its scope.  The act of running the Program is
-not restricted, and the output from the Program is covered only if its contents
-constitute a work based on the Program (independent of having been made by
-running the Program).  Whether that is true depends on what the Program does.
-
-1. You may copy and distribute verbatim copies of the Program's source code as
-you receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice and
-disclaimer of warranty; keep intact all the notices that refer to this License
-and to the absence of any warranty; and give any other recipients of the
-Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and you may
-at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of it, thus
-forming a work based on the Program, and copy and distribute such modifications
-or work under the terms of Section 1 above, provided that you also meet all of
-these conditions:
-
-    a) You must cause the modified files to carry prominent notices stating
-    that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in whole or
-    in part contains or is derived from the Program or any part thereof, to be
-    licensed as a whole at no charge to all third parties under the terms of
-    this License.
-
-    c) If the modified program normally reads commands interactively when run,
-    you must cause it, when started running for such interactive use in the
-    most ordinary way, to print or display an announcement including an
-    appropriate copyright notice and a notice that there is no warranty (or
-    else, saying that you provide a warranty) and that users may redistribute
-    the program under these conditions, and telling the user how to view a copy
-    of this License.  (Exception: if the Program itself is interactive but does
-    not normally print such an announcement, your work based on the Program is
-    not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If identifiable
-sections of that work are not derived from the Program, and can be reasonably
-considered independent and separate works in themselves, then this License, and
-its terms, do not apply to those sections when you distribute them as separate
-works.  But when you distribute the same sections as part of a whole which is a
-work based on the Program, the distribution of the whole must be on the terms
-of this License, whose permissions for other licensees extend to the entire
-whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your
-rights to work written entirely by you; rather, the intent is to exercise the
-right to control the distribution of derivative or collective works based on
-the Program.
-
-In addition, mere aggregation of another work not based on the Program with the
-Program (or with a work based on the Program) on a volume of a storage or
-distribution medium does not bring the other work under the scope of this
-License.
-
-3. You may copy and distribute the Program (or a work based on it, under
-Section 2) in object code or executable form under the terms of Sections 1 and
-2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable source
-    code, which must be distributed under the terms of Sections 1 and 2 above
-    on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three years, to
-    give any third party, for a charge no more than your cost of physically
-    performing source distribution, a complete machine-readable copy of the
-    corresponding source code, to be distributed under the terms of Sections 1
-    and 2 above on a medium customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer to
-    distribute corresponding source code.  (This alternative is allowed only
-    for noncommercial distribution and only if you received the program in
-    object code or executable form with such an offer, in accord with
-    Subsection b above.)
-
-The source code for a work means the preferred form of the work for making
-modifications to it.  For an executable work, complete source code means all
-the source code for all modules it contains, plus any associated interface
-definition files, plus the scripts used to control compilation and installation
-of the executable.  However, as a special exception, the source code
-distributed need not include anything that is normally distributed (in either
-source or binary form) with the major components (compiler, kernel, and so on)
-of the operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the source
-code from the same place counts as distribution of the source code, even though
-third parties are not compelled to copy the source along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program except as
-expressly provided under this License.  Any attempt otherwise to copy, modify,
-sublicense or distribute the Program is void, and will automatically terminate
-your rights under this License.  However, parties who have received copies, or
-rights, from you under this License will not have their licenses terminated so
-long as such parties remain in full compliance.
-
-5. You are not required to accept this License, since you have not signed it.
-However, nothing else grants you permission to modify or distribute the Program
-or its derivative works.  These actions are prohibited by law if you do not
-accept this License.  Therefore, by modifying or distributing the Program (or
-any work based on the Program), you indicate your acceptance of this License to
-do so, and all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the Program),
-the recipient automatically receives a license from the original licensor to
-copy, distribute or modify the Program subject to these terms and conditions.
-You may not impose any further restrictions on the recipients' exercise of the
-rights granted herein.  You are not responsible for enforcing compliance by
-third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues), conditions
-are imposed on you (whether by court order, agreement or otherwise) that
-contradict the conditions of this License, they do not excuse you from the
-conditions of this License.  If you cannot distribute so as to satisfy
-simultaneously your obligations under this License and any other pertinent
-obligations, then as a consequence you may not distribute the Program at all.
-For example, if a patent license would not permit royalty-free redistribution
-of the Program by all those who receive copies directly or indirectly through
-you, then the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply and
-the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or
-other property right claims or to contest validity of any such claims; this
-section has the sole purpose of protecting the integrity of the free software
-distribution system, which is implemented by public license practices.  Many
-people have made generous contributions to the wide range of software
-distributed through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing to
-distribute software through any other system and a licensee cannot impose that
-choice.
-
-This section is intended to make thoroughly clear what is believed to be a
-consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in certain
-countries either by patents or by copyrighted interfaces, the original
-copyright holder who places the Program under this License may add an explicit
-geographical distribution limitation excluding those countries, so that
-distribution is permitted only in or among countries not thus excluded.  In
-such case, this License incorporates the limitation as if written in the body
-of this License.
-
-9. The Free Software Foundation may publish revised and/or new versions of the
-General Public License from time to time.  Such new versions will be similar in
-spirit to the present version, but may differ in detail to address new problems
-or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any later
-version", you have the option of following the terms and conditions either of
-that version or of any later version published by the Free Software Foundation.
-If the Program does not specify a version number of this License, you may
-choose any version ever published by the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free programs
-whose distribution conditions are different, write to the author to ask for
-permission.  For software which is copyrighted by the Free Software Foundation,
-write to the Free Software Foundation; we sometimes make exceptions for this.
-Our decision will be guided by the two goals of preserving the free status of
-all derivatives of our free software and of promoting the sharing and reuse of
-software generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
-THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE
-STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE
-PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND
-PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE,
-YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
-ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE
-PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
-INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
-BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER
-OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-END OF TERMS AND CONDITIONS
-
-How to Apply These Terms to Your New Programs
-
-If you develop a new program, and you want it to be of the greatest possible
-use to the public, the best way to achieve this is to make it free software
-which everyone can redistribute and change under these terms.
-
-To do so, attach the following notices to the program.  It is safest to attach
-them to the start of each source file to most effectively convey the exclusion
-of warranty; and each file should have at least the "copyright" line and a
-pointer to where the full notice is found.
-
-    One line to give the program's name and a brief idea of what it does.
-
-    Copyright (C) <year> <name of author>
-
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the Free
-    Software Foundation; either version 2 of the License, or (at your option)
-    any later version.
-
-    This program is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-    more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc., 59
-    Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this when it
-starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author Gnomovision comes
-    with ABSOLUTELY NO WARRANTY; for details type 'show w'.  This is free
-    software, and you are welcome to redistribute it under certain conditions;
-    type 'show c' for details.
-
-The hypothetical commands 'show w' and 'show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may be
-called something other than 'show w' and 'show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.  Here
-is a sample; alter the names:
-
-    Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-    'Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-    signature of Ty Coon, 1 April 1989
-
-    Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General Public
-License instead of this License.
+See GPL-2 for the full text of this license.
 
 
 "CLASSPATH" EXCEPTION TO THE GPL
diff --git a/licenses/GPL-2-with-font-exception b/licenses/GPL-2-with-font-exception
index fb2cdf893c50..f20f0ae63c25 100644
--- a/licenses/GPL-2-with-font-exception
+++ b/licenses/GPL-2-with-font-exception
@@ -1,3 +1,6 @@
+GNU General Public License, version 2.
+See GPL-2 for the full text of this license.
+
 As a special exception, if you create a document which uses this font,
 and embed this font or unaltered portions of this font into the
 document, this font does not by itself cause the resulting document to
@@ -7,343 +10,3 @@ by the GNU General Public License. If you modify this font, you may
 extend this exception to your version of the font, but you are not
 obligated to do so. If you do not wish to do so, delete this exception
 statement from your version.
-
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/licenses/GPL-2-with-linking-exception b/licenses/GPL-2-with-linking-exception
index 0b5de4cb4f4f..70513a6092f3 100644
--- a/licenses/GPL-2-with-linking-exception
+++ b/licenses/GPL-2-with-linking-exception
@@ -1,3 +1,6 @@
+GNU General Public License, version 2.
+See GPL-2 for the full text of this license.
+
 As a special exception, the copyright holders of this library give you
 permission to link this library with independent modules to produce an
 executable, regardless of the license terms of these independent modules,
@@ -8,344 +11,3 @@ which is not derived from or based on this library. If you modify this library,
 you may extend this exception to your version of the library, but you are not
 obligated to do so. If you do not wish to do so, delete this exception
 statement from your version.
-
-
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/licenses/GPL-3-with-font-exception b/licenses/GPL-3-with-font-exception
index 2b14281c7864..f3146f5376a5 100644
--- a/licenses/GPL-3-with-font-exception
+++ b/licenses/GPL-3-with-font-exception
@@ -1,3 +1,6 @@
+GNU General Public License, version 3.
+See GPL-3 for the full text of this license.
+
 As a special exception, if you create a document which uses this font,
 and embed this font or unaltered portions of this font into the
 document, this font does not by itself cause the resulting document to
@@ -7,678 +10,3 @@ by the GNU General Public License. If you modify this font, you may
 extend this exception to your version of the font, but you are not
 obligated to do so. If you do not wish to do so, delete this exception
 statement from your version.
-
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/licenses/GPL-3-with-openssl-exception b/licenses/GPL-3-with-openssl-exception
index e7a6be5c2ea6..79131af3803d 100644
--- a/licenses/GPL-3-with-openssl-exception
+++ b/licenses/GPL-3-with-openssl-exception
@@ -1,679 +1,5 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
-
-                            Exception
+GNU General Public License, version 3.
+See GPL-3 for the full text of this license.
 
   In addition, as a special exception, the copyright holders give permission
 to link the code of portions of this program with the OpenSSL library under
diff --git a/licenses/Interbase-1.0 b/licenses/Interbase-1.0
deleted file mode 100644
index beb977adf9f7..000000000000
--- a/licenses/Interbase-1.0
+++ /dev/null
@@ -1,104 +0,0 @@
-INTERBASE PUBLIC LICENSE 
-Version 1.0 
-1. Definitions. 
-1.0.1. "Commercial Use" means distribution or otherwise making the Covered Code available to a third party. 
-1.1. ''Contributor'' means each entity that creates or contributes to the creation of Modifications. 
-1.2. ''Contributor Version'' means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor. 
-1.3. ''Covered Code'' means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof. 
-1.4. ''Electronic Distribution Mechanism'' means a mechanism generally accepted in the software development community for the electronic transfer of data. 
-1.5. ''Executable'' means Covered Code in any form other than Source Code. 
-1.6. ''Initial Developer'' means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A. 
-1.7. ''Larger Work'' means a work which combines Covered Code or portions thereof with code not governed by the terms of this License. 
-1.8. ''License'' means this document. 
-1.8.1. "Licensable" means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. 
-1.9. ''Modifications'' means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is: 
-A. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications. 
-B. Any new file that contains any part of the Original Code or previous Modifications. 
-1.10. ''Original Code'' means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License. 
-1.10.1. "Patent Claims" means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor. 
-1.11. ''Source Code'' means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge. 
-1.12. "You'' (or "Your") means an individual or a legal entity exercising rights under, and complying with, all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
-2. Source Code License. 
-2.1. The Initial Developer Grant. 
-The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims: 
-(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and 
-(b) under Patents Claims infringed by the making, using or selling of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Code (or portions thereof). 
-(c) the licenses granted in this Section 2.1(a) and (b) are effective on the date Initial Developer first distributes Original Code under the terms of this License. 
-(d) Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for code that You delete from the Original Code; 2) separate from the Original Code; or 3) for infringements caused by: i) the modification of the Original Code or ii) the combination of the Original Code with other software or devices. 
-2.2. Contributor Grant. 
-Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license 
-(a) under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and 
-(b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor (or portions thereof); and 2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination). 
-(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first makes Commercial Use of the Covered Code.
-(d) Notwithstanding Section 2.2(b) above, no patent license is granted: 1) for any code that Contributor has deleted from the Contributor Version; 2) separate from the Contributor Version; 3) for infringements caused by: i) third party modifications of Contributor Version or ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code in the absence of Modifications made by that Contributor.
-3. Distribution Obligations. 
-3.1. Application of License. 
-The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5. 
-3.2. Availability of Source Code. 
-Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party. 
-3.3. Description of Modifications. 
-You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code. 
-3.4. Intellectual Property Matters
-(a) Third Party Claims. 
-If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained. 
-(b) Contributor APIs. 
-If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file. 
-(c) Representations. 
-Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License.
-3.5. Required Notices. 
-You must duplicate the notice in Exhibit A in each file of the Source Code. If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice. If You created one or more Modification(s) You may add your name as a Contributor to the notice described in Exhibit A. You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
-3.6. Distribution of Executable Versions. 
-You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer. 
-3.7. Larger Works. 
-You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code.
-4. Inability to Comply Due to Statute or Regulation. 
-If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it.
-5. Application of this License. 
-This License applies to code to which the Initial Developer has attached the notice in Exhibit A and to related Covered Code.
-6. Versions of the License. 
-6.1. New Versions. 
-Inprise Corporation (''Inprise'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number. 
-6.2. Effect of New Versions. 
-Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Inprise. No one other than Inprise has the right to modify the terms applicable to Covered Code created under this License. 
-6.3. Derivative Works. 
-If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrases ''Mozilla'', ''MOZILLAPL'', ''MOZPL'', ''Netscape'', "MPL", ''NPL", "Inprise", "ISC", "InterBase", "IB'' or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.)
-6.4 Origin of the InterBase Public License.
-The InterBase Public License V 1.0 is based on the Mozilla Public License V 1.1 with the following changes: 
-1. The license is published by Inprise Corporation. Only Inprise Corporation can modify the terms applicable to Covered Code. 
-2. The license can be modified and used for code which is not already governed by this license. Modified versions of the license must be renamed to avoid confusion with Netscape's or Inprise Corporation's public license and must include a description of changes from the InterBase Public License.
-3. The name of the license in Exhibit A is the "InterBase Public License". 
-4. The reference to an alternative license in Exhibit A has been removed.
-5. Amendments I, II, III, V, and VI have been deleted.
-6. Exhibit A, Netscape Public License has been deleted
-7. A new amendment (II) has been added, describing the required and restricted rights to use the trademarks of Inprise Corporation.
-7. DISCLAIMER OF WARRANTY. 
-COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-8. TERMINATION. 
-8.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. 
-8.2. If You initiate litigation by asserting a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You file such action is referred to as "Participant") alleging that: 
-(a) such Participant's Contributor Version directly or indirectly infringes any patent, then any and all rights granted by such Participant to You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, unless if within 60 days after receipt of notice You either: (i) agree in writing to pay Participant a mutually agreeable reasonable royalty for Your past and future use of Modifications made by such Participant, or (ii) withdraw Your litigation claim with respect to the Contributor Version against such Participant. If within 60 days of notice, a reasonable royalty and payment arrangement are not mutually agreed upon in writing by the parties or the litigation claim is not withdrawn, the rights granted by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration of the 60 day notice period specified above. 
-(b) any software, hardware, or device, other than such Participant's Contributor Version, directly or indirectly infringes any patent, then any rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You first made, used, sold, distributed, or had made, Modifications made by that Participant. 
-8.3. If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license. 
-8.4. In the event of termination under Sections 8.1 or 8.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination.
-9. LIMITATION OF LIABILITY.
-UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-10. U.S. GOVERNMENT END USERS. 
-The Covered Code is a ''commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ''commercial computer software'' and ''commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein. 
-11. MISCELLANEOUS. 
-This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in the United States of America, any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License.
-12. RESPONSIBILITY FOR CLAIMS. 
-As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability. 
-13. MULTIPLE-LICENSED CODE. 
-Initial Developer may designate portions of the Covered Code as "Multiple-Licensed". "Multiple-Licensed" means that the Initial Developer permits you to utilize portions of the Covered Code under Your choice of the IPL or the alternative licenses, if any, specified by the Initial Developer in the file described in Exhibit A.
-EXHIBIT A - InterBase Public License.
-``The contents of this file are subject to the InterBase Public License Version 1.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.Inprise.com/IPL.html 
-Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. 
-The Original Code was created by Inprise Corporation and its predecessors. 
-Portions created by Inprise Corporation are Copyright (C) Inprise Corporation. All Rights Reserved. 
-Contributor(s): ______________________________________. 
-AMENDMENTS 
-I. Inprise and logo. This License does not grant any rights to use the trademarks "Inprise'', "InterBase," "Java" or "JavaScript" even if such marks are included in the Original Code or Modifications. 
-II. Trademark Usage. 
-II.1. Advertising Materials. All advertising materials mentioning features or use of the covered Code must display the following acknowledgement: "This product includes software developed by Inprise Corporation. "
-II.2. Endorsements. The names "Inprise," "InterBase," "ISC," and "IB" must not be used to endorse or promote Contributor Versions or Larger Works without the prior written permission of Inprise.
-II.3. Product Names. Contributor Versions and Larger Works may not be called "Inprise" or "InterBase" nor may the words "Inprise" or "InterBase" appear in their names without the prior written permission of Inprise Corporation.
diff --git a/licenses/LGPL-2 b/licenses/LGPL-2
index 5bc8fb2c8f75..d53864f9088e 100644
--- a/licenses/LGPL-2
+++ b/licenses/LGPL-2
@@ -2,7 +2,7 @@
                        Version 2, June 1991
 
  Copyright (C) 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -133,7 +133,7 @@ such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-  
+
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
@@ -462,9 +462,8 @@ convey the exclusion of warranty; and each file should have at least the
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    You should have received a copy of the GNU Library General Public License
+    along with this library; if not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -475,7 +474,7 @@ necessary.  Here is a sample; alter the names:
   Yoyodyne, Inc., hereby disclaims all copyright interest in the
   library `Frob' (a library for tweaking knobs) written by James Random Hacker.
 
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
+  <signature of Moe Ghoul>, 1 April 1990
+  Moe Ghoul, President of Vice
 
 That's all there is to it!
diff --git a/licenses/LGPL-2-with-linking-exception b/licenses/LGPL-2-with-linking-exception
index ccdb9fb8b77b..29063c7a2317 100644
--- a/licenses/LGPL-2-with-linking-exception
+++ b/licenses/LGPL-2-with-linking-exception
@@ -1,3 +1,6 @@
+GNU Lesser General Public License, version 2.
+See LGPL-2 for the full text of this license.
+
 As a special exception to the GNU Library General Public License, you
 may link, statically or dynamically, a "work that uses the Library"
 with a publicly distributed version of the Library to produce an
@@ -11,488 +14,3 @@ conditions defined in clause 3 of the GNU Library General Public
 License.  This exception does not however invalidate any other reasons
 why the executable file might be covered by the GNU Library General
 Public License.
-
-----------------------------------------------------------------------
-
-                  GNU LIBRARY GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1991 Free Software Foundation, Inc.
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the library GPL.  It is
- numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it.  You can use it for
-your libraries, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library.  If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software.  To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-  Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs.  This
-license, the GNU Library General Public License, applies to certain
-designated libraries.  This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
-  The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it.  Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program.  However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
-  Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries.  We
-concluded that weaker conditions might promote sharing better.
-
-  However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves.  This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them.  (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.)  The hope is that this
-will lead to faster development of free libraries.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, while the latter only
-works together with the library.
-
-  Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-
-                  GNU LIBRARY GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License").  Each licensee is
-addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also compile or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    c) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    d) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-    MA 02111-1307, USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/licenses/LGPL-2.1 b/licenses/LGPL-2.1
index 4362b49151d7..4a9ee500e278 100644
--- a/licenses/LGPL-2.1
+++ b/licenses/LGPL-2.1
@@ -2,7 +2,7 @@
                        Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -483,9 +483,8 @@ convey the exclusion of warranty; and each file should have at least the
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -496,7 +495,7 @@ necessary.  Here is a sample; alter the names:
   Yoyodyne, Inc., hereby disclaims all copyright interest in the
   library `Frob' (a library for tweaking knobs) written by James Random Hacker.
 
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
+  <signature of Moe Ghoul>, 1 April 1990
+  Moe Ghoul, President of Vice
 
 That's all there is to it!
diff --git a/licenses/LGPL-2.1-with-linking-exception b/licenses/LGPL-2.1-with-linking-exception
index 82aadf032801..5c06a0bdac6f 100644
--- a/licenses/LGPL-2.1-with-linking-exception
+++ b/licenses/LGPL-2.1-with-linking-exception
@@ -1,3 +1,6 @@
+GNU Lesser General Public License, version 2.1.
+See LGPL-2.1 for the full text of this license.
+
 As a special exception, the copyright holders of this library give you
 permission to link this library with independent modules to produce an
 executable, regardless of the license terms of these independent modules,
@@ -8,507 +11,3 @@ module is a module which is not derived from or based on this library.
 If you modify this library, you may extend this exception to your version
 of the library, but you are not obligated to do so.  If you do not wish
 to do so, delete this exception statement from your version.
-
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/licenses/LGPL-3-with-linking-exception b/licenses/LGPL-3-with-linking-exception
index 6f83af9a91aa..914d4100f45d 100644
--- a/licenses/LGPL-3-with-linking-exception
+++ b/licenses/LGPL-3-with-linking-exception
@@ -1,3 +1,6 @@
+GNU Lesser General Public License, version 3.
+See LGPL-3 for the full text of this license.
+
 As a special exception to the GNU Lesser General Public License, you
 may link, statically or dynamically, a "work that uses the Library"
 with a publicly distributed version of the Library to produce an
@@ -11,170 +14,3 @@ the conditions defined in clause 3 of the GNU Library General Public
 License.  This exception does not however invalidate any other reasons
 why the executable file might be covered by the GNU Lesser General
 Public License.
-
-
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index 94f7d789ab2b..d5055e319fa7 100644
--- a/licenses/Manifest.gz
+++ b/licenses/Manifest.gz
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index ef33890e5e79..6f7e25721c69 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index f40a927bf81b..cfb8a7ce82ae 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,6 +1,6 @@
 DIST strawberry-1.2.2.tar.xz 11460012 BLAKE2B bf0edcec29b85cd33b8f2ee883979e6056f776b039e265f63e9b1f7c04cd5193531477f4a52d1eb6f520e380078eee13d3b8d9823f78806527712c09b7a445aa SHA512 f61029de969c47c10c4353d2613a111e0103d1fa0f2e968e3b3c0ce8679f4eaeb302ff24e4bbe28af4513b88b73ca8d02e8e0418fc1150a3144316d5441e996c
-DIST strawberry-1.2.5.tar.xz 11464228 BLAKE2B 8169b5b3fe70b3ce99ab86a2be74f71d4b2cb10f2db0132296106d87079685f646dff322fc5171ebe9cf8970625e9cdfbfd0ed62b6cf27950520755defb19668 SHA512 ec4b6cf367b849fa85b656032c01065c44d7b6a6662159c240bc60ab8f5ee336090facfd7b139351afef32d7cdfabfb20d8ad0021c8672d5a6cbde8fec89f250
+DIST strawberry-1.2.6.tar.xz 11463972 BLAKE2B 907ade85924a639a82f607fb393a78b7f035372f4ce74bf97f727c54faf7c141309200439ce292972690cf119e9f70e52e0b415569bd9c6afd00d587aa95f98f SHA512 5c04d8d4c4798ca0f83d16595b97bf1f509e122e04662379c9739fcdaac2e4776fbe39e37d39ba057a6a6fa735523727da321b700df3231f311bcfc88031677e
 EBUILD strawberry-1.2.2-r1.ebuild 3014 BLAKE2B c5d1eba7aba6774de4bb55d0e81bb02d1633076d03bde37594ebe56292ac7dd672328c70a66bcf9f90f215781fed5ab28ba96a193b5864f66a5a9c7bf447c6c8 SHA512 5955c47d95a806a7e13fba493e3533fda3f1f593df2e575f579fee1f94558996f61c35a43b41e16fe25b7a83376f19eb07d2d0c4bc924b6c867d234197cd5bea
-EBUILD strawberry-1.2.5.ebuild 3018 BLAKE2B 149338e02337b3ed24626a29a92bc02f185ba810a50f12a36eab5122a6ff1204f4fb789f4ccc6e9aa4765702d78cb6b7b11a6f425ac43085078f606467bf0445 SHA512 f1a2e105a2e77aee9a04472eebf1ba01f3667203dad78a530f0fa1d055308990333107a6926a62d14b318407c0c931df4424edd7a7f2ab6742a7cdaa1e77221c
+EBUILD strawberry-1.2.6.ebuild 3018 BLAKE2B 149338e02337b3ed24626a29a92bc02f185ba810a50f12a36eab5122a6ff1204f4fb789f4ccc6e9aa4765702d78cb6b7b11a6f425ac43085078f606467bf0445 SHA512 f1a2e105a2e77aee9a04472eebf1ba01f3667203dad78a530f0fa1d055308990333107a6926a62d14b318407c0c931df4424edd7a7f2ab6742a7cdaa1e77221c
 EBUILD strawberry-9999.ebuild 3018 BLAKE2B 149338e02337b3ed24626a29a92bc02f185ba810a50f12a36eab5122a6ff1204f4fb789f4ccc6e9aa4765702d78cb6b7b11a6f425ac43085078f606467bf0445 SHA512 f1a2e105a2e77aee9a04472eebf1ba01f3667203dad78a530f0fa1d055308990333107a6926a62d14b318407c0c931df4424edd7a7f2ab6742a7cdaa1e77221c
 MISC metadata.xml 728 BLAKE2B b7ab9edb0af1e79c745a473737ae407d34e83da3f98f1ee795e2cd1b8ecf59d9f017345f39e8ec806abb46a6b70c08689af559ba2d0fd7e02dc5a406a332838d SHA512 5e4c7062543aa86f92ef09a3d2997a6b55d205c088d6daafec1b63d6146e0f26cdd545bf0709624fee14c115082d29d397a4d6300d3b2417c8612b59fa4c86a7
diff --git a/media-sound/strawberry/strawberry-1.2.5.ebuild b/media-sound/strawberry/strawberry-1.2.6.ebuild
index 062c8ce36172..062c8ce36172 100644
--- a/media-sound/strawberry/strawberry-1.2.5.ebuild
+++ b/media-sound/strawberry/strawberry-1.2.6.ebuild
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 4cfec470b845..f1536b38ef84 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 334e041ea3cd..efe95a30eea5 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 19 Jan 2025 06:10:22 +0000
+Mon, 20 Jan 2025 06:10:25 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index a54b8515f374..f75a2077b308 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 595396 BLAKE2B e2cec258096db925ff61bbfdac7d3cb0322ba1319c2e49e6e58e6f1f10c19961630a48c1479974e25023ec8bf89a507461227e2e371f2e46deb1e43272dc1663 SHA512 6e466f529ca1a138d0c2857a7b3a8f2b51c56ee38d3a15ac4efac9819992162e5eccb7719f161b8426eb186371adaf3b0dbeaf0b9fda3195abb5622f027146cc
-TIMESTAMP 2025-01-19T06:10:28Z
+TIMESTAMP 2025-01-20T06:10:29Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmeMl1RfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmeN6NVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBgMhAApLQ5boWzp9FPOg2Dmak+BzB4/Frew3ZbTi/Eo7s25oWcWSxqkKbmzqPV
-j/gC+HB0/XCCZHctEjQObD2diB+anMDM2OU50S/+GJ9Q9/qtgQFmzR/Ox3o4woQ/
-PXisVrxXVXxT2nqoxH+ZOZE093BtALBxLrkLk0gfEldTMgt/OKmVDttN8ngq3FTX
-2mYneeJ2TGSLURb3qNM8Q2j4TCaQRYZIHSu5E971DMDW+alcwTlp1kOl+65bIH9E
-iddXBwXGJW7bgplB9ZTvlboRjidgw4pqdzJnQTJ0kdY1sSFiG0kGJtMfXcrTaOyz
-bQJ1BKt97kgPNNxLLGwY+HE2GO32r9PZptxseMCSlxH5TGwkM1Yw9cyE61pIvrU5
-Qeb3Uar1BSTPymBwRRRQzqY0vuUiLPzjA/G/NmXB/15s7USjfZB7WHkHG6Bv9pHm
-DdvkyhtScVmcPweUb5hqeod40X60W4nMWt4kO5VYruIJeUOHu7S4WlPV9sZSs+bV
-lgjINsb+f06rZ5NbVom28ls7iDwJhbYtlGBydH07G3U0y+Ov8sLmndo6vaDpg1AT
-CrJ0XbexbVHu2v6kT1UalExRK5F2fOnY0rUbrqsXnb97DUF/pXC1lVGul1N7MKVC
-g1Psu5qKmjf5xdRqWdnVyIgFhtuT+NroIawSmKAqTok5Q+cyhk0=
-=F3BA
+klAPJRAAs9B/nTA3qag7gojOKIufs5uWG/CeUA9HouqiAtiqII4K6hItruRpz0el
+Kz+UG6aLjYF1JABU1TiGM56QnH78MC/pAvEfdE5rZV0FshzUdkF5R+XWvD/6AUqz
+BU322hzZ96IT1W8FXnDer553kMMQeYUqKgihzX3kbuvCMVAsqFa7gYD+EohSRCld
+qVNnWAN+j49ze4B3L1NTNKLHwaH52I+LxzOeF8yBgO/7UC7ZdBdmExSZ7LoOnAtU
+VMGETgFzR+DDevONvxlqzjuect5VAaxlXhs8c9dI3bJsf3tS0ZoYlOkAUhXCuaPQ
+qV/6m9WHc19opgfTAlFCXg9jn3zylNhjkvz/D3CIy3mSL0Q8HMS+0wSk23AcrSep
+WQdA4u88MFCnUGlSPker/RJRHjwlLCdB+J5jvtfs/zbGf0jdzMcSMmmul4Vs9hA2
+YesatpEJdZD5ytqfOhMje6gfLfOzx4rf1pVSXLCxIk+j2YR2WEzP/PtL2RGTBJ8A
+xuqhJ0Y5tWnvEUfpzQ7RXKZStxLnfiVObNSO2y4uGcbtXl9sTWG2HUDK09XrrG4k
+0BnLH261Y/Bt02hj2gr6ZF0Gw53o5Q683kXj9DaSBeK88MYmNRWTSrx80++NEcol
+A1wvHsit9Z6ziWrX8jtJB9MbkQHw5IUEW0waLM0oBXYOnzcawcQ=
+=+NvH
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 334e041ea3cd..efe95a30eea5 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 19 Jan 2025 06:10:22 +0000
+Mon, 20 Jan 2025 06:10:25 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 3eed52c565ab..5e1d075a702e 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 63974ff788cf..c06ea03880c9 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/restart-services-1.5 b/metadata/md5-cache/app-admin/restart-services-1.5
new file mode 100644
index 000000000000..d4e8cb93156a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/restart-services-1.5
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Tool to manage OpenRC and systemd services that need to be restarted
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mschiff/restart-services/
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=app-admin/lib_users app-portage/portage-utils || ( sys-apps/openrc sys-apps/openrc-navi sys-apps/systemd )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~mschiff/src/restart-services/restart-services-1.5.tgz
+_md5_=ce0b79f0811c8aaf0c80a41e97bcd1d0
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index d12eac92312f..14ff0abafadc 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/dar-2.7.15-r1 b/metadata/md5-cache/app-backup/dar-2.7.15-r1
deleted file mode 100644
index 7d4a0043e2a9..000000000000
--- a/metadata/md5-cache/app-backup/dar-2.7.15-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( app-text/doxygen ) nls? ( sys-devel/gettext ) >=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
-DEPEND=app-arch/bzip2:= app-arch/xz-utils app-arch/zstd:= dev-libs/libthreadar sys-libs/libcap >=sys-libs/zlib-1.2.3:= argon2? ( app-crypt/argon2:= ) curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gpg? ( app-crypt/gpgme:= dev-libs/libassuan:= ) lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:2 ) nls? ( virtual/libintl ) rsync? ( net-libs/librsync:= ) xattr? ( sys-apps/attr )
-DESCRIPTION=A full featured backup tool, aimed for disks
-EAPI=8
-HOMEPAGE=http://dar.linux.free.fr/
-INHERIT=autotools flag-o-matic
-IUSE=argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync xattr
-KEYWORDS=amd64 ppc sparc x86 ~amd64-linux
-LICENSE=GPL-2+
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils app-arch/zstd:= dev-libs/libthreadar sys-libs/libcap >=sys-libs/zlib-1.2.3:= argon2? ( app-crypt/argon2:= ) curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gpg? ( app-crypt/gpgme:= dev-libs/libassuan:= ) lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:2 ) nls? ( virtual/libintl ) rsync? ( net-libs/librsync:= ) xattr? ( sys-apps/attr )
-REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://downloads.sourceforge.net/project/dar/dar/2.7.15/dar-2.7.15.tar.gz
-_eclasses_=autotools	7d91cc798a8afd8f4e0c6e9587296ebe	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	gnuconfig	ddeb9f8caff1b5f71a09c75b7534df79	libtool	6b28392a775f807c8be5fc7ec9a605b9	multilib	b2a329026f2e404e9e371097dda47f96	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=6efcd650086f4bbca068a2bb28235960
diff --git a/metadata/md5-cache/app-backup/rdiff-backup-2.2.6 b/metadata/md5-cache/app-backup/rdiff-backup-2.2.6
index a6733c8b700c..01d599d7eb5b 100644
--- a/metadata/md5-cache/app-backup/rdiff-backup-2.2.6
+++ b/metadata/md5-cache/app-backup/rdiff-backup-2.2.6
@@ -1,17 +1,17 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) 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=dev-python/pylibacl[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyxattr[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=net-libs/librsync-1.0:0= dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+DEPEND=dev-python/pylibacl[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyxattr[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=net-libs/librsync-1.0:0= dev-python/setuptools-scm[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 )
 DESCRIPTION=Local/remote mirroring+incremental backup
 EAPI=8
 HOMEPAGE=https://github.com/rdiff-backup/rdiff-backup
 INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
 KEYWORDS=~alpha amd64 arm ~arm64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
-RDEPEND=dev-python/pylibacl[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyxattr[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=net-libs/librsync-1.0:0= python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RDEPEND=dev-python/pylibacl[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyxattr[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=net-libs/librsync-1.0:0= python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) 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
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/r/rdiff-backup/rdiff-backup-2.2.6.tar.gz
 _eclasses_=distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	pypi	ad1b21f87d117ae9bb089bdb65b8f013	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=e660b41ed32548d5a696f8dfb2ed7dfa
+_md5_=6887f13602a53beefc741caf779fc62b
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 6009a628b832..20d52748c7eb 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/amazon-ecr-credential-helper-0.9.0 b/metadata/md5-cache/app-containers/amazon-ecr-credential-helper-0.9.0
new file mode 100644
index 000000000000..ba27f3d7cfef
--- /dev/null
+++ b/metadata/md5-cache/app-containers/amazon-ecr-credential-helper-0.9.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.20:= app-arch/unzip
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=Automatically gets credentials for Amazon ECR on docker push/docker pull
+EAPI=8
+HOMEPAGE=https://github.com/awslabs/amazon-ecr-credential-helper
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/awslabs/amazon-ecr-credential-helper/archive/v0.9.0.tar.gz -> amazon-ecr-credential-helper-0.9.0.tar.gz https://dev.gentoo.org/~arthurzam/distfiles/app-containers/amazon-ecr-credential-helper/amazon-ecr-credential-helper-0.9.0-deps.tar.xz
+_eclasses_=flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	go-env	90efbc8636d2f02d9654183330e84cf7	go-module	df32d29550d40a92da723d3b8e17b467	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=d47a127e6012f70eb3a520e569cff8ce
diff --git a/metadata/md5-cache/app-containers/cri-tools-1.32.0 b/metadata/md5-cache/app-containers/cri-tools-1.32.0
index fd3600541d6f..120a984a3970 100644
--- a/metadata/md5-cache/app-containers/cri-tools-1.32.0
+++ b/metadata/md5-cache/app-containers/cri-tools-1.32.0
@@ -4,10 +4,10 @@ DESCRIPTION=CLI and validation tools for Kubelet Container Runtime (CRI)
 EAPI=8
 HOMEPAGE=https://github.com/kubernetes-sigs/cri-tools
 INHERIT=bash-completion-r1 go-module
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/kubernetes-sigs/cri-tools/archive/v1.32.0.tar.gz -> cri-tools-1.32.0.tar.gz
 _eclasses_=bash-completion-r1	767861f3744f589ee5291c1698b1c082	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	go-env	90efbc8636d2f02d9654183330e84cf7	go-module	df32d29550d40a92da723d3b8e17b467	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=f24ebd53c2c3ce810ccdd5775be06dff
+_md5_=91302a706cb987e8f0f9dcef38419401
diff --git a/metadata/md5-cache/app-containers/docker-buildx-0.19.1 b/metadata/md5-cache/app-containers/docker-buildx-0.19.1
index 6d7d44e1391d..b0135f0be968 100644
--- a/metadata/md5-cache/app-containers/docker-buildx-0.19.1
+++ b/metadata/md5-cache/app-containers/docker-buildx-0.19.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/docker/buildx
 INHERIT=go-module
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=app-containers/docker-cli
 RESTRICT=!test? ( test ) strip
 SLOT=0
 SRC_URI=https://github.com/docker/buildx/archive/refs/tags/v0.19.1.tar.gz -> docker-buildx-0.19.1.tar.gz
 _eclasses_=flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	go-env	90efbc8636d2f02d9654183330e84cf7	go-module	df32d29550d40a92da723d3b8e17b467	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=b3a3a5d97150fbcff465d0c6f3e2a2fc
+_md5_=c63da2b33da611cd71be7e6d2da72011
diff --git a/metadata/md5-cache/app-containers/umoci-0.4.7 b/metadata/md5-cache/app-containers/umoci-0.4.7
new file mode 100644
index 000000000000..5105e5c47584
--- /dev/null
+++ b/metadata/md5-cache/app-containers/umoci-0.4.7
@@ -0,0 +1,13 @@
+BDEPEND=dev-go/go-md2man >=dev-lang/go-1.20:= app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Manipulation tool for OCI images
+EAPI=8
+HOMEPAGE=https://github.com/opencontainers/umoci
+INHERIT=edo go-module
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/opencontainers/umoci/archive/v0.4.7.tar.gz -> umoci-0.4.7.tar.gz
+_eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	go-env	90efbc8636d2f02d9654183330e84cf7	go-module	df32d29550d40a92da723d3b8e17b467	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=e8ffce9e474d946063b0e04d1504cd41
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index b4db8045cd14..70b7084de4f2 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/eid-mw-5.1.19 b/metadata/md5-cache/app-crypt/eid-mw-5.1.21
index dfcbe368cfdb..8b13a5de312b 100644
--- a/metadata/md5-cache/app-crypt/eid-mw-5.1.19
+++ b/metadata/md5-cache/app-crypt/eid-mw-5.1.21
@@ -11,6 +11,6 @@ LICENSE=LGPL-3
 RDEPEND=sys-apps/pcsc-lite gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:3 dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy app-crypt/pinentry[gtk] ) p11-kit? ( app-crypt/p11-kit )
 REQUIRED_USE=dialogs? ( gtk )
 SLOT=0
-SRC_URI=https://codeload.github.com/fedict/eid-mw/tar.gz/v5.1.19 -> eid-mw-5.1.19.tar.gz
+SRC_URI=https://codeload.github.com/fedict/eid-mw/tar.gz/v5.1.21 -> eid-mw-5.1.21.tar.gz
 _eclasses_=autotools	7d91cc798a8afd8f4e0c6e9587296ebe	desktop	3a72ffe0d8e1dd73af3a1c8c15a59fed	gnome2-utils	a8cf148ec7f5ae0b1f1d33ae5f7f9e88	gnuconfig	ddeb9f8caff1b5f71a09c75b7534df79	libtool	6b28392a775f807c8be5fc7ec9a605b9	multilib	b2a329026f2e404e9e371097dda47f96	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
-_md5_=af56a07a9ba16fcf03077f8e371fed40
+_md5_=5e95e0816280e094134b179c04e0d790
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 5b12f0a36a7c..3f75e4db3a0a 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/diakonos-0.9.12 b/metadata/md5-cache/app-editors/diakonos-0.9.12
new file mode 100644
index 000000000000..ecf08b6116a4
--- /dev/null
+++ b/metadata/md5-cache/app-editors/diakonos-0.9.12
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby31? ( dev-ruby/curses[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/curses[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( dev-ruby/curses[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/yard[ruby_targets_ruby31(-)] ) test? ( dev-ruby/rspec[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/yard[ruby_targets_ruby32(-)] ) test? ( dev-ruby/rspec[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/yard[ruby_targets_ruby33(-)] ) test? ( dev-ruby/rspec[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 )
+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 )
+DESCRIPTION=A Linux editor for the masses
+EAPI=8
+HOMEPAGE=https://git.sr.ht/~pistos/diakonos
+INHERIT=ruby-ng
+IUSE=doc test test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby31? ( dev-ruby/curses[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/curses[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( dev-ruby/curses[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 )
+REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://git.sr.ht/~pistos/diakonos/archive/v0.9.12.tar.gz -> diakonos-0.9.12.tar.gz
+_eclasses_=multilib	b2a329026f2e404e9e371097dda47f96	ruby-ng	f0dedda0b5f19492ca5de91d98bc1708	ruby-utils	a5d18cde09a96648a4d316ada2786cdb	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=09dc4e862b0a19e287ab9c2152812fc2
diff --git a/metadata/md5-cache/app-editors/nano-8.2 b/metadata/md5-cache/app-editors/nano-8.2-r1
index 99e5c794fd78..99e5c794fd78 100644
--- a/metadata/md5-cache/app-editors/nano-8.2
+++ b/metadata/md5-cache/app-editors/nano-8.2-r1
diff --git a/metadata/md5-cache/app-editors/nano-8.3 b/metadata/md5-cache/app-editors/nano-8.3-r1
index 1b345d55fa58..1b345d55fa58 100644
--- a/metadata/md5-cache/app-editors/nano-8.3
+++ b/metadata/md5-cache/app-editors/nano-8.3-r1
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 3b652e42bfc8..4fe5294c561c 100644
--- a/metadata/md5-cache/app-metrics/Manifest.gz
+++ b/metadata/md5-cache/app-metrics/Manifest.gz
diff --git a/metadata/md5-cache/app-metrics/node_exporter-1.7.0 b/metadata/md5-cache/app-metrics/node_exporter-1.7.0
deleted file mode 100644
index dba74095ddbb..000000000000
--- a/metadata/md5-cache/app-metrics/node_exporter-1.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/promu-0.3.0 >=dev-lang/go-1.20:= app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=acct-group/node_exporter acct-user/node_exporter selinux? ( sec-policy/selinux-node_exporter ) systemd? ( sys-apps/systemd )
-DESCRIPTION=Prometheus exporter for machine metrics
-EAPI=8
-HOMEPAGE=https://github.com/prometheus/node_exporter
-INHERIT=go-module systemd
-IUSE=selinux systemd
-KEYWORDS=amd64 arm64 ~loong ~riscv ~x86
-LICENSE=Apache-2.0 BSD BSD-2 MIT
-RDEPEND=acct-group/node_exporter acct-user/node_exporter selinux? ( sec-policy/selinux-node_exporter ) systemd? ( sys-apps/systemd )
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/prometheus/node_exporter/archive/v1.7.0.tar.gz -> node_exporter-1.7.0.tar.gz https://github.com/rahilarious/gentoo-distfiles/releases/download/node_exporter-1.7.0/deps.tar.xz -> node_exporter-1.7.0-deps.tar.xz
-_eclasses_=flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	go-env	90efbc8636d2f02d9654183330e84cf7	go-module	df32d29550d40a92da723d3b8e17b467	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	systemd	54bd206bb5c4efac6ae28b6b006713b0	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=4fbb18cfe010f8886c603afa46dee34e
diff --git a/metadata/md5-cache/app-metrics/node_exporter-1.7.0-r2 b/metadata/md5-cache/app-metrics/node_exporter-1.7.0-r2
deleted file mode 100644
index 87718057f534..000000000000
--- a/metadata/md5-cache/app-metrics/node_exporter-1.7.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/promu-0.3.0 >=dev-lang/go-1.20:= app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=acct-group/node_exporter acct-user/node_exporter selinux? ( sec-policy/selinux-node_exporter ) systemd? ( sys-apps/systemd )
-DESCRIPTION=Prometheus exporter for machine metrics
-EAPI=8
-HOMEPAGE=https://github.com/prometheus/node_exporter
-INHERIT=go-module systemd
-IUSE=selinux systemd
-KEYWORDS=~amd64 ~arm64 ~loong ~riscv ~x86
-LICENSE=Apache-2.0 BSD BSD-2 MIT
-RDEPEND=acct-group/node_exporter acct-user/node_exporter selinux? ( sec-policy/selinux-node_exporter ) systemd? ( sys-apps/systemd )
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/prometheus/node_exporter/archive/v1.7.0.tar.gz -> node_exporter-1.7.0.tar.gz https://github.com/rahilarious/gentoo-distfiles/releases/download/node_exporter-1.7.0/deps.tar.xz -> node_exporter-1.7.0-deps.tar.xz
-_eclasses_=flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	go-env	90efbc8636d2f02d9654183330e84cf7	go-module	df32d29550d40a92da723d3b8e17b467	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	systemd	54bd206bb5c4efac6ae28b6b006713b0	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=c5d9165e67d09aef164e526b1c398db5
diff --git a/metadata/md5-cache/app-metrics/node_exporter-1.8.0 b/metadata/md5-cache/app-metrics/node_exporter-1.8.0
deleted file mode 100644
index 759433f196fd..000000000000
--- a/metadata/md5-cache/app-metrics/node_exporter-1.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/promu-0.3.0 >=dev-lang/go-1.20:= app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=acct-group/node_exporter acct-user/node_exporter selinux? ( sec-policy/selinux-node_exporter )
-DESCRIPTION=Prometheus exporter for machine metrics
-EAPI=8
-HOMEPAGE=https://github.com/prometheus/node_exporter
-INHERIT=go-module systemd
-IUSE=selinux
-KEYWORDS=~amd64 ~arm64 ~loong ~riscv ~x86
-LICENSE=Apache-2.0 BSD BSD-2 MIT
-RDEPEND=acct-group/node_exporter acct-user/node_exporter selinux? ( sec-policy/selinux-node_exporter )
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/prometheus/node_exporter/archive/v1.8.0.tar.gz -> node_exporter-1.8.0.tar.gz https://github.com/rahilarious/gentoo-distfiles/releases/download/node_exporter-1.8.0/deps.tar.xz -> node_exporter-1.8.0-deps.tar.xz
-_eclasses_=flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	go-env	90efbc8636d2f02d9654183330e84cf7	go-module	df32d29550d40a92da723d3b8e17b467	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	systemd	54bd206bb5c4efac6ae28b6b006713b0	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=7993cf275d81167bddd381523b23e027
diff --git a/metadata/md5-cache/app-metrics/node_exporter-1.8.2 b/metadata/md5-cache/app-metrics/node_exporter-1.8.2
index a2de91016e6d..3e3c25778790 100644
--- a/metadata/md5-cache/app-metrics/node_exporter-1.8.2
+++ b/metadata/md5-cache/app-metrics/node_exporter-1.8.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/prometheus/node_exporter
 INHERIT=go-module systemd
 IUSE=selinux
-KEYWORDS=~amd64 ~arm64 ~loong ~riscv ~x86
+KEYWORDS=amd64 arm64 ~loong ~riscv ~x86
 LICENSE=Apache-2.0 BSD BSD-2 MIT
 RDEPEND=acct-group/node_exporter acct-user/node_exporter selinux? ( sec-policy/selinux-node_exporter )
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/prometheus/node_exporter/archive/v1.8.2.tar.gz -> node_exporter-1.8.2.tar.gz https://dev.gentoo.org/~williamh/dist/node_exporter-1.8.2-deps.tar.xz
 _eclasses_=flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	go-env	90efbc8636d2f02d9654183330e84cf7	go-module	df32d29550d40a92da723d3b8e17b467	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	systemd	54bd206bb5c4efac6ae28b6b006713b0	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=f5e2ea88a023ef60149b75cd7e4e39f9
+_md5_=8502c36f01a7a150603e3f9cc7e35116
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index c31f0e470896..bdea9d3efa46 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/koleo-cli-0.2.137.16 b/metadata/md5-cache/app-misc/koleo-cli-0.2.137.16
new file mode 100644
index 000000000000..9b87941dcd07
--- /dev/null
+++ b/metadata/md5-cache/app-misc/koleo-cli-0.2.137.16
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/rich-13.7[python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.32[python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-import-check[python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) 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_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A simple CLI for koleo.pl railway planner
+EAPI=8
+HOMEPAGE=https://github.com/lzgirlcat/koleo-cli/ https://pypi.org/project/koleo-cli/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=>=dev-python/rich-13.7[python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.32[python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/k/koleo-cli/koleo_cli-0.2.137.16.tar.gz
+_eclasses_=distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	pypi	ad1b21f87d117ae9bb089bdb65b8f013	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=6eb900f647b809c6bdb7296d3d19a9bf
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 604128875432..3866c4b6eef0 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/metagen-0.7.4 b/metadata/md5-cache/app-portage/metagen-0.7.4
index 59ed34549cfb..30bb9b138396 100644
--- a/metadata/md5-cache/app-portage/metagen-0.7.4
+++ b/metadata/md5-cache/app-portage/metagen-0.7.4
@@ -1,17 +1,17 @@
-BDEPEND=test? ( dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sys-apps/portage[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=test? ( dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] sys-apps/portage[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
-DEPEND=dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sys-apps/portage[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEPEND=dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] sys-apps/portage[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
 DESCRIPTION=metadata.xml generator for ebuilds
 EAPI=8
 HOMEPAGE=https://cgit.gentoo.org/proj/metagen.git
 INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
 KEYWORDS=amd64 ~arm64 ~hppa ppc ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sys-apps/portage[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RDEPEND=dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] sys-apps/portage[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/m/metagen/metagen-0.7.4.tar.gz
 _eclasses_=distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	pypi	ad1b21f87d117ae9bb089bdb65b8f013	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=d6c1fc9997b3bd02303395f3c3410171
+_md5_=ee8c28952bb7e959d12a9769564d8052
diff --git a/metadata/md5-cache/app-portage/metagen-9999 b/metadata/md5-cache/app-portage/metagen-9999
index 75349d32a202..8ed3e6f3ed08 100644
--- a/metadata/md5-cache/app-portage/metagen-9999
+++ b/metadata/md5-cache/app-portage/metagen-9999
@@ -1,15 +1,16 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] sys-apps/portage[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(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sys-apps/portage[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEPEND=dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] sys-apps/portage[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
 DESCRIPTION=metadata.xml generator for ebuilds
 EAPI=8
 HOMEPAGE=https://cgit.gentoo.org/proj/metagen.git
 INHERIT=distutils-r1 git-r3
-IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sys-apps/portage[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RDEPEND=dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] sys-apps/portage[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
 _eclasses_=distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	git-r3	875eb471682d3e1f18da124be97dcc81	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=ed136506fe10abec0dd3a821a55f7239
+_md5_=b72c598a717e9c66287744b50a5785a3
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index d582f3b1aa0f..cfff082e26e8 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/hyperestraier-1.4.13-r2 b/metadata/md5-cache/app-text/hyperestraier-1.4.13-r2
index 2e69a9c32553..21cb8741830f 100644
--- a/metadata/md5-cache/app-text/hyperestraier-1.4.13-r2
+++ b/metadata/md5-cache/app-text/hyperestraier-1.4.13-r2
@@ -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=compile configure install preinst prepare setup test unpack
-DEPEND=dev-db/qdbm bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.8:* ) lzo? ( dev-libs/lzo ) mecab? ( app-text/mecab ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ) zlib? ( sys-libs/zlib ) java? ( >=virtual/jdk-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=dev-db/qdbm bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.8:* ) lzo? ( dev-libs/lzo ) mecab? ( app-text/mecab ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ) zlib? ( sys-libs/zlib ) java? ( >=virtual/jdk-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=a full-text search system for communities
 EAPI=8
 HOMEPAGE=https://fallabs.com/hyperestraier/
 INHERIT=autotools java-pkg-opt-2 perl-functions ruby-ng
-IUSE=bzip2 debug java lzo mecab perl ruby static-libs +zlib java ruby_targets_ruby31
+IUSE=bzip2 debug java lzo mecab perl ruby static-libs +zlib java ruby_targets_ruby31 ruby_targets_ruby32
 KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
-RDEPEND=dev-db/qdbm bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.8:* ) lzo? ( dev-libs/lzo ) mecab? ( app-text/mecab ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=dev-db/qdbm bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.8:* ) lzo? ( dev-libs/lzo ) mecab? ( app-text/mecab ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://fallabs.com/hyperestraier/hyperestraier-1.4.13.tar.gz
 _eclasses_=autotools	7d91cc798a8afd8f4e0c6e9587296ebe	gnuconfig	ddeb9f8caff1b5f71a09c75b7534df79	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	c610b1541a10e37cb26ab5b707a744f1	libtool	6b28392a775f807c8be5fc7ec9a605b9	multilib	b2a329026f2e404e9e371097dda47f96	perl-functions	1863acf0982afafc67797e3ce7275b4c	ruby-ng	f0dedda0b5f19492ca5de91d98bc1708	ruby-utils	a5d18cde09a96648a4d316ada2786cdb	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=92b0eff46859a118cfb548c5d0cadffb
+_md5_=795cd099eae327b1a2ea80b06539131d
diff --git a/metadata/md5-cache/app-text/sigil-2.4.0 b/metadata/md5-cache/app-text/sigil-2.4.0
index 4a9d35fa8ae1..e4dbed5af046 100644
--- a/metadata/md5-cache/app-text/sigil-2.4.0
+++ b/metadata/md5-cache/app-text/sigil-2.4.0
@@ -7,11 +7,11 @@ HOMEPAGE=https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=xdg cmake python-single-r1
 IUSE=doc +plugins +system-mathjax python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3+ Apache-2.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_13? ( dev-lang/python:3.13 ) app-text/hunspell:= dev-libs/libpcre2:=[pcre16] dev-qt/qtbase:6[concurrent,cups,network,widgets,xml] dev-qt/qtwebengine:6[widgets] dev-qt/qtsvg:6 sys-libs/zlib[minizip] python_single_target_python3_10? ( dev-python/css-parser[python_targets_python3_10(-)] dev-python/dulwich[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/css-parser[python_targets_python3_11(-)] dev-python/dulwich[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/css-parser[python_targets_python3_12(-)] dev-python/dulwich[python_targets_python3_12(-)] dev-python/lxml[python_targets_python3_12(-)] ) python_single_target_python3_13? ( dev-python/css-parser[python_targets_python3_13(-)] dev-python/dulwich[python_targets_python3_13(-)] dev-python/lxml[python_targets_python3_13(-)] ) plugins? ( python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cssselect[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] dev-python/pyqt6[python_targets_python3_10(-)] dev-python/pyqt6-webengine[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/cssselect[python_targets_python3_11(-)] dev-python/html5lib[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/regex[python_targets_python3_11(-)] dev-python/pyqt6[python_targets_python3_11(-)] dev-python/pyqt6-webengine[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/chardet[python_targets_python3_12(-)] dev-python/cssselect[python_targets_python3_12(-)] dev-python/html5lib[python_targets_python3_12(-)] dev-python/pillow[python_targets_python3_12(-)] dev-python/regex[python_targets_python3_12(-)] dev-python/pyqt6[python_targets_python3_12(-)] dev-python/pyqt6-webengine[python_targets_python3_12(-)] ) python_single_target_python3_13? ( dev-python/chardet[python_targets_python3_13(-)] dev-python/cssselect[python_targets_python3_13(-)] dev-python/html5lib[python_targets_python3_13(-)] dev-python/pillow[python_targets_python3_13(-)] dev-python/regex[python_targets_python3_13(-)] dev-python/pyqt6[python_targets_python3_13(-)] dev-python/pyqt6-webengine[python_targets_python3_13(-)] ) 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] ) ) system-mathjax? ( >=dev-libs/mathjax-3 )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13 )
 SLOT=0
 SRC_URI=https://github.com/Sigil-Ebook/Sigil/archive/2.4.0.tar.gz -> sigil-2.4.0.tar.gz doc? ( https://github.com/Sigil-Ebook/sigil-user-guide/releases/download/2024.08.15/Sigil_User_Guide_2024.08.15.epub )
 _eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	47d8ac9be330c9366112b78fd4f8ce57	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	xdg	3ef49a87c52c8b77c476351195dfe575	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
-_md5_=5a3dd8d26e4020537aeb6c0b7526d9d9
+_md5_=c293651211bc659e39f9a6eaca5e7b37
diff --git a/metadata/md5-cache/app-text/zeal-0.7.1 b/metadata/md5-cache/app-text/zeal-0.7.1
deleted file mode 100644
index ad97cdf20f9c..000000000000
--- a/metadata/md5-cache/app-text/zeal-0.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=kde-frameworks/extra-cmake-modules app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-arch/libarchive:= dev-db/sqlite:3 dev-qt/qtbase:6[concurrent,gui,network,widgets] dev-qt/qtwebchannel:6 dev-qt/qtwebengine:6[widgets] x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms
-DESCRIPTION=Offline documentation browser inspired by Dash
-EAPI=8
-HOMEPAGE=https://zealdocs.org/
-INHERIT=cmake edos2unix xdg-utils
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=app-arch/libarchive:= dev-db/sqlite:3 dev-qt/qtbase:6[concurrent,gui,network,widgets] dev-qt/qtwebchannel:6 dev-qt/qtwebengine:6[widgets] x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms x11-themes/hicolor-icon-theme
-SLOT=0
-SRC_URI=https://github.com/zealdocs/zeal/releases/download/v0.7.1/zeal-0.7.1.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	edos2unix	33e347e171066657f91f8b0c72ec8773	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
-_md5_=3af127f5c99645c288a25a3f2d97b9f6
diff --git a/metadata/md5-cache/dev-build/Manifest.gz b/metadata/md5-cache/dev-build/Manifest.gz
index d6930f004673..c6cab420be2e 100644
--- a/metadata/md5-cache/dev-build/Manifest.gz
+++ b/metadata/md5-cache/dev-build/Manifest.gz
diff --git a/metadata/md5-cache/dev-build/cmake-3.30.6 b/metadata/md5-cache/dev-build/cmake-3.30.6
index 9c75a5f9fafb..c010bc6a2558 100644
--- a/metadata/md5-cache/dev-build/cmake-3.30.6
+++ b/metadata/md5-cache/dev-build/cmake-3.30.6
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://cmake.org/
 INHERIT=bash-completion-r1 cmake flag-o-matic multiprocessing toolchain-funcs xdg-utils verify-sig
 IUSE=doc dap gui ncurses qt6 test verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash:0= >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig dap? ( dev-cpp/cppdap ) gui? ( !qt6? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) ) ncurses? ( sys-libs/ncurses:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.30/cmake-3.30.6.tar.gz !doc? ( https://dev.gentoo.org/~sam/distfiles/dev-build/cmake/cmake-3.30.0-docs.tar.xz ) verify-sig? ( https://github.com/Kitware/CMake/releases/download/v3.30.6/cmake-3.30.6-SHA-256.txt https://github.com/Kitware/CMake/releases/download/v3.30.6/cmake-3.30.6-SHA-256.txt.asc )
 _eclasses_=bash-completion-r1	767861f3744f589ee5291c1698b1c082	cmake	10a50dfaf728b802fcfd37f8d0da9056	eapi9-pipestatus	d2c134036ac31c3085aebc9147f572bd	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	verify-sig	7433426b6b28bf2737ba4b82c8aa8c53	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
-_md5_=8c6dcd51f3e6011cd4c8939906f7246f
+_md5_=8d452ab709203ee77d70a3fa8fec5bae
diff --git a/metadata/md5-cache/dev-build/meson-1.5.2 b/metadata/md5-cache/dev-build/meson-1.5.2
index 499aa34fce9c..cec9ee43df12 100644
--- a/metadata/md5-cache/dev-build/meson-1.5.2
+++ b/metadata/md5-cache/dev-build/meson-1.5.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://mesonbuild.com/
 INHERIT=bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs verify-sig
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 verify-sig
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=!<dev-build/muon-0.2.0-r2[man(-)] virtual/pkgconfig python_targets_pypy3? ( >=dev-lang/pypy-3.10:=[symlink] ) 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mesonbuild/meson/releases/download/1.5.2/meson-1.5.2.tar.gz verify-sig? ( https://github.com/mesonbuild/meson/releases/download/1.5.2/meson-1.5.2.tar.gz.asc ) https://github.com/mesonbuild/meson/releases/download/1.5.2/meson-reference.3 -> meson-reference-1.5.2.3
 _eclasses_=bash-completion-r1	767861f3744f589ee5291c1698b1c082	distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	eapi9-pipestatus	d2c134036ac31c3085aebc9147f572bd	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	verify-sig	7433426b6b28bf2737ba4b82c8aa8c53
-_md5_=7093dc251ddd2ce6cedd652707f6fb04
+_md5_=552f14f9af6ddab606283211227f93a5
diff --git a/metadata/md5-cache/dev-build/meson-1.6.1 b/metadata/md5-cache/dev-build/meson-1.6.1
index 6b2d6bba9cf9..2d0ae546d7fa 100644
--- a/metadata/md5-cache/dev-build/meson-1.6.1
+++ b/metadata/md5-cache/dev-build/meson-1.6.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://mesonbuild.com/
 INHERIT=bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs verify-sig
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=!<dev-build/muon-0.2.0-r2[man(-)] virtual/pkgconfig python_targets_pypy3? ( >=dev-lang/pypy-3.10:=[symlink] ) 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mesonbuild/meson/releases/download/1.6.1/meson-1.6.1.tar.gz verify-sig? ( https://github.com/mesonbuild/meson/releases/download/1.6.1/meson-1.6.1.tar.gz.asc ) https://github.com/mesonbuild/meson/releases/download/1.6.1/meson-reference.3 -> meson-reference-1.6.1.3
 _eclasses_=bash-completion-r1	767861f3744f589ee5291c1698b1c082	distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	eapi9-pipestatus	d2c134036ac31c3085aebc9147f572bd	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	verify-sig	7433426b6b28bf2737ba4b82c8aa8c53
-_md5_=fa43d2ac323e1001e97fead97c824edd
+_md5_=3778184b5395050120b7b6bfcef95579
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index c87c22da67b2..73cea6c4ed97 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/dbeaver-bin-24.3.2 b/metadata/md5-cache/dev-db/dbeaver-bin-24.3.2
index 4fbc71ef64e1..1475182591f0 100644
--- a/metadata/md5-cache/dev-db/dbeaver-bin-24.3.2
+++ b/metadata/md5-cache/dev-db/dbeaver-bin-24.3.2
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-17:*
 SLOT=0
 SRC_URI=amd64? ( https://dbeaver.io/files/24.3.2/dbeaver-ce-24.3.2-linux.gtk.x86_64-nojdk.tar.gz ) arm64? ( https://dbeaver.io/files/24.3.2/dbeaver-ce-24.3.2-linux.gtk.aarch64-nojdk.tar.gz )
 _eclasses_=desktop	3a72ffe0d8e1dd73af3a1c8c15a59fed	wrapper	11a2a3bd712784986679b60a0cab34a0	xdg	3ef49a87c52c8b77c476351195dfe575	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
-_md5_=1c1f92463e6768f69a8a18b613f036cf
+_md5_=6413edc342bb067b66fe4b336f2c506f
diff --git a/metadata/md5-cache/dev-db/mongodb-compass-bin-1.45.1 b/metadata/md5-cache/dev-db/mongodb-compass-bin-1.45.1
new file mode 100644
index 000000000000..cfc81c288316
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mongodb-compass-bin-1.45.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst unpack
+DESCRIPTION=GUI for MongoDB
+EAPI=8
+HOMEPAGE=https://mongodb.com/compass https://github.com/mongodb-js/compass
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop unpacker wrapper xdg
+KEYWORDS=-* ~amd64
+LICENSE=SSPL-1
+SLOT=0
+SRC_URI=https://github.com/mongodb-js/compass/releases/download/v1.45.1/mongodb-compass_1.45.1_amd64.deb
+_eclasses_=desktop	3a72ffe0d8e1dd73af3a1c8c15a59fed	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	unpacker	fb4b84181244b3b9990fa0bf40232dd2	wrapper	11a2a3bd712784986679b60a0cab34a0	xdg	3ef49a87c52c8b77c476351195dfe575	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
+_md5_=70a153d2de65ad710ba2e0f93093c0a0
diff --git a/metadata/md5-cache/dev-db/postgis-3.5.2 b/metadata/md5-cache/dev-db/postgis-3.5.2
new file mode 100644
index 000000000000..a799330b1ffd
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgis-3.5.2
@@ -0,0 +1,17 @@
+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
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=postgres_targets_postgres17? ( dev-db/postgresql:17=[server] ) postgres_targets_postgres16? ( dev-db/postgresql:16=[server] ) postgres_targets_postgres15? ( dev-db/postgresql:15=[server] ) postgres_targets_postgres14? ( dev-db/postgresql:14=[server] ) postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) dev-libs/json-c:= dev-libs/libxml2:2 dev-libs/protobuf-c:= >=sci-libs/geos-3.9.0 >=sci-libs/proj-6.1.0:= >=sci-libs/gdal-1.10.0:= address-standardizer? ( dev-libs/libpcre2 ) gtk? ( x11-libs/gtk+:2 ) virtual/pkgconfig doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt virtual/imagemagick-tools[png] )
+DESCRIPTION=Geographic Objects for PostgreSQL
+EAPI=8
+HOMEPAGE=https://postgis.net
+INHERIT=autotools postgres-multi toolchain-funcs
+IUSE=address-standardizer doc gtk static-libs topology postgres_targets_postgres17 postgres_targets_postgres16 postgres_targets_postgres15 postgres_targets_postgres14 postgres_targets_postgres13 postgres_targets_postgres12
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=postgres_targets_postgres17? ( dev-db/postgresql:17=[server] ) postgres_targets_postgres16? ( dev-db/postgresql:16=[server] ) postgres_targets_postgres15? ( dev-db/postgresql:15=[server] ) postgres_targets_postgres14? ( dev-db/postgresql:14=[server] ) postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) dev-libs/json-c:= dev-libs/libxml2:2 dev-libs/protobuf-c:= >=sci-libs/geos-3.9.0 >=sci-libs/proj-6.1.0:= >=sci-libs/gdal-1.10.0:= address-standardizer? ( dev-libs/libpcre2 ) gtk? ( x11-libs/gtk+:2 )
+REQUIRED_USE=|| ( postgres_targets_postgres17 postgres_targets_postgres16 postgres_targets_postgres15 postgres_targets_postgres14 postgres_targets_postgres13 postgres_targets_postgres12 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://download.osgeo.org/postgis/source/postgis-3.5.2.tar.gz
+_eclasses_=autotools	7d91cc798a8afd8f4e0c6e9587296ebe	gnuconfig	ddeb9f8caff1b5f71a09c75b7534df79	libtool	6b28392a775f807c8be5fc7ec9a605b9	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	postgres	2ad3e67607a9b24fe6973ddf464c5258	postgres-multi	ccad35d745ce66b41837db8a6ee94601	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=df856d8c90aca66372b59e35c0192f9c
diff --git a/metadata/md5-cache/dev-db/qdbm-1.8.78-r5 b/metadata/md5-cache/dev-db/qdbm-1.8.78-r5
index 386da5a32818..b7b85e0d9417 100644
--- a/metadata/md5-cache/dev-db/qdbm-1.8.78-r5
+++ b/metadata/md5-cache/dev-db/qdbm-1.8.78-r5
@@ -1,15 +1,15 @@
 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
 DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.8:* ) lzo? ( dev-libs/lzo ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ) zlib? ( sys-libs/zlib ) java? ( >=virtual/jdk-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.8:* ) lzo? ( dev-libs/lzo ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ) zlib? ( sys-libs/zlib ) java? ( >=virtual/jdk-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Quick Database Manager
 EAPI=8
 HOMEPAGE=https://fallabs.com/qdbm/
 INHERIT=autotools flag-o-matic java-pkg-opt-2 perl-functions ruby-ng
-IUSE=bzip2 cxx java lzo perl ruby static-libs zlib java ruby_targets_ruby31 ruby_targets_ruby32
+IUSE=bzip2 cxx java lzo perl ruby static-libs zlib java ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1
-RDEPEND=bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.8:* ) lzo? ( dev-libs/lzo ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.8:* ) lzo? ( dev-libs/lzo ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://fallabs.com/qdbm/qdbm-1.8.78.tar.gz
 _eclasses_=autotools	7d91cc798a8afd8f4e0c6e9587296ebe	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	gnuconfig	ddeb9f8caff1b5f71a09c75b7534df79	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	c610b1541a10e37cb26ab5b707a744f1	libtool	6b28392a775f807c8be5fc7ec9a605b9	multilib	b2a329026f2e404e9e371097dda47f96	perl-functions	1863acf0982afafc67797e3ce7275b4c	ruby-ng	f0dedda0b5f19492ca5de91d98bc1708	ruby-utils	a5d18cde09a96648a4d316ada2786cdb	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=31077ad889af3964ff5985ab16018f84
+_md5_=10091a4a0cea5fc6b57bf5b6e5edaf44
diff --git a/metadata/md5-cache/dev-go/Manifest.gz b/metadata/md5-cache/dev-go/Manifest.gz
index 1f9267c71da1..9577d9fd6527 100644
--- a/metadata/md5-cache/dev-go/Manifest.gz
+++ b/metadata/md5-cache/dev-go/Manifest.gz
diff --git a/metadata/md5-cache/dev-go/delve-1.24.0 b/metadata/md5-cache/dev-go/delve-1.24.0
new file mode 100644
index 000000000000..85f1130ac336
--- /dev/null
+++ b/metadata/md5-cache/dev-go/delve-1.24.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.20:= app-arch/unzip
+DEFINED_PHASES=compile install postinst prepare test unpack
+DESCRIPTION=A source-level debugger for the Go programming language
+EAPI=8
+HOMEPAGE=https://github.com/go-delve/delve
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=MIT BSD BSD-2 Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/go-delve/delve/archive/v1.24.0.tar.gz -> delve-1.24.0.tar.gz
+_eclasses_=flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	go-env	90efbc8636d2f02d9654183330e84cf7	go-module	df32d29550d40a92da723d3b8e17b467	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=8b175d53d6ceaa7f74acd28335dc1d88
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index aea582c29dc8..00bb7d8835dc 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/checker-framework-qual-3.47.0 b/metadata/md5-cache/dev-java/checker-framework-qual-3.47.0
deleted file mode 100644
index 7f320f1ed8d7..000000000000
--- a/metadata/md5-cache/dev-java/checker-framework-qual-3.47.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Annotations for type-checking by the Checker Framework
-EAPI=8
-HOMEPAGE=https://checkerframework.org/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/typetools/checker-framework/archive/checker-framework-3.47.0.tar.gz
-_eclasses_=java-pkg-2	38fd81c7880666a00a638ca8deb64d72	java-pkg-simple	c346bc0ba9945618340315a1089a82ef	java-utils-2	c610b1541a10e37cb26ab5b707a744f1
-_md5_=c1b2949a60349509bcf25abba7de62a7
diff --git a/metadata/md5-cache/dev-java/checker-framework-qual-3.48.3 b/metadata/md5-cache/dev-java/checker-framework-qual-3.48.3
index 3dd353aa28fd..add965eb3c9c 100644
--- a/metadata/md5-cache/dev-java/checker-framework-qual-3.48.3
+++ b/metadata/md5-cache/dev-java/checker-framework-qual-3.48.3
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://checkerframework.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 arm64 ~ppc64
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/typetools/checker-framework/archive/checker-framework-3.48.3.tar.gz
 _eclasses_=java-pkg-2	38fd81c7880666a00a638ca8deb64d72	java-pkg-simple	c346bc0ba9945618340315a1089a82ef	java-utils-2	c610b1541a10e37cb26ab5b707a744f1
-_md5_=93a63d7f5211d1ed77d6e6c45064a122
+_md5_=26e3fea3aa8e6407f6b697682ab27294
diff --git a/metadata/md5-cache/dev-java/error-prone-annotations-2.32.0 b/metadata/md5-cache/dev-java/error-prone-annotations-2.32.0
deleted file mode 100644
index e2537166ccdb..000000000000
--- a/metadata/md5-cache/dev-java/error-prone-annotations-2.32.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java annotations for the Error Prone static analysis tool
-EAPI=8
-HOMEPAGE=https://errorprone.info
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/google/error-prone/archive/v2.32.0.tar.gz -> error-prone-2.32.0.tar.gz
-_eclasses_=java-pkg-2	38fd81c7880666a00a638ca8deb64d72	java-pkg-simple	c346bc0ba9945618340315a1089a82ef	java-utils-2	c610b1541a10e37cb26ab5b707a744f1
-_md5_=976e901d42172076e47b707848e20642
diff --git a/metadata/md5-cache/dev-java/error-prone-annotations-2.36.0 b/metadata/md5-cache/dev-java/error-prone-annotations-2.36.0
index 622766c3fbc0..b3f9c75fab7c 100644
--- a/metadata/md5-cache/dev-java/error-prone-annotations-2.36.0
+++ b/metadata/md5-cache/dev-java/error-prone-annotations-2.36.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://errorprone.info
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 arm64 ~ppc64
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/google/error-prone/archive/v2.36.0.tar.gz -> error-prone-2.36.0.tar.gz
 _eclasses_=java-pkg-2	38fd81c7880666a00a638ca8deb64d72	java-pkg-simple	c346bc0ba9945618340315a1089a82ef	java-utils-2	c610b1541a10e37cb26ab5b707a744f1
-_md5_=c7d6961f62b391e52ebfcbf9bf3fad64
+_md5_=9c5a2153d6dcbc095764c4ef53aa1285
diff --git a/metadata/md5-cache/dev-java/guava-33.3.0 b/metadata/md5-cache/dev-java/guava-33.3.0
deleted file mode 100644
index 66b92cdf765d..000000000000
--- a/metadata/md5-cache/dev-java/guava-33.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=dev-java/error-prone-annotations-2.32.0:0 dev-java/j2objc-annotations:0 dev-java/jsr305:0 >=dev-java/checker-framework-qual-3.47.0:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A collection of Google's core Java libraries
-EAPI=8
-HOMEPAGE=https://github.com/google/guava
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 arm64 ppc64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/error-prone-annotations-2.32.0:0 dev-java/j2objc-annotations:0 dev-java/jsr305:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/google/guava/archive/v33.3.0.tar.gz -> guava-33.3.0.tar.gz
-_eclasses_=java-pkg-2	38fd81c7880666a00a638ca8deb64d72	java-pkg-simple	c346bc0ba9945618340315a1089a82ef	java-utils-2	c610b1541a10e37cb26ab5b707a744f1
-_md5_=b43fa80c93c567c784f4c41a607a5f5c
diff --git a/metadata/md5-cache/dev-java/guava-33.3.1 b/metadata/md5-cache/dev-java/guava-33.3.1
deleted file mode 100644
index 173a8524cb97..000000000000
--- a/metadata/md5-cache/dev-java/guava-33.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=dev-java/error-prone-annotations-2.36.0:0 dev-java/j2objc-annotations:0 dev-java/jsr305:0 >=dev-java/checker-framework-qual-3.48.2:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A collection of Google's core Java libraries
-EAPI=8
-HOMEPAGE=https://github.com/google/guava
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=~amd64 arm64 ~ppc64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/error-prone-annotations-2.36.0:0 dev-java/j2objc-annotations:0 dev-java/jsr305:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/google/guava/archive/v33.3.1.tar.gz -> guava-33.3.1.tar.gz
-_eclasses_=java-pkg-2	38fd81c7880666a00a638ca8deb64d72	java-pkg-simple	c346bc0ba9945618340315a1089a82ef	java-utils-2	c610b1541a10e37cb26ab5b707a744f1
-_md5_=088b8ade24eb5cd947fa1d05afd007de
diff --git a/metadata/md5-cache/dev-java/guava-33.4.0 b/metadata/md5-cache/dev-java/guava-33.4.0
index 839cab121268..b94ba080205f 100644
--- a/metadata/md5-cache/dev-java/guava-33.4.0
+++ b/metadata/md5-cache/dev-java/guava-33.4.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/google/guava
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm64 ~ppc64
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=dev-java/error-prone-annotations-2.36.0:0 dev-java/j2objc-annotations:0 dev-java/jsr305:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/google/guava/archive/v33.4.0.tar.gz -> guava-33.4.0.tar.gz
 _eclasses_=java-pkg-2	38fd81c7880666a00a638ca8deb64d72	java-pkg-simple	c346bc0ba9945618340315a1089a82ef	java-utils-2	c610b1541a10e37cb26ab5b707a744f1
-_md5_=1f42bb8328917fb2b24a86f899fe3b6f
+_md5_=a8f638a6b1041a9b7392e20dd3658cba
diff --git a/metadata/md5-cache/dev-java/guava-testlib-33.3.0 b/metadata/md5-cache/dev-java/guava-testlib-33.3.0
deleted file mode 100644
index 00d0ddd62df7..000000000000
--- a/metadata/md5-cache/dev-java/guava-testlib-33.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare pretend setup test
-DEPEND=>=dev-java/error-prone-annotations-2.32.0:0 ~dev-java/guava-33.3.0:0 dev-java/jsr305:0 dev-java/junit:4 >=dev-java/checker-framework-qual-3.47.0:0 dev-java/j2objc-annotations:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=A set of java classes to assist the tests for Guava itself
-EAPI=8
-HOMEPAGE=https://github.com/google/guava
-INHERIT=java-pkg-2 java-pkg-simple check-reqs
-IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/error-prone-annotations-2.32.0:0 ~dev-java/guava-33.3.0:0 dev-java/jsr305:0 dev-java/junit:4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/google/guava/archive/v33.3.0.tar.gz -> guava-33.3.0.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.4.2/truth-1.4.2.jar )
-_eclasses_=check-reqs	2a9731073c152554078a9a8df8fc0f1b	java-pkg-2	38fd81c7880666a00a638ca8deb64d72	java-pkg-simple	c346bc0ba9945618340315a1089a82ef	java-utils-2	c610b1541a10e37cb26ab5b707a744f1
-_md5_=7a62a74d61381e184f27833b8cb1936f
diff --git a/metadata/md5-cache/dev-java/guava-testlib-33.3.1 b/metadata/md5-cache/dev-java/guava-testlib-33.3.1
deleted file mode 100644
index b58ff3b0d7a7..000000000000
--- a/metadata/md5-cache/dev-java/guava-testlib-33.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare pretend setup test
-DEPEND=>=dev-java/error-prone-annotations-2.36.0:0 ~dev-java/guava-33.3.1:0 dev-java/jsr305:0 dev-java/junit:4 >=dev-java/checker-framework-qual-3.48.2:0 dev-java/j2objc-annotations:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=A set of java classes to assist the tests for Guava itself
-EAPI=8
-HOMEPAGE=https://github.com/google/guava
-INHERIT=java-pkg-2 java-pkg-simple check-reqs
-IUSE=doc source test
-KEYWORDS=~amd64 arm64 ~ppc64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/error-prone-annotations-2.36.0:0 ~dev-java/guava-33.3.1:0 dev-java/jsr305:0 dev-java/junit:4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/google/guava/archive/v33.3.1.tar.gz -> guava-33.3.1.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.4.2/truth-1.4.2.jar )
-_eclasses_=check-reqs	2a9731073c152554078a9a8df8fc0f1b	java-pkg-2	38fd81c7880666a00a638ca8deb64d72	java-pkg-simple	c346bc0ba9945618340315a1089a82ef	java-utils-2	c610b1541a10e37cb26ab5b707a744f1
-_md5_=914a4c629be662ce8f40cbfcb08c486c
diff --git a/metadata/md5-cache/dev-java/guava-testlib-33.4.0 b/metadata/md5-cache/dev-java/guava-testlib-33.4.0
index 73f123151ebb..4a4d4a68b64f 100644
--- a/metadata/md5-cache/dev-java/guava-testlib-33.4.0
+++ b/metadata/md5-cache/dev-java/guava-testlib-33.4.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/google/guava
 INHERIT=java-pkg-2 java-pkg-simple check-reqs
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=dev-java/error-prone-annotations-2.36.0:0 ~dev-java/guava-33.4.0:0 dev-java/jsr305:0 dev-java/junit:4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/guava/archive/v33.4.0.tar.gz -> guava-33.4.0.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.4.2/truth-1.4.2.jar )
 _eclasses_=check-reqs	2a9731073c152554078a9a8df8fc0f1b	java-pkg-2	38fd81c7880666a00a638ca8deb64d72	java-pkg-simple	c346bc0ba9945618340315a1089a82ef	java-utils-2	c610b1541a10e37cb26ab5b707a744f1
-_md5_=396f752f63c05662996b639cab574e6c
+_md5_=5edec56cbee6e943c40cb32ffaa9daed
diff --git a/metadata/md5-cache/dev-java/java-diff-utils-4.15 b/metadata/md5-cache/dev-java/java-diff-utils-4.15
index 74c57c23f2c2..aa9194454ad9 100644
--- a/metadata/md5-cache/dev-java/java-diff-utils-4.15
+++ b/metadata/md5-cache/dev-java/java-diff-utils-4.15
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://java-diff-utils.github.io/java-diff-utils/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 arm64 ~ppc64
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/java-diff-utils/java-diff-utils/archive/java-diff-utils-parent-4.15.tar.gz
 _eclasses_=java-pkg-2	38fd81c7880666a00a638ca8deb64d72	java-pkg-simple	c346bc0ba9945618340315a1089a82ef	java-utils-2	c610b1541a10e37cb26ab5b707a744f1
-_md5_=ec712b9020da319c405660138083c602
+_md5_=15b943bba9852b08b50901943d87e799
diff --git a/metadata/md5-cache/dev-java/protobuf-java-4.29.1 b/metadata/md5-cache/dev-java/protobuf-java-4.29.1
deleted file mode 100644
index 03b281ba1678..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-4.29.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=system-protoc? ( ~dev-libs/protobuf-29.1:0[protoc] ) !system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/guava:0 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Core Protocol Buffers library
-EAPI=8
-HOMEPAGE=https://protobuf.dev
-INHERIT=java-pkg-2 java-pkg-simple cmake
-IUSE=system-protoc doc source test
-KEYWORDS=amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/protocolbuffers/protobuf/releases/download/v29.1/protobuf-29.1.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	java-pkg-2	38fd81c7880666a00a638ca8deb64d72	java-pkg-simple	c346bc0ba9945618340315a1089a82ef	java-utils-2	c610b1541a10e37cb26ab5b707a744f1	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
-_md5_=b75aad90ecb08f111d0116bbd1cd87f5
diff --git a/metadata/md5-cache/dev-java/protobuf-java-4.29.2 b/metadata/md5-cache/dev-java/protobuf-java-4.29.2
index 74dd46f629bd..f761a0c34239 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-4.29.2
+++ b/metadata/md5-cache/dev-java/protobuf-java-4.29.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://protobuf.dev
 INHERIT=java-pkg-2 java-pkg-simple cmake
 IUSE=system-protoc doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/protocolbuffers/protobuf/releases/download/v29.2/protobuf-29.2.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )
 _eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	java-pkg-2	38fd81c7880666a00a638ca8deb64d72	java-pkg-simple	c346bc0ba9945618340315a1089a82ef	java-utils-2	c610b1541a10e37cb26ab5b707a744f1	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
-_md5_=c2e2cb2b54216d1f54d88168ae5a193a
+_md5_=9a28ac33d6aa872fa33f2c9b3c3af22f
diff --git a/metadata/md5-cache/dev-java/swt-4.34 b/metadata/md5-cache/dev-java/swt-4.34
index ee2a21104828..269060dad61a 100644
--- a/metadata/md5-cache/dev-java/swt-4.34
+++ b/metadata/md5-cache/dev-java/swt-4.34
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.eclipse.org/swt/
 INHERIT=flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs
 IUSE=cairo opengl webkit doc source
-KEYWORDS=~amd64 arm64 ~ppc64
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/glib x11-libs/gtk+:3 x11-libs/libXtst cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4.1 ) >=virtual/jre-17:* x11-libs/libX11 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.34
 SRC_URI=amd64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.34-202411201800/swt-4.34-gtk-linux-x86_64.zip ) arm64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.34-202411201800/swt-4.34-gtk-linux-aarch64.zip ) ppc64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.34-202411201800/swt-4.34-gtk-linux-ppc64le.zip )
 _eclasses_=flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	java-pkg-2	38fd81c7880666a00a638ca8deb64d72	java-pkg-simple	c346bc0ba9945618340315a1089a82ef	java-utils-2	c610b1541a10e37cb26ab5b707a744f1	multilib	b2a329026f2e404e9e371097dda47f96	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=a76b8649c4daeef8bb7faf12de2dbe2a
+_md5_=6bacb0262c0132a45a2c86568d23b26d
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 3e277a2f4818..5d30f387ebe7 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/mrustc-0.11.2 b/metadata/md5-cache/dev-lang/mrustc-0.11.2
new file mode 100644
index 000000000000..5eb0f8a3f68f
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/mrustc-0.11.2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gcc:*
+DEFINED_PHASES=compile configure install setup test
+DEPEND=sys-libs/zlib
+DESCRIPTION=Mutabah's Rust Compiler
+EAPI=8
+HOMEPAGE=https://github.com/thepowersgang/mrustc
+INHERIT=edo multiprocessing rust-toolchain toolchain-funcs
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=sys-libs/zlib sys-devel/gcc:*
+SLOT=0
+SRC_URI=https://github.com/thepowersgang/mrustc/archive/refs/tags/v0.11.2.tar.gz -> mrustc-0.11.2.tar.gz https://static.rust-lang.org/dist/rustc-1.74.1-src.tar.xz
+_eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	rust-toolchain	3f822985d9297438ed2443aa1fbdf33e	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=4532995b96ae97086cdc4eb5b0d02eb5
diff --git a/metadata/md5-cache/dev-lang/mrustc-9999 b/metadata/md5-cache/dev-lang/mrustc-9999
new file mode 100644
index 000000000000..a29f603462ea
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/mrustc-9999
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gcc:* >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install setup test unpack
+DEPEND=sys-libs/zlib
+DESCRIPTION=Mutabah's Rust Compiler
+EAPI=8
+HOMEPAGE=https://github.com/thepowersgang/mrustc
+INHERIT=edo multiprocessing rust-toolchain toolchain-funcs git-r3
+LICENSE=MIT
+PROPERTIES=live
+RDEPEND=sys-libs/zlib sys-devel/gcc:*
+SLOT=0
+_eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	git-r3	875eb471682d3e1f18da124be97dcc81	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	rust-toolchain	3f822985d9297438ed2443aa1fbdf33e	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=5917128cc474f3d333d7ee4350d1a7ab
diff --git a/metadata/md5-cache/dev-lang/nqp-9999 b/metadata/md5-cache/dev-lang/nqp-9999
index 3eff37a67106..8644f7e81c7b 100644
--- a/metadata/md5-cache/dev-lang/nqp-9999
+++ b/metadata/md5-cache/dev-lang/nqp-9999
@@ -1,6 +1,6 @@
-BDEPEND=java? ( dev-java/asm:9 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-9999[clang=] ) clang? ( llvm-core/clang ) java? ( >=virtual/jdk-11 ) dev-lang/perl >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=java? ( >=dev-java/asm-9.7.1_p20241213:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-9999[clang=] ) clang? ( llvm-core/clang ) java? ( >=virtual/jdk-11 ) dev-lang/perl >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install preinst prepare pretend setup test unpack
-DEPEND=java? ( dev-java/asm:9 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-9999[clang=] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=java? ( >=dev-java/asm-9.7.1_p20241213:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-9999[clang=] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Not Quite Perl, a Raku bootstrapping compiler
 EAPI=8
 HOMEPAGE=https://rakudo.org
@@ -8,9 +8,9 @@ INHERIT=java-pkg-opt-2 multibuild git-r3
 IUSE=doc clang java +moar test java
 LICENSE=Artistic-2
 PROPERTIES=live
-RDEPEND=java? ( dev-java/asm:9 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-9999[clang=] ) java? ( >=virtual/jre-11 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=java? ( >=dev-java/asm-9.7.1_p20241213:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-9999[clang=] ) java? ( >=virtual/jre-11 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=|| ( java moar )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	875eb471682d3e1f18da124be97dcc81	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	c610b1541a10e37cb26ab5b707a744f1	multibuild	4650a65187015567b4e041bb9bfdb364	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c
-_md5_=e07494ceb4f070325fd02790865682fd
+_md5_=2f7a03d5209225df1d73a893b6fbd97f
diff --git a/metadata/md5-cache/dev-lang/perl-5.40.0-r1 b/metadata/md5-cache/dev-lang/perl-5.40.0-r1
index a063dd5a64f3..356e329bf043 100644
--- a/metadata/md5-cache/dev-lang/perl-5.40.0-r1
+++ b/metadata/md5-cache/dev-lang/perl-5.40.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.perl.org/
 INHERIT=alternatives flag-o-matic toolchain-funcs multilib multiprocessing
 IUSE=berkdb perl_features_debug doc gdbm perl_features_ithreads minimal perl_features_quadmath
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=!minimal? ( >=app-admin/perl-cleaner-2.31 >=virtual/perl-CPAN-2.290.0 >=virtual/perl-Encode-3.120.0 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 >=virtual/perl-Math-BigInt-1.999.842 virtual/perl-Test-Harness )
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 >=sys-libs/zlib-1.2.12 virtual/libcrypt:=
 SLOT=0/5.40
 SRC_URI=mirror://cpan/src/5.0/perl-5.40.0.tar.xz mirror://cpan/authors/id/H/HA/HAARG/perl-5.40.0.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.40.0-patches-2.tar.xz https://github.com/arsv/perl-cross/releases/download/1.6/perl-cross-1.6.tar.gz
 _eclasses_=alternatives	8e630f543dbc427323566317daa8cf87	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=9fc35869337c4941cb73359b1f5c7bc1
+_md5_=ee3d9b5d5eb83e98e87a2aa7ce80dbe0
diff --git a/metadata/md5-cache/dev-lang/rust-1.54.0 b/metadata/md5-cache/dev-lang/rust-1.54.0
deleted file mode 100644
index 2708065dd2db..000000000000
--- a/metadata/md5-cache/dev-lang/rust-1.54.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) app-eselect/eselect-rust || ( >=sys-devel/gcc-4.7 >=llvm-core/clang-3.5 ) >=dev-build/cmake-3.13.4 dev-build/ninja test? ( dev-debug/gdb ) verify-sig? ( sec-keys/openpgp-keys-rust ) || ( dev-lang/rust-bin:1.54.0 dev-lang/rust:1.54.0 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install postinst postrm pretend setup test unpack
-DEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= dev-libs/openssl:0= elibc_musl? ( sys-libs/libunwind:= )
-DESCRIPTION=Systems programming language from Mozilla
-EAPI=8
-HOMEPAGE=https://www.rust-lang.org/
-INHERIT=cargo check-reqs estack flag-o-matic multiprocessing multilib multilib-build python-any-r1 rust-toolchain toolchain-funcs verify-sig
-IUSE=clippy cpu_flags_x86_sse2 debug doc miri nightly parallel-compiler rustfmt test wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
-RDEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= dev-libs/openssl:0= elibc_musl? ( sys-libs/libunwind:= ) app-eselect/eselect-rust !dev-lang/rust:stable !dev-lang/rust-bin:stable
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) miri? ( nightly ) parallel-compiler? ( nightly ) test? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
-RESTRICT=test
-SLOT=1.54.0
-SRC_URI=https://static.rust-lang.org/dist/rustc-1.54.0-src.tar.xz https://crates.io/api/v1/crates/openssl/0.10.35/download -> openssl-0.10.35.crate https://crates.io/api/v1/crates/openssl-sys/0.9.65/download -> openssl-sys-0.9.65.crate verify-sig? ( https://static.rust-lang.org/dist/rustc-1.54.0-src.tar.xz.asc )
-_eclasses_=cargo	5ad34dd14ea52875e865e465e0f6421a	check-reqs	2a9731073c152554078a9a8df8fc0f1b	eapi9-pipestatus	d2c134036ac31c3085aebc9147f572bd	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multilib-build	9ac26ea006828266d235e2f0135429b5	multiprocessing	1e32df7deee68372153dca65f4a7c21f	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	python-any-r1	6ddb5e75c10db046f89ebe39c85e1d82	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	rust	44c8464f6266787f32aab8b1f056a28b	rust-toolchain	3f822985d9297438ed2443aa1fbdf33e	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	verify-sig	7433426b6b28bf2737ba4b82c8aa8c53
-_md5_=28c416ce7e253a1b697b4d69db832d92
diff --git a/metadata/md5-cache/dev-lang/rust-1.74.1-r100 b/metadata/md5-cache/dev-lang/rust-1.74.1-r100
index 7c59080208f3..b6f0fb55b19c 100644
--- a/metadata/md5-cache/dev-lang/rust-1.74.1-r100
+++ b/metadata/md5-cache/dev-lang/rust-1.74.1-r100
@@ -1,11 +1,11 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) app-eselect/eselect-rust || ( >=sys-devel/gcc-4.7 >=llvm-core/clang-3.5 ) !system-llvm? ( >=dev-build/cmake-3.13.4 app-alternatives/ninja ) test? ( dev-debug/gdb ) verify-sig? ( sec-keys/openpgp-keys-rust ) || ( dev-lang/rust-bin:1.74.1 dev-lang/rust:1.74.1 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install postinst postrm preinst pretend setup test unpack
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) app-eselect/eselect-rust || ( >=sys-devel/gcc-4.7 >=llvm-core/clang-3.5 ) !system-llvm? ( >=dev-build/cmake-3.13.4 app-alternatives/ninja ) test? ( dev-debug/gdb ) verify-sig? ( sec-keys/openpgp-keys-rust ) mrustc-bootstrap? ( ~dev-lang/mrustc-0.11.2 dev-build/cmake sys-devel/gcc:* ) !mrustc-bootstrap? ( || ( dev-lang/rust-bin:1.74.1 dev-lang/rust:1.74.1 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
 DEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= dev-libs/openssl:0= system-llvm? ( llvm_targets_AArch64? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_AArch64] ) ) llvm_targets_AMDGPU? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_AMDGPU] ) ) llvm_targets_ARC? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_ARC] ) ) llvm_targets_ARM? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_ARM] ) ) llvm_targets_AVR? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_AVR] ) ) llvm_targets_BPF? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_BPF] ) ) llvm_targets_CSKY? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_CSKY] ) ) llvm_targets_DirectX? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_DirectX] ) ) llvm_targets_Hexagon? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_Hexagon] ) ) llvm_targets_Lanai? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_Lanai] ) ) llvm_targets_LoongArch? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_LoongArch] ) ) llvm_targets_M68k? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_M68k] ) ) llvm_targets_Mips? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_Mips] ) ) llvm_targets_MSP430? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_MSP430] ) ) llvm_targets_NVPTX? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_NVPTX] ) ) llvm_targets_PowerPC? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_PowerPC] ) ) llvm_targets_RISCV? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_RISCV] ) ) llvm_targets_Sparc? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_Sparc] ) ) llvm_targets_SPIRV? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_SPIRV] ) ) llvm_targets_SystemZ? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_SystemZ] ) ) llvm_targets_VE? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_VE] ) ) llvm_targets_WebAssembly? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_WebAssembly] ) ) llvm_targets_X86? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_X86] ) ) llvm_targets_XCore? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_XCore] ) ) llvm_targets_Xtensa? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_Xtensa] ) ) wasm? ( llvm_slot_17? ( llvm-core/lld:17 ) ) llvm_slot_17? ( llvm-core/llvm:17 ) llvm-libunwind? ( llvm-runtimes/libunwind:= ) ) !system-llvm? ( !llvm-libunwind? ( elibc_musl? ( sys-libs/libunwind:= ) ) )
 DESCRIPTION=Language empowering everyone to build reliable and efficient software
 EAPI=8
 HOMEPAGE=https://www.rust-lang.org/
-INHERIT=check-reqs estack flag-o-matic llvm-r1 multiprocessing multilib multilib-build optfeature python-any-r1 rust rust-toolchain toolchain-funcs verify-sig
-IUSE=big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind +lto miri nightly parallel-compiler rustfmt rust-analyzer rust-src system-llvm test wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARC llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_CSKY llvm_targets_DirectX llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_M68k llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SPIRV llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_Xtensa +llvm_slot_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 verify-sig
+INHERIT=check-reqs cmake edo estack flag-o-matic llvm-r1 multiprocessing multilib multilib-build optfeature python-any-r1 rust rust-toolchain toolchain-funcs verify-sig
+IUSE=big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind +lto miri mrustc-bootstrap nightly parallel-compiler rustfmt rust-analyzer rust-src system-llvm test wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARC llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_CSKY llvm_targets_DirectX llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_M68k llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SPIRV llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_Xtensa +llvm_slot_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 verify-sig
 KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86
 LICENSE=|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4
 RDEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= dev-libs/openssl:0= system-llvm? ( llvm_targets_AArch64? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_AArch64] ) ) llvm_targets_AMDGPU? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_AMDGPU] ) ) llvm_targets_ARC? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_ARC] ) ) llvm_targets_ARM? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_ARM] ) ) llvm_targets_AVR? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_AVR] ) ) llvm_targets_BPF? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_BPF] ) ) llvm_targets_CSKY? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_CSKY] ) ) llvm_targets_DirectX? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_DirectX] ) ) llvm_targets_Hexagon? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_Hexagon] ) ) llvm_targets_Lanai? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_Lanai] ) ) llvm_targets_LoongArch? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_LoongArch] ) ) llvm_targets_M68k? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_M68k] ) ) llvm_targets_Mips? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_Mips] ) ) llvm_targets_MSP430? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_MSP430] ) ) llvm_targets_NVPTX? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_NVPTX] ) ) llvm_targets_PowerPC? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_PowerPC] ) ) llvm_targets_RISCV? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_RISCV] ) ) llvm_targets_Sparc? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_Sparc] ) ) llvm_targets_SPIRV? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_SPIRV] ) ) llvm_targets_SystemZ? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_SystemZ] ) ) llvm_targets_VE? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_VE] ) ) llvm_targets_WebAssembly? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_WebAssembly] ) ) llvm_targets_X86? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_X86] ) ) llvm_targets_XCore? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_XCore] ) ) llvm_targets_Xtensa? ( llvm_slot_17? ( llvm-core/llvm:17[llvm_targets_Xtensa] ) ) wasm? ( llvm_slot_17? ( llvm-core/lld:17 ) ) llvm_slot_17? ( llvm-core/llvm:17 ) llvm-libunwind? ( llvm-runtimes/libunwind:= ) ) !system-llvm? ( !llvm-libunwind? ( elibc_musl? ( sys-libs/libunwind:= ) ) ) app-eselect/eselect-rust dev-lang/rust-common sys-apps/lsb-release !dev-lang/rust:stable !dev-lang/rust-bin:stable
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARC llvm
 RESTRICT=test
 SLOT=1.74.1
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.74.1-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.74.1-src.tar.xz.asc )
-_eclasses_=check-reqs	2a9731073c152554078a9a8df8fc0f1b	eapi9-pipestatus	d2c134036ac31c3085aebc9147f572bd	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	llvm-r1	0bd586d3786517cd63802a520b404dda	llvm-utils	7f49c40879f833f9d07e2d5a9643077b	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multilib-build	9ac26ea006828266d235e2f0135429b5	multiprocessing	1e32df7deee68372153dca65f4a7c21f	optfeature	538bce96e5589935b57e178e8635f301	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	python-any-r1	6ddb5e75c10db046f89ebe39c85e1d82	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	rust	44c8464f6266787f32aab8b1f056a28b	rust-toolchain	3f822985d9297438ed2443aa1fbdf33e	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	verify-sig	7433426b6b28bf2737ba4b82c8aa8c53
-_md5_=c64476854de7ba5ae5f20ba095b05018
+_eclasses_=check-reqs	2a9731073c152554078a9a8df8fc0f1b	cmake	10a50dfaf728b802fcfd37f8d0da9056	eapi9-pipestatus	d2c134036ac31c3085aebc9147f572bd	edo	367e103a74bf77e6a8da7894d999fa3c	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	llvm-r1	0bd586d3786517cd63802a520b404dda	llvm-utils	7f49c40879f833f9d07e2d5a9643077b	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multilib-build	9ac26ea006828266d235e2f0135429b5	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	538bce96e5589935b57e178e8635f301	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	python-any-r1	6ddb5e75c10db046f89ebe39c85e1d82	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	rust	44c8464f6266787f32aab8b1f056a28b	rust-toolchain	3f822985d9297438ed2443aa1fbdf33e	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	verify-sig	7433426b6b28bf2737ba4b82c8aa8c53	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
+_md5_=7786c2bdd87a135083b6e8bf022230d3
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.54.0 b/metadata/md5-cache/dev-lang/rust-bin-1.54.0
deleted file mode 100644
index f2323f273c2d..000000000000
--- a/metadata/md5-cache/dev-lang/rust-bin-1.54.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=prefix? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install postinst postrm pretend test unpack
-DESCRIPTION=Systems programming language from Mozilla
-EAPI=8
-HOMEPAGE=https://www.rust-lang.org/
-INHERIT=prefix rust-toolchain toolchain-funcs verify-sig multilib multilib-minimal
-IUSE=big-endian clippy cpu_flags_x86_sse2 doc prefix rustfmt verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
-RDEPEND=>=app-eselect/eselect-rust-20190311
-REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
-SLOT=1.54.0
-SRC_URI=abi_x86_32? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.54.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-i686-unknown-linux-gnu.tar.xz.asc ) ) ) abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.54.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.54.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.54.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.54.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) ppc? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.54.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ) ppc64? ( big-endian? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.54.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) ) ) !big-endian? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) ) ) riscv? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) ) s390? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.54.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) ) mips? ( abi_mips_o32? ( big-endian? ( https://static.rust-lang.org/dist/rust-1.54.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-mips-unknown-linux-gnu.tar.xz.asc ) ) !big-endian? ( https://static.rust-lang.org/dist/rust-1.54.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-mipsel-unknown-linux-gnu.tar.xz.asc ) ) ) abi_mips_n64? ( big-endian? ( https://static.rust-lang.org/dist/rust-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) !big-endian? ( https://static.rust-lang.org/dist/rust-1.54.0-mips64el-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc ) ) ) )
-_eclasses_=eapi9-pipestatus	d2c134036ac31c3085aebc9147f572bd	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multilib-build	9ac26ea006828266d235e2f0135429b5	multilib-minimal	e9f54d75b074edc47d36994bbc1e2123	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	prefix	c3c4c93ebda319c0fa7ed6f942ba1010	rust-toolchain	3f822985d9297438ed2443aa1fbdf33e	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	verify-sig	7433426b6b28bf2737ba4b82c8aa8c53
-_md5_=1d64cf6937854ac6a61c5f1c614fce28
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 611688c9df4c..07a96647f569 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/appstream-1.0.4 b/metadata/md5-cache/dev-libs/appstream-1.0.4
index f09807770c25..ae689b6537ee 100644
--- a/metadata/md5-cache/dev-libs/appstream-1.0.4
+++ b/metadata/md5-cache/dev-libs/appstream-1.0.4
@@ -5,7 +5,7 @@ DESCRIPTION=Cross-distro effort for providing metadata for software in the Linux
 EAPI=8
 HOMEPAGE=https://www.freedesktop.org/wiki/Distributions/AppStream/
 INHERIT=meson xdg-utils
-IUSE=apt doc +introspection qt6 systemd test
+IUSE=apt compose doc +introspection qt6 systemd test
 KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=app-arch/zstd:= >=dev-libs/glib-2.62:2 dev-libs/libxml2:2 >=dev-libs/libxmlb-0.3.14:= dev-libs/libyaml dev-libs/snowball-stemmer:= >=net-misc/curl-7.62 introspection? ( >=dev-libs/gobject-introspection-1.56:= ) qt6? ( dev-qt/qtbase:6 ) systemd? ( sys-apps/systemd:= )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/5
 SRC_URI=https://www.freedesktop.org/software/appstream/releases/AppStream-1.0.4.tar.xz
 _eclasses_=flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	meson	99466844dd8d4fcfb07578a76f5a9922	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
-_md5_=515aac62172e2b54342e2e52d1111a43
+_md5_=aec26ad95a68137e3b3456c2f3456b15
diff --git a/metadata/md5-cache/dev-libs/mimalloc-2.1.4 b/metadata/md5-cache/dev-libs/mimalloc-2.1.4
deleted file mode 100644
index 69a89ca3468c..000000000000
--- a/metadata/md5-cache/dev-libs/mimalloc-2.1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=valgrind? ( dev-debug/valgrind )
-DESCRIPTION=A compact general purpose allocator with excellent performance
-EAPI=8
-HOMEPAGE=https://github.com/microsoft/mimalloc
-INHERIT=cmake-multilib flag-o-matic
-IUSE=hardened test valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/microsoft/mimalloc/archive/refs/tags/v2.1.4.tar.gz -> mimalloc-2.1.4.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multilib-build	9ac26ea006828266d235e2f0135429b5	multilib-minimal	e9f54d75b074edc47d36994bbc1e2123	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
-_md5_=b55565a5cbc960ab6b352e55cb7c517d
diff --git a/metadata/md5-cache/dev-libs/mimalloc-2.1.6 b/metadata/md5-cache/dev-libs/mimalloc-2.1.6
deleted file mode 100644
index 067c8cf5ff2a..000000000000
--- a/metadata/md5-cache/dev-libs/mimalloc-2.1.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=valgrind? ( dev-debug/valgrind )
-DESCRIPTION=A compact general purpose allocator with excellent performance
-EAPI=8
-HOMEPAGE=https://github.com/microsoft/mimalloc
-INHERIT=cmake-multilib flag-o-matic
-IUSE=hardened test valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/microsoft/mimalloc/archive/refs/tags/v2.1.6.tar.gz -> mimalloc-2.1.6.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multilib-build	9ac26ea006828266d235e2f0135429b5	multilib-minimal	e9f54d75b074edc47d36994bbc1e2123	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
-_md5_=3862bb1ca9d89b496faeb4bd9d002308
diff --git a/metadata/md5-cache/dev-libs/mimalloc-2.1.2 b/metadata/md5-cache/dev-libs/mimalloc-2.1.9
index 7b01b54032ed..d2290be91b9d 100644
--- a/metadata/md5-cache/dev-libs/mimalloc-2.1.2
+++ b/metadata/md5-cache/dev-libs/mimalloc-2.1.9
@@ -4,12 +4,12 @@ DEPEND=valgrind? ( dev-debug/valgrind )
 DESCRIPTION=A compact general purpose allocator with excellent performance
 EAPI=8
 HOMEPAGE=https://github.com/microsoft/mimalloc
-INHERIT=cmake-multilib flag-o-matic
-IUSE=hardened test valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86
+INHERIT=cmake-multilib
+IUSE=debug hardened test valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/2
-SRC_URI=https://github.com/microsoft/mimalloc/archive/refs/tags/v2.1.2.tar.gz -> mimalloc-2.1.2.tar.gz
+SRC_URI=https://github.com/microsoft/mimalloc/archive/refs/tags/v2.1.9.tar.gz -> mimalloc-2.1.9.tar.gz
 _eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multilib-build	9ac26ea006828266d235e2f0135429b5	multilib-minimal	e9f54d75b074edc47d36994bbc1e2123	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
-_md5_=4d5f93be7232507b81d3fcae3cd46d2a
+_md5_=bf43e3ce44cfe0c66679150ae302c014
diff --git a/metadata/md5-cache/dev-libs/mxml-4.0.4 b/metadata/md5-cache/dev-libs/mxml-4.0.4
new file mode 100644
index 000000000000..476a02b459d0
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/mxml-4.0.4
@@ -0,0 +1,14 @@
+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=compile configure install prepare test
+DESCRIPTION=A small XML parsing library that you can use to read XML data files or strings
+EAPI=8
+HOMEPAGE=https://github.com/michaelrsweet/mxml https://www.msweet.org/mxml/
+INHERIT=autotools toolchain-funcs
+IUSE=static-libs test threads
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Mini-XML
+RESTRICT=!test? ( test )
+SLOT=4
+SRC_URI=https://github.com/michaelrsweet/mxml/archive/v4.0.4.tar.gz -> mxml-4.0.4.tar.gz
+_eclasses_=autotools	7d91cc798a8afd8f4e0c6e9587296ebe	gnuconfig	ddeb9f8caff1b5f71a09c75b7534df79	libtool	6b28392a775f807c8be5fc7ec9a605b9	multilib	b2a329026f2e404e9e371097dda47f96	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=b2ca407b0e0a5b25b8ed5e3a6c9feb2b
diff --git a/metadata/md5-cache/dev-libs/zix-0.6.2 b/metadata/md5-cache/dev-libs/zix-0.6.2
new file mode 100644
index 000000000000..7a1826898822
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/zix-0.6.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig doc? ( app-text/doxygen dev-python/sphinx dev-python/sphinx-lv2-theme dev-python/sphinxygen ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Lightweight C library of portability wrappers and data structures
+EAPI=8
+HOMEPAGE=https://gitlab.com/drobilla/zix
+INHERIT=meson-multilib
+IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=ISC
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.drobilla.net/zix-0.6.2.tar.xz
+_eclasses_=flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	meson	99466844dd8d4fcfb07578a76f5a9922	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multilib-build	9ac26ea006828266d235e2f0135429b5	multilib-minimal	e9f54d75b074edc47d36994bbc1e2123	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=bbd0f60faec2da7ce1136598f50a6eef
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index dc6fac9b489c..a20d5a124c5f 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/pecl-ssh2-1.4.1 b/metadata/md5-cache/dev-php/pecl-ssh2-1.4.1
index 8660398e635a..4800542ce3d6 100644
--- a/metadata/md5-cache/dev-php/pecl-ssh2-1.4.1
+++ b/metadata/md5-cache/dev-php/pecl-ssh2-1.4.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://pecl.php.net/package/ssh2
 INHERIT=php-ext-pecl-r3
 IUSE=php_targets_php8-2 php_targets_php8-3
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=PHP-3.01
 RDEPEND=>=net-libs/libssh2-1.2[-gcrypt] php_targets_php8-2? ( dev-lang/php:8.2 ) php_targets_php8-3? ( dev-lang/php:8.3 )
 REQUIRED_USE=|| ( php_targets_php8-2 php_targets_php8-3 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/ssh2-1.4.1.tgz
 _eclasses_=autotools	7d91cc798a8afd8f4e0c6e9587296ebe	gnuconfig	ddeb9f8caff1b5f71a09c75b7534df79	libtool	6b28392a775f807c8be5fc7ec9a605b9	multilib	b2a329026f2e404e9e371097dda47f96	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	57493651a3540d6ef7bff5e1c97c8dd3	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=b0901694934093e51673a3a63f7ecf62
+_md5_=28d6cd595dc01b3b9bc3fd412fce4e25
diff --git a/metadata/md5-cache/dev-php/pecl-yaz-1.2.4-r1 b/metadata/md5-cache/dev-php/pecl-yaz-1.2.4-r1
index 1d5968cb99c4..c34924c0a0ad 100644
--- a/metadata/md5-cache/dev-php/pecl-yaz-1.2.4-r1
+++ b/metadata/md5-cache/dev-php/pecl-yaz-1.2.4-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pecl.php.net/yaz
 INHERIT=php-ext-pecl-r3
 IUSE=php_targets_php8-2 php_targets_php8-3
-KEYWORDS=~amd64 arm ~hppa ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm ~hppa ~ppc64 ~s390 ~sparc x86
 LICENSE=BSD
 PROPERTIES=test_network
 RDEPEND=>=dev-libs/yaz-3.0.2:0= php_targets_php8-2? ( dev-lang/php:8.2 ) php_targets_php8-3? ( dev-lang/php:8.3 )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://pecl.php.net/get/yaz-1.2.4.tgz
 _eclasses_=autotools	7d91cc798a8afd8f4e0c6e9587296ebe	gnuconfig	ddeb9f8caff1b5f71a09c75b7534df79	libtool	6b28392a775f807c8be5fc7ec9a605b9	multilib	b2a329026f2e404e9e371097dda47f96	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0	php-ext-source-r3	57493651a3540d6ef7bff5e1c97c8dd3	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=31e958e3c9af1a0e1dc8121205e210d8
+_md5_=6d120e5278b8b0b19a571b7287f19409
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 054f4a29c21a..e94c59dabcc8 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/aiopylgtv-0.4.1-r1 b/metadata/md5-cache/dev-python/aiopylgtv-0.4.1-r1
index 0f7d1ce4a5e1..99d1e577efb7 100644
--- a/metadata/md5-cache/dev-python/aiopylgtv-0.4.1-r1
+++ b/metadata/md5-cache/dev-python/aiopylgtv-0.4.1-r1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10[ssl] ) python_targets_python3_11? ( dev-lang/python:3.11[ssl] ) python_targets_python3_12? ( dev-lang/python:3.12[ssl] ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10[ssl] ) python_targets_python3_11? ( dev-lang/python:3.11[ssl] ) python_targets_python3_12? ( dev-lang/python:3.12[ssl] ) python_targets_python3_13? ( dev-lang/python:3.13[ssl] ) >=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 library to control webOS-based LG TV devices
 EAPI=8
 HOMEPAGE=https://github.com/bendavid/aiopylgtv
 INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
 KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=MIT
-RDEPEND=>=dev-python/numpy-1.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sqlitedict[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/websockets-8.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10[ssl] ) python_targets_python3_11? ( dev-lang/python:3.11[ssl] ) python_targets_python3_12? ( dev-lang/python:3.12[ssl] )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RDEPEND=>=dev-python/numpy-1.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/sqlitedict[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/websockets-8.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_10? ( dev-lang/python:3.10[ssl] ) python_targets_python3_11? ( dev-lang/python:3.11[ssl] ) python_targets_python3_12? ( dev-lang/python:3.12[ssl] ) python_targets_python3_13? ( dev-lang/python:3.13[ssl] )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/a/aiopylgtv/aiopylgtv-0.4.1.tar.gz
 _eclasses_=distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	pypi	ad1b21f87d117ae9bb089bdb65b8f013	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=be9928fb37d27bd064f8d687e2aa3847
+_md5_=ccf7e825b284b1d8ebc062f29d1f09ac
diff --git a/metadata/md5-cache/dev-python/aioresponses-0.7.8 b/metadata/md5-cache/dev-python/aioresponses-0.7.8
new file mode 100644
index 000000000000..1f7a7d7e4bcd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aioresponses-0.7.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/pbr[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] test? ( dev-python/ddt[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) doc? ( || ( ( dev-lang/python:3.13 >=dev-python/sphinx-7.2.6[python_targets_python3_13(-)] ) ( dev-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(-)] ) ) ) test? ( >=dev-python/aiohttp-3.3.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=Helper to mock/fake web requests in Python's aiohttp package
+EAPI=8
+HOMEPAGE=https://github.com/pnuckowski/aioresponses/ https://pypi.org/project/aioresponses/
+INHERIT=distutils-r1 pypi
+IUSE=doc test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/aiohttp-3.3.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/a/aioresponses/aioresponses-0.7.8.tar.gz
+_eclasses_=distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	pypi	ad1b21f87d117ae9bb089bdb65b8f013	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=90e84f71f1d00792f6380ff01a77a46e
diff --git a/metadata/md5-cache/dev-python/alembic-1.14.1 b/metadata/md5-cache/dev-python/alembic-1.14.1
new file mode 100644
index 000000000000..8c93f96ccefe
--- /dev/null
+++ b/metadata/md5-cache/dev-python/alembic-1.14.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( sys-libs/timezone-data ) test? ( >=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/typing-extensions-4[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-lang/pypy-3.10:=[symlink] ) 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=Database migrations tool, written by the author of SQLAlchemy
+EAPI=8
+HOMEPAGE=https://github.com/sqlalchemy/alembic/ https://pypi.org/project/alembic/
+INHERIT=distutils-r1 pypi
+IUSE=doc test python_targets_pypy3 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/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/typing-extensions-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( >=dev-lang/pypy-3.10:=[symlink] ) 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/a/alembic/alembic-1.14.1.tar.gz
+_eclasses_=distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	pypi	ad1b21f87d117ae9bb089bdb65b8f013	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=fff04f552e1b8fdc6430993402cda555
diff --git a/metadata/md5-cache/dev-python/asteval-1.0.6 b/metadata/md5-cache/dev-python/asteval-1.0.6
new file mode 100644
index 000000000000..e36ed72638b9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/asteval-1.0.6
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools-scm[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
+DESCRIPTION=Evaluator of Python expression using ast module
+EAPI=8
+HOMEPAGE=https://lmfit.github.io/asteval/ https://github.com/lmfit/asteval/ https://pypi.org/project/asteval/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64
+LICENSE=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://github.com/lmfit/asteval/archive/1.0.6.tar.gz -> asteval-1.0.6.gh.tar.gz
+_eclasses_=distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=20a9fb9bf659ff3608c2cad8c6481fe5
diff --git a/metadata/md5-cache/dev-python/fpylll-0.6.3 b/metadata/md5-cache/dev-python/fpylll-0.6.3
new file mode 100644
index 000000000000..5babfa10fa51
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fpylll-0.6.3
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-python/cython-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] test? ( dev-python/cysignals[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=sci-libs/fplll-5.5.0 >=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=dev-python/cysignals[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=sci-libs/fplll-5.5.0 python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+DESCRIPTION=Python bindings for sci-libs/fplll
+EAPI=8
+HOMEPAGE=https://github.com/fplll/fpylll/ https://pypi.org/project/fpylll/
+INHERIT=distutils-r1 pypi
+IUSE=test test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
+KEYWORDS=~amd64 ~riscv
+LICENSE=GPL-2+
+RDEPEND=dev-python/cysignals[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=sci-libs/fplll-5.5.0 python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) 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/f/fpylll/fpylll-0.6.3.tar.gz
+_eclasses_=distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	pypi	ad1b21f87d117ae9bb089bdb65b8f013	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=1be25aabb30791151c27c0e72c5f6874
diff --git a/metadata/md5-cache/dev-python/imageio-2.36.0 b/metadata/md5-cache/dev-python/imageio-2.37.0
index dc499c148956..df23c1579082 100644
--- a/metadata/md5-cache/dev-python/imageio-2.36.0
+++ b/metadata/md5-cache/dev-python/imageio-2.37.0
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/numpy-1.20.0[python_targets_python3_10(-)?,python_targets_p
 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/imageio/imageio/archive/v2.36.0.tar.gz -> imageio-2.36.0.gh.tar.gz test? ( https://github.com/imageio/test_images/archive/1121036015c70cdbb3015e5c5ba0aaaf7d3d6021.tar.gz -> imageio-test_images-1121036015c70cdbb3015e5c5ba0aaaf7d3d6021.gh.tar.gz )
+SRC_URI=https://github.com/imageio/imageio/archive/v2.37.0.tar.gz -> imageio-2.37.0.gh.tar.gz test? ( https://github.com/imageio/test_images/archive/1121036015c70cdbb3015e5c5ba0aaaf7d3d6021.tar.gz -> imageio-test_images-1121036015c70cdbb3015e5c5ba0aaaf7d3d6021.gh.tar.gz )
 _eclasses_=distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=66b1231872a8dbaef25167bff6f44f1e
+_md5_=0227f0ccf62e5200651df8f579d8c043
diff --git a/metadata/md5-cache/dev-python/moto-5.0.27 b/metadata/md5-cache/dev-python/moto-5.0.27
new file mode 100644
index 000000000000..135f00e8eca8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/moto-5.0.27
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/antlr4-python3-runtime[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-rerunfailures[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/aws-xray-sdk-0.93[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/boto3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/botocore-1.14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/cfn-lint-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/cryptography-35.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/cookies[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/docker-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/flask[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/flask-cors[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/idna-2.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jinja2-2.10.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/jsonpath-ng[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/more-itertools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pyparsing-3.0.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/openapi-spec-validator-0.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/python-jose[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/responses-0.25.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/sshpubkeys[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/typing-extensions[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/xmltodict[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/werkzeug[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/zipp[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-timeout[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
+DESCRIPTION=Mock library for boto
+EAPI=8
+HOMEPAGE=https://github.com/getmoto/moto/ https://pypi.org/project/moto/
+INHERIT=distutils-r1 pypi toolchain-funcs
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/aws-xray-sdk-0.93[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/boto3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/botocore-1.14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/cfn-lint-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/cryptography-35.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/cookies[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/docker-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/flask[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/flask-cors[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/idna-2.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jinja2-2.10.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/jsonpath-ng[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/more-itertools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pyparsing-3.0.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/openapi-spec-validator-0.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/python-jose[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/responses-0.25.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/sshpubkeys[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/typing-extensions[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/xmltodict[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/werkzeug[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/zipp[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/m/moto/moto-5.0.27.tar.gz
+_eclasses_=distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	pypi	ad1b21f87d117ae9bb089bdb65b8f013	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=c5c1308a7d5f58bf64ea15e6756bb040
diff --git a/metadata/md5-cache/dev-python/pyopengl-3.1.9 b/metadata/md5-cache/dev-python/pyopengl-3.1.9
new file mode 100644
index 000000000000..5b6ccdc67750
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyopengl-3.1.9
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/numpy[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pygame[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?,opengl,X] dev-python/python-xlib[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !prefix? ( media-libs/mesa[llvm] x11-base/xorg-server[-minimal,xorg] ) ) test? ( media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? ( dev-tcltk/togl ) >=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-lang/pypy-3.10:=[symlink,tk?] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?] ) python_targets_python3_11? ( dev-lang/python:3.11[tk?] ) python_targets_python3_12? ( dev-lang/python:3.12[tk?] ) python_targets_python3_13? ( dev-lang/python:3.13[tk?] ) >=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(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? ( dev-tcltk/togl )
+DESCRIPTION=Python OpenGL bindings
+EAPI=8
+HOMEPAGE=https://pyopengl.sourceforge.net/ https://github.com/mcfletch/pyopengl/ https://pypi.org/project/PyOpenGL/
+INHERIT=distutils-r1 pypi virtualx
+IUSE=tk test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? ( dev-tcltk/togl ) python_targets_pypy3? ( >=dev-lang/pypy-3.10:=[symlink,tk?] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?] ) python_targets_python3_11? ( dev-lang/python:3.11[tk?] ) python_targets_python3_12? ( dev-lang/python:3.12[tk?] ) python_targets_python3_13? ( dev-lang/python:3.13[tk?] )
+REQUIRED_USE=|| ( python_targets_pypy3 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://files.pythonhosted.org/packages/source/P/PyOpenGL/pyopengl-3.1.9.tar.gz
+_eclasses_=distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	pypi	ad1b21f87d117ae9bb089bdb65b8f013	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	virtualx	9741d451eb64ea8bb9faee90d68a9b68
+_md5_=c4e21114238b454e4e22b0949f25e3e8
diff --git a/metadata/md5-cache/dev-python/pyopengl-accelerate-3.1.9 b/metadata/md5-cache/dev-python/pyopengl-accelerate-3.1.9
new file mode 100644
index 000000000000..057335e813c5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyopengl-accelerate-3.1.9
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] test? ( numpy? ( dev-python/numpy:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) dev-python/pyopengl[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
+DEPEND=numpy? ( dev-python/numpy:=[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 )
+DESCRIPTION=Accelerate module for PyOpenGL
+EAPI=8
+HOMEPAGE=https://pyopengl.sourceforge.net/ https://github.com/mcfletch/pyopengl/ https://pypi.org/project/PyOpenGL-accelerate/
+INHERIT=distutils-r1 pypi
+IUSE=numpy test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=numpy? ( dev-python/numpy:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) dev-python/pyopengl[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/p/pyopengl-accelerate/pyopengl_accelerate-3.1.9.tar.gz
+_eclasses_=distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	pypi	ad1b21f87d117ae9bb089bdb65b8f013	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=50be0d1cbebc75a4eaa9193d46b764ad
diff --git a/metadata/md5-cache/dev-python/python-xlib-0.33 b/metadata/md5-cache/dev-python/python-xlib-0.33
index 9dd6566036c8..12fa48715979 100644
--- a/metadata/md5-cache/dev-python/python-xlib-0.33
+++ b/metadata/md5-cache/dev-python/python-xlib-0.33
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] doc? ( sys-apps/texinfo ) test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( dev-python/six[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(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/setuptools-scm[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] doc? ( sys-apps/texinfo ) test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-lang/pypy-3.10:=[symlink] ) 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(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A fully functional X client library for Python, written in Python
 EAPI=8
 HOMEPAGE=https://github.com/python-xlib/python-xlib/ https://pypi.org/project/python-xlib/
 INHERIT=distutils-r1 virtualx
-IUSE=doc test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 test
+IUSE=doc test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 test
 KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=LGPL-2+
-RDEPEND=dev-python/six[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 )
+RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( >=dev-lang/pypy-3.10:=[symlink] ) 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 ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-xlib/python-xlib/releases/download/0.33/python-xlib-0.33.tar.bz2
 _eclasses_=distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	virtualx	9741d451eb64ea8bb9faee90d68a9b68
-_md5_=c04ab8581e4e977b12da5864d32f982c
+_md5_=37c0edb2917cfebb4c057758aa1d46ed
diff --git a/metadata/md5-cache/dev-python/pyxattr-0.8.1 b/metadata/md5-cache/dev-python/pyxattr-0.8.1
index 55d529ea697e..287df1c3bb08 100644
--- a/metadata/md5-cache/dev-python/pyxattr-0.8.1
+++ b/metadata/md5-cache/dev-python/pyxattr-0.8.1
@@ -1,17 +1,17 @@
-BDEPEND=test? ( sys-apps/attr:= >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] dev-python/recommonmark[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] dev-python/recommonmark[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] dev-python/recommonmark[python_targets_python3_10(-)] ) ( >=dev-lang/pypy-3.10[symlink] >=dev-python/sphinx-7.2.6[python_targets_pypy3(-)] dev-python/recommonmark[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-lang/pypy-3.10:=[symlink] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=test? ( sys-apps/attr:= >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_13t(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) doc? ( || ( ( dev-lang/python:3.13 >=dev-python/sphinx-7.2.6[python_targets_python3_13(-)] dev-python/recommonmark[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] dev-python/recommonmark[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] dev-python/recommonmark[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] dev-python/recommonmark[python_targets_python3_10(-)] ) ( dev-lang/python:3.13t >=dev-python/sphinx-7.2.6[python_targets_python3_13t(-)] dev-python/recommonmark[python_targets_python3_13t(-)] ) ( >=dev-lang/pypy-3.10[symlink] >=dev-python/sphinx-7.2.6[python_targets_pypy3(-)] dev-python/recommonmark[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-lang/pypy-3.10:=[symlink] ) python_targets_python3_13t? ( dev-lang/python:3.13t ) 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_13t(-)?,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_13t(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-apps/attr:= python_targets_pypy3? ( >=dev-lang/pypy-3.10:=[symlink] ) 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 )
+DEPEND=sys-apps/attr:= python_targets_pypy3? ( >=dev-lang/pypy-3.10:=[symlink] ) python_targets_python3_13t? ( dev-lang/python:3.13t ) 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 interface to xattr
 EAPI=8
 HOMEPAGE=https://pyxattr.k1024.org/ https://github.com/iustin/pyxattr/ https://pypi.org/project/pyxattr/
 INHERIT=distutils-r1 pypi
-IUSE=test doc python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+IUSE=test doc python_targets_pypy3 python_targets_python3_13t python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
-RDEPEND=sys-apps/attr:= python_targets_pypy3? ( >=dev-lang/pypy-3.10:=[symlink] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RDEPEND=sys-apps/attr:= python_targets_pypy3? ( >=dev-lang/pypy-3.10:=[symlink] ) python_targets_python3_13t? ( dev-lang/python:3.13t ) 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_13t 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/pyxattr/pyxattr-0.8.1.tar.gz
 _eclasses_=distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	pypi	ad1b21f87d117ae9bb089bdb65b8f013	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=336fbf4cddb77b1b43ef2b520181761b
+_md5_=68e15d5f122b41c8ea6e42863931abee
diff --git a/metadata/md5-cache/dev-python/qscintilla-2.14.1-r2 b/metadata/md5-cache/dev-python/qscintilla-2.14.1-r2
index b6c2cd2cfcec..623a01c4828f 100644
--- a/metadata/md5-cache/dev-python/qscintilla-2.14.1-r2
+++ b/metadata/md5-cache/dev-python/qscintilla-2.14.1-r2
@@ -1,17 +1,17 @@
-BDEPEND=>=dev-python/pyqt-builder-1.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sip-6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] qt5? ( dev-qt/qtcore:5 ) qt6? ( dev-qt/qtbase:6 )
+BDEPEND=>=dev-python/pyqt-builder-1.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sip-6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] qt5? ( dev-qt/qtcore:5 ) qt6? ( dev-qt/qtbase:6 )
 DEFINED_PHASES=compile configure install setup
-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 ) qt5? ( >=dev-python/pyqt5-5.15.5[gui,printsupport,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) qt6? ( dev-python/pyqt6[gui,printsupport,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-qt/qtbase:6[gui,widgets] ) ~x11-libs/qscintilla-2.14.1:=[qt5(+)?,qt6(-)?]
+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 ) qt5? ( >=dev-python/pyqt5-5.15.5[gui,printsupport,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) qt6? ( dev-python/pyqt6[gui,printsupport,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-qt/qtbase:6[gui,widgets] ) ~x11-libs/qscintilla-2.14.1:=[qt5(+)?,qt6(-)?]
 DESCRIPTION=Python bindings for QScintilla
 EAPI=8
 HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/ https://pypi.org/project/QScintilla/
 INHERIT=multibuild python-r1 qmake-utils out-of-source-utils
-IUSE=debug +qt5 qt6 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+IUSE=debug +qt5 qt6 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
 KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-3
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) qt5? ( >=dev-python/pyqt5-5.15.5[gui,printsupport,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) qt6? ( dev-python/pyqt6[gui,printsupport,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-qt/qtbase:6[gui,widgets] ) ~x11-libs/qscintilla-2.14.1:=[qt5(+)?,qt6(-)?] qt5? ( >=dev-python/pyqt5-sip-12.9:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) qt6? ( >=dev-python/pyqt6-sip-13.5:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] )
-REQUIRED_USE=|| ( qt5 qt6 ) || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+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 ) qt5? ( >=dev-python/pyqt5-5.15.5[gui,printsupport,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) qt6? ( dev-python/pyqt6[gui,printsupport,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-qt/qtbase:6[gui,widgets] ) ~x11-libs/qscintilla-2.14.1:=[qt5(+)?,qt6(-)?] qt5? ( >=dev-python/pyqt5-sip-12.9:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) qt6? ( >=dev-python/pyqt6-sip-13.5:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] )
+REQUIRED_USE=|| ( qt5 qt6 ) || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.14.1/QScintilla_src-2.14.1.tar.gz
 _eclasses_=multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=d7c4240b15f6d858469083e62eaae031
+_md5_=43ed9f52d24560e09eb7ff038f206d32
diff --git a/metadata/md5-cache/dev-python/websockets-13.0.1 b/metadata/md5-cache/dev-python/websockets-13.0.1
deleted file mode 100644
index 1b169a2ef945..000000000000
--- a/metadata/md5-cache/dev-python/websockets-13.0.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-rerunfailures[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-lang/pypy-3.10:=[symlink] ) 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
-DEPEND=python_targets_pypy3? ( >=dev-lang/pypy-3.10:=[symlink] ) 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=Library for building WebSocket servers and clients in Python
-EAPI=8
-HOMEPAGE=https://websockets.readthedocs.io/ https://github.com/python-websockets/websockets/ https://pypi.org/project/websockets/
-INHERIT=distutils-r1
-IUSE=+native-extensions test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-lang/pypy-3.10:=[symlink] ) 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/python-websockets/websockets/archive/13.0.1.tar.gz -> websockets-13.0.1.gh.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-python/websockets/websockets-11.0.3-python3.12.patch.xz
-_eclasses_=distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=bf090d85570d9cd796c20a3c509566d7
diff --git a/metadata/md5-cache/dev-python/websockets-13.1 b/metadata/md5-cache/dev-python/websockets-13.1
deleted file mode 100644
index 2643e1d7ee1c..000000000000
--- a/metadata/md5-cache/dev-python/websockets-13.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-rerunfailures[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-lang/pypy-3.10:=[symlink] ) 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
-DEPEND=python_targets_pypy3? ( >=dev-lang/pypy-3.10:=[symlink] ) 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=Library for building WebSocket servers and clients in Python
-EAPI=8
-HOMEPAGE=https://websockets.readthedocs.io/ https://github.com/python-websockets/websockets/ https://pypi.org/project/websockets/
-INHERIT=distutils-r1
-IUSE=+native-extensions test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-lang/pypy-3.10:=[symlink] ) 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/python-websockets/websockets/archive/13.1.tar.gz -> websockets-13.1.gh.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-python/websockets/websockets-11.0.3-python3.12.patch.xz
-_eclasses_=distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=4da48610f1a92b76cc4dae5045feffa8
diff --git a/metadata/md5-cache/dev-python/websockets-14.0 b/metadata/md5-cache/dev-python/websockets-14.2
index c44e476a6a2c..9b7bedd78875 100644
--- a/metadata/md5-cache/dev-python/websockets-14.0
+++ b/metadata/md5-cache/dev-python/websockets-14.2
@@ -12,6 +12,6 @@ RDEPEND=python_targets_pypy3? ( >=dev-lang/pypy-3.10:=[symlink] ) python_targets
 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/python-websockets/websockets/archive/14.0.tar.gz -> websockets-14.0.gh.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-python/websockets/websockets-11.0.3-python3.12.patch.xz
+SRC_URI=https://github.com/python-websockets/websockets/archive/14.2.tar.gz -> websockets-14.2.gh.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-python/websockets/websockets-11.0.3-python3.12.patch.xz
 _eclasses_=distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=36c5f2e634aff665e5fcfad810d99129
+_md5_=8ead1cdb2c61b77e8be938c7d977d2ff
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 5f0b0f8b5396..4d05fe55a55b 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/arel-helpers-2.14.0-r1 b/metadata/md5-cache/dev-ruby/arel-helpers-2.14.0-r1
deleted file mode 100644
index 1135d72dd6e3..000000000000
--- a/metadata/md5-cache/dev-ruby/arel-helpers-2.14.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby31? ( || ( dev-ruby/activerecord:7.0[ruby_targets_ruby31(-)] dev-ruby/activerecord:6.1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( || ( dev-ruby/activerecord:7.0[ruby_targets_ruby32(-)] dev-ruby/activerecord:6.1[ruby_targets_ruby32(-)] ) ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rr[ruby_targets_ruby31(-)] dev-ruby/activerecord[ruby_targets_ruby31(-),sqlite] dev-ruby/bundler[ruby_targets_ruby31(-)] dev-ruby/combustion[ruby_targets_ruby31(-)] >=dev-ruby/database_cleaner-1.8[ruby_targets_ruby31(-)] >=dev-ruby/sqlite3-1.4[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rr[ruby_targets_ruby32(-)] dev-ruby/activerecord[ruby_targets_ruby32(-),sqlite] dev-ruby/bundler[ruby_targets_ruby32(-)] dev-ruby/combustion[ruby_targets_ruby32(-)] >=dev-ruby/database_cleaner-1.8[ruby_targets_ruby32(-)] >=dev-ruby/sqlite3-1.4[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=Tools to help construct database queries
-EAPI=8
-HOMEPAGE=https://github.com/camertron/arel-helpers
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby31? ( || ( dev-ruby/activerecord:7.0[ruby_targets_ruby31(-)] dev-ruby/activerecord:6.1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( || ( dev-ruby/activerecord:7.0[ruby_targets_ruby32(-)] dev-ruby/activerecord:6.1[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/camertron/arel-helpers/archive/refs/tags/v2.14.0.tar.gz -> arel-helpers-2.14.0.tar.gz
-_eclasses_=flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	ruby-fakegem	92ad9217e94825cb9c8ad831b513a7ec	ruby-ng	f0dedda0b5f19492ca5de91d98bc1708	ruby-utils	a5d18cde09a96648a4d316ada2786cdb	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=81f40266492cecb834f3ed3ee4d63c7d
diff --git a/metadata/md5-cache/dev-ruby/arel-helpers-2.16.0 b/metadata/md5-cache/dev-ruby/arel-helpers-2.16.0
new file mode 100644
index 000000000000..f23d6ef0bf9e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/arel-helpers-2.16.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby31? ( || ( dev-ruby/activerecord:8.0[ruby_targets_ruby31(-)] dev-ruby/activerecord:7.2[ruby_targets_ruby31(-)] dev-ruby/activerecord:7.1[ruby_targets_ruby31(-)] dev-ruby/activerecord:7.0[ruby_targets_ruby31(-)] dev-ruby/activerecord:6.1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( || ( dev-ruby/activerecord:8.0[ruby_targets_ruby32(-)] dev-ruby/activerecord:7.2[ruby_targets_ruby32(-)] dev-ruby/activerecord:7.1[ruby_targets_ruby32(-)] dev-ruby/activerecord:7.0[ruby_targets_ruby32(-)] dev-ruby/activerecord:6.1[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( || ( dev-ruby/activerecord:8.0[ruby_targets_ruby33(-)] dev-ruby/activerecord:7.2[ruby_targets_ruby33(-)] dev-ruby/activerecord:7.1[ruby_targets_ruby33(-)] dev-ruby/activerecord:7.0[ruby_targets_ruby33(-)] dev-ruby/activerecord:6.1[ruby_targets_ruby33(-)] ) ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rr[ruby_targets_ruby31(-)] dev-ruby/activerecord[ruby_targets_ruby31(-),sqlite] dev-ruby/bundler[ruby_targets_ruby31(-)] >=dev-ruby/combustion-1.3[ruby_targets_ruby31(-)] >=dev-ruby/database_cleaner-2.0[ruby_targets_ruby31(-)] >=dev-ruby/sqlite3-1.4[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rr[ruby_targets_ruby32(-)] dev-ruby/activerecord[ruby_targets_ruby32(-),sqlite] dev-ruby/bundler[ruby_targets_ruby32(-)] >=dev-ruby/combustion-1.3[ruby_targets_ruby32(-)] >=dev-ruby/database_cleaner-2.0[ruby_targets_ruby32(-)] >=dev-ruby/sqlite3-1.4[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rr[ruby_targets_ruby33(-)] dev-ruby/activerecord[ruby_targets_ruby33(-),sqlite] dev-ruby/bundler[ruby_targets_ruby33(-)] >=dev-ruby/combustion-1.3[ruby_targets_ruby33(-)] >=dev-ruby/database_cleaner-2.0[ruby_targets_ruby33(-)] >=dev-ruby/sqlite3-1.4[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=Tools to help construct database queries
+EAPI=8
+HOMEPAGE=https://github.com/camertron/arel-helpers
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
+KEYWORDS=~amd64 ~arm
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby31? ( || ( dev-ruby/activerecord:8.0[ruby_targets_ruby31(-)] dev-ruby/activerecord:7.2[ruby_targets_ruby31(-)] dev-ruby/activerecord:7.1[ruby_targets_ruby31(-)] dev-ruby/activerecord:7.0[ruby_targets_ruby31(-)] dev-ruby/activerecord:6.1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( || ( dev-ruby/activerecord:8.0[ruby_targets_ruby32(-)] dev-ruby/activerecord:7.2[ruby_targets_ruby32(-)] dev-ruby/activerecord:7.1[ruby_targets_ruby32(-)] dev-ruby/activerecord:7.0[ruby_targets_ruby32(-)] dev-ruby/activerecord:6.1[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( || ( dev-ruby/activerecord:8.0[ruby_targets_ruby33(-)] dev-ruby/activerecord:7.2[ruby_targets_ruby33(-)] dev-ruby/activerecord:7.1[ruby_targets_ruby33(-)] dev-ruby/activerecord:7.0[ruby_targets_ruby33(-)] dev-ruby/activerecord: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 ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/camertron/arel-helpers/archive/refs/tags/v2.16.0.tar.gz -> arel-helpers-2.16.0.tar.gz
+_eclasses_=flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	ruby-fakegem	92ad9217e94825cb9c8ad831b513a7ec	ruby-ng	f0dedda0b5f19492ca5de91d98bc1708	ruby-utils	a5d18cde09a96648a4d316ada2786cdb	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=dab3d72bdad45810e51e024f75d0d7e3
diff --git a/metadata/md5-cache/dev-ruby/metasm-1.0.5-r2 b/metadata/md5-cache/dev-ruby/metasm-1.0.5-r2
new file mode 100644
index 000000000000..556b81488c40
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/metasm-1.0.5-r2
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby34? ( dev-lang/ruby:3.4 ) 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_ruby34? ( test? ( dev-ruby/rake[ruby_targets_ruby34(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) ruby_targets_ruby34? ( virtual/rubygems[ruby_targets_ruby34(-)] ) 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(-)] ) ruby_targets_ruby34? ( virtual/rubygems[ruby_targets_ruby34(-)] ) )
+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_ruby34? ( dev-lang/ruby:3.4 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) ruby_targets_ruby34? ( virtual/rubygems[ruby_targets_ruby34(-)] )
+DESCRIPTION=Cross-architecture assembler, disassembler, linker, and debugger
+EAPI=8
+HOMEPAGE=https://metasm.cr0.org/
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 ruby_targets_ruby34 test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby34? ( dev-lang/ruby:3.4 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) ruby_targets_ruby34? ( virtual/rubygems[ruby_targets_ruby34(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 ruby_targets_ruby34 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/metasm-1.0.5.gem
+_eclasses_=flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	ruby-fakegem	92ad9217e94825cb9c8ad831b513a7ec	ruby-ng	f0dedda0b5f19492ca5de91d98bc1708	ruby-utils	a5d18cde09a96648a4d316ada2786cdb	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=8dd75a04fc4b9a09a3344f64bc65575c
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 3bf64bfe35c9..d5219f98fc7e 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/diffoscope-285 b/metadata/md5-cache/dev-util/diffoscope-285
new file mode 100644
index 000000000000..868e6800e419
--- /dev/null
+++ b/metadata/md5-cache/dev-util/diffoscope-285
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-arch/p7zip app-text/docx2txt app-text/html2text media-libs/libcaca virtual/imagemagick-tools[jpeg] ) test? ( || ( dev-python/python-magic[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] sys-apps/file[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) dev-python/libarchive-c[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/distro[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/python-tlsh[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-alternatives/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( llvm-core/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/pypdf[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( virtual/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) >=dev-python/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[ncurses] ) python_targets_python3_11? ( dev-lang/python:3.11[ncurses] ) python_targets_python3_12? ( dev-lang/python:3.12[ncurses] ) python_targets_python3_13? ( dev-lang/python:3.13[ncurses] ) >=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=Will try to get to the bottom of what makes files or directories different
+EAPI=8
+HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
+INHERIT=distutils-r1 toolchain-funcs
+IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=|| ( dev-python/python-magic[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] sys-apps/file[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) dev-python/libarchive-c[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/distro[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/python-tlsh[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-alternatives/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( llvm-core/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/pypdf[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( virtual/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) python_targets_python3_11? ( dev-lang/python:3.11[ncurses] ) python_targets_python3_12? ( dev-lang/python:3.12[ncurses] ) python_targets_python3_13? ( dev-lang/python:3.13[ncurses] )
+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://diffoscope.org/archive/diffoscope-285.tar.bz2
+_eclasses_=distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=8f9e74484f27a4bbac7a744ea0d3a0cd
diff --git a/metadata/md5-cache/dev-util/flatpak-builder-1.3.3 b/metadata/md5-cache/dev-util/flatpak-builder-1.4.4
index 40cebd44b95b..630d4c04970b 100644
--- a/metadata/md5-cache/dev-util/flatpak-builder-1.3.3
+++ b/metadata/md5-cache/dev-util/flatpak-builder-1.4.4
@@ -1,13 +1,13 @@
 BDEPEND=>=sys-devel/gettext-0.18.2 virtual/pkgconfig doc? ( app-text/xmlto dev-libs/libxslt )
 DEFINED_PHASES=configure
-DEPEND=>=sys-apps/flatpak-0.99.1 >=dev-util/ostree-2019.5:= >=dev-libs/elfutils-0.8.12:= >=dev-libs/glib-2.44:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= net-misc/curl:= yaml? ( dev-libs/libyaml:= )
+DEPEND=>=sys-apps/flatpak-0.99.1 >=dev-util/ostree-2019.5:= >=dev-libs/elfutils-0.8.12:= >=dev-libs/glib-2.44:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= net-misc/curl:= yaml? ( dev-libs/libyaml:= ) dev-libs/appstream[compose(-)]
 DESCRIPTION=Tool to build flatpaks from source
 EAPI=8
 HOMEPAGE=http://flatpak.org/
 IUSE=doc +yaml
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=>=sys-apps/flatpak-0.99.1 >=dev-util/ostree-2019.5:= >=dev-libs/elfutils-0.8.12:= >=dev-libs/glib-2.44:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= net-misc/curl:= yaml? ( dev-libs/libyaml:= )
+RDEPEND=>=sys-apps/flatpak-0.99.1 >=dev-util/ostree-2019.5:= >=dev-libs/elfutils-0.8.12:= >=dev-libs/glib-2.44:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= net-misc/curl:= yaml? ( dev-libs/libyaml:= ) dev-libs/appstream[compose(-)]
 SLOT=0
-SRC_URI=https://github.com/flatpak/flatpak-builder/releases/download/1.3.3/flatpak-builder-1.3.3.tar.xz
-_md5_=f41cd69d5340a55bc5441ae478406735
+SRC_URI=https://github.com/flatpak/flatpak-builder/releases/download/1.4.4/flatpak-builder-1.4.4.tar.xz
+_md5_=2f1ddba5056a8b57fe2b0d0a94bc9e20
diff --git a/metadata/md5-cache/dev-util/maturin-1.8.1 b/metadata/md5-cache/dev-util/maturin-1.8.1
index db2520fffb20..963be0b7d2b9 100644
--- a/metadata/md5-cache/dev-util/maturin-1.8.1
+++ b/metadata/md5-cache/dev-util/maturin-1.8.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.maturin.rs/
 INHERIT=cargo distutils-r1 flag-o-matic shell-completion toolchain-funcs
 IUSE=doc +ssl test debug python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=|| ( Apache-2.0 MIT ) doc? ( CC-BY-4.0 OFL-1.1 ) 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 ISC MIT MPL-2.0 Unicode-3.0 Unicode-DFS-2016
 RDEPEND=app-arch/xz-utils ssl? ( dev-libs/openssl:= ) python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-lang/pypy-3.10:=[symlink] ) 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyO3/maturin/archive/refs/tags/v1.8.1.tar.gz -> maturin-1.8.1.gh.tar.gz https://dev.gentoo.org/~ionen/distfiles/maturin-1.8.1-vendor.tar.xz
 _eclasses_=bash-completion-r1	767861f3744f589ee5291c1698b1c082	cargo	5ad34dd14ea52875e865e465e0f6421a	distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	rust	44c8464f6266787f32aab8b1f056a28b	rust-toolchain	3f822985d9297438ed2443aa1fbdf33e	shell-completion	0b655d0d825e157a5e99c463bddaac16	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=945d7d9e900e114bb23d4ab8b7e89ea2
+_md5_=996eafbb6088d7aa6a9baf4bd2cfebc6
diff --git a/metadata/md5-cache/dev-util/promu-0.17.0 b/metadata/md5-cache/dev-util/promu-0.17.0
index eb3d596468f0..aae98a20b81d 100644
--- a/metadata/md5-cache/dev-util/promu-0.17.0
+++ b/metadata/md5-cache/dev-util/promu-0.17.0
@@ -4,10 +4,10 @@ DESCRIPTION=Prometheus Utility Tool
 EAPI=8
 HOMEPAGE=https://github.com/prometheus/promu
 INHERIT=go-module
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~riscv ~x86
 LICENSE=Apache-2.0 BSD BSD-2 MIT
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/prometheus/promu/archive/v0.17.0.tar.gz -> promu-0.17.0.tar.gz https://github.com/rahilarious/gentoo-distfiles/releases/download/promu-0.17.0/deps.tar.xz -> promu-0.17.0-deps.tar.xz
 _eclasses_=flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	go-env	90efbc8636d2f02d9654183330e84cf7	go-module	df32d29550d40a92da723d3b8e17b467	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=6f42f0c7d2b8348a2d3e49475cb0d2e8
+_md5_=5cf6845de456bb3e9b868436e170e5ac
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index ef243a23fb41..3de80bf5d43a 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/git-2.45.3 b/metadata/md5-cache/dev-vcs/git-2.45.3
index ec37dab74d50..06a1ad01f221 100644
--- a/metadata/md5-cache/dev-vcs/git-2.45.3
+++ b/metadata/md5-cache/dev-vcs/git-2.45.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.git-scm.com/
 INHERIT=toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd
 IUSE=+blksha1 +curl cgi doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:= sys-libs/zlib curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) keyring? ( app-crypt/libsecret dev-libs/glib:2 ) iconv? ( virtual/libiconv ) pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:= ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) ) selinux? ( sec-policy/selinux-git )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) perforce? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13 ) ) subversion? ( perl ) webdav? ( curl )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.45.3.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.45.3.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.45.3.tar.xz )
 _eclasses_=bash-completion-r1	767861f3744f589ee5291c1698b1c082	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	optfeature	538bce96e5589935b57e178e8635f301	perl-functions	1863acf0982afafc67797e3ce7275b4c	perl-module	25ca2ff8e7971cb7f817f0bda4be696d	plocale	950fbaec7deeba41b5bcc0572cca99b9	python-single-r1	47d8ac9be330c9366112b78fd4f8ce57	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	readme.gentoo-r1	b045f3acf546393ab6b3170781875358	systemd	54bd206bb5c4efac6ae28b6b006713b0	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=5a611b66aa32aa7cdb3f4ca417355729
+_md5_=7b71c26f897661c47c2a49911924bdb0
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-6.9 b/metadata/md5-cache/dev-vcs/tortoisehg-6.9
new file mode 100644
index 000000000000..a7ce8052b794
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-6.9
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) doc? ( || ( ( dev-lang/python:3.13 >=dev-python/sphinx-7.2.6[python_targets_python3_13(-)] ) ( dev-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(-)] ) ) ) 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 postrm prepare test
+DEPEND=>=dev-vcs/mercurial-6.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_13? ( >=dev-vcs/mercurial-6.9[python_targets_python3_13(-)?] ) <dev-vcs/mercurial-6.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/iniparse[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pygments[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyqt6[network,svg,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/qscintilla-2.14.1-r1[qt6(+),python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DESCRIPTION=Set of graphical tools for Mercurial
+EAPI=8
+HOMEPAGE=https://tortoisehg.bitbucket.io/
+INHERIT=desktop distutils-r1 optfeature xdg-utils
+IUSE=test doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-vcs/mercurial-6.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_13? ( >=dev-vcs/mercurial-6.9[python_targets_python3_13(-)?] ) <dev-vcs/mercurial-6.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/iniparse[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pygments[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyqt6[network,svg,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/qscintilla-2.14.1-r1[qt6(+),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://foss.heptapod.net/mercurial/tortoisehg/thg/-/archive/6.9/thg-6.9.tar.gz -> tortoisehg-6.9.tar.gz
+_eclasses_=desktop	3a72ffe0d8e1dd73af3a1c8c15a59fed	distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	538bce96e5589935b57e178e8635f301	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
+_md5_=095b24c4c44cc46dfd68ebba8f8e3f46
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-9999 b/metadata/md5-cache/dev-vcs/tortoisehg-9999
index e0fbd7858f81..77e3b879d7c5 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-9999
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-9999
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] ) ( dev-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(-)] ) ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-vcs/mercurial
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) doc? ( || ( ( dev-lang/python:3.13 >=dev-python/sphinx-7.2.6[python_targets_python3_13(-)] ) ( dev-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(-)] ) ) ) 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(-)?] dev-vcs/mercurial
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-vcs/mercurial-6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/iniparse[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pygments[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyqt6[network,svg,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/qscintilla-2.14.1-r1[qt6(+),python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEPEND=>=dev-vcs/mercurial-6.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/iniparse[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pygments[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyqt6[network,svg,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/qscintilla-2.14.1-r1[qt6(+),python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
 DESCRIPTION=Set of graphical tools for Mercurial
 EAPI=8
 HOMEPAGE=https://tortoisehg.bitbucket.io/
 INHERIT=desktop distutils-r1 optfeature xdg-utils mercurial
-IUSE=test doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+IUSE=test doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=>=dev-vcs/mercurial-6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/iniparse[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pygments[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyqt6[network,svg,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/qscintilla-2.14.1-r1[qt6(+),python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RDEPEND=>=dev-vcs/mercurial-6.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/iniparse[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pygments[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyqt6[network,svg,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/qscintilla-2.14.1-r1[qt6(+),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
 _eclasses_=desktop	3a72ffe0d8e1dd73af3a1c8c15a59fed	distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	mercurial	74061a7620da41b2cb72b135cc6431c7	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	538bce96e5589935b57e178e8635f301	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
-_md5_=ff6a204ccf91a811eb6cfb70ff1e8d15
+_md5_=17428bab116696251aeee40cbcf6112f
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 86322a3b3de8..5a9094322975 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/commandergenius-2.4.0-r1 b/metadata/md5-cache/games-arcade/commandergenius-2.4.0-r1
index 6bb0af065650..08708751a4a9 100644
--- a/metadata/md5-cache/games-arcade/commandergenius-2.4.0-r1
+++ b/metadata/md5-cache/games-arcade/commandergenius-2.4.0-r1
@@ -1,18 +1,18 @@
-BDEPEND=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 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
+BDEPEND=python? ( python_single_target_python3_13t? ( dev-lang/python:3.13t ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=media-libs/libsdl2[opengl?,video] media-libs/sdl2-image media-libs/sdl2-mixer[vorbis] media-libs/sdl2-ttf sys-libs/zlib[minizip] downloader? ( net-misc/curl ) opengl? ( virtual/opengl ) 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 ) ) dev-libs/boost
+DEPEND=media-libs/libsdl2[opengl?,video] media-libs/sdl2-image media-libs/sdl2-mixer[vorbis] media-libs/sdl2-ttf sys-libs/zlib[minizip] downloader? ( net-misc/curl ) opengl? ( virtual/opengl ) python? ( python_single_target_python3_13t? ( dev-lang/python:3.13t ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) ) dev-libs/boost
 DESCRIPTION=Open Source Commander Keen clone (needs original game files)
 EAPI=8
 HOMEPAGE=https://clonekeenplus.sourceforge.io/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake flag-o-matic python-single-r1 xdg
-IUSE=+downloader opengl +python python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+IUSE=+downloader opengl +python python_single_target_python3_13t python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=media-libs/libsdl2[opengl?,video] media-libs/sdl2-image media-libs/sdl2-mixer[vorbis] media-libs/sdl2-ttf sys-libs/zlib[minizip] downloader? ( net-misc/curl ) opengl? ( virtual/opengl ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) )
+RDEPEND=media-libs/libsdl2[opengl?,video] media-libs/sdl2-image media-libs/sdl2-mixer[vorbis] media-libs/sdl2-ttf sys-libs/zlib[minizip] downloader? ( net-misc/curl ) opengl? ( virtual/opengl ) python? ( python_single_target_python3_13t? ( dev-lang/python:3.13t ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_13t python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13 ) )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://gitlab.com/Dringgstein/Commander-Genius/-/archive/v2.4.0/Commander-Genius-v2.4.0.tar.bz2
 _eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	47d8ac9be330c9366112b78fd4f8ce57	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	xdg	3ef49a87c52c8b77c476351195dfe575	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
-_md5_=75e2e999c444fc73949daac58fc40c44
+_md5_=bdaa17079a6055b4b9b2e6e6f67095a2
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 0cabddb3a9e5..cc7687bbc1f5 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/dolphin-2412 b/metadata/md5-cache/games-emulation/dolphin-2412-r1
index b4066833681a..2c94f1a6201a 100644
--- a/metadata/md5-cache/games-emulation/dolphin-2412
+++ b/metadata/md5-cache/games-emulation/dolphin-2412-r1
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gettext virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=app-arch/bzip2:= >=app-arch/lz4-1.8:= app-arch/xz-utils >=app-arch/zstd-1.4.0:= dev-libs/hidapi >=dev-libs/libfmt-10.1:= dev-libs/lzo:2 dev-libs/pugixml dev-libs/xxhash media-libs/cubeb media-libs/libsfml:= media-libs/libspng >=net-libs/enet-1.3.18:1.3= net-libs/mbedtls:0= net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) gui? ( dev-qt/qtbase:6[gui,widgets] dev-qt/qtsvg:6 ) llvm? ( llvm_slot_18? ( llvm-core/llvm:18= ) ) profile? ( dev-util/oprofile ) pulseaudio? ( media-libs/libpulse ) sdl? ( media-libs/libsdl2 ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc:= ) egl? ( media-libs/libglvnd ) test? ( dev-cpp/gtest )
+DEPEND=app-arch/bzip2:= >=app-arch/lz4-1.8:= app-arch/xz-utils >=app-arch/zstd-1.4.0:= dev-libs/hidapi >=dev-libs/libfmt-10.1:= dev-libs/lzo:2 dev-libs/pugixml dev-libs/xxhash media-libs/cubeb media-libs/libsfml:= media-libs/libspng >=net-libs/enet-1.3.18:1.3= net-libs/mbedtls:0= net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) gui? ( dev-qt/qtbase:6[gui,widgets] dev-qt/qtsvg:6 ) llvm? ( llvm_slot_18? ( llvm-core/llvm:18= ) ) profile? ( dev-util/oprofile ) pulseaudio? ( media-libs/libpulse ) sdl? ( >=media-libs/libsdl2-2.30.9 ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc:= ) egl? ( media-libs/libglvnd ) test? ( dev-cpp/gtest )
 DESCRIPTION=Gamecube and Wii game emulator
 EAPI=8
 HOMEPAGE=https://dolphin-emu.org/
@@ -8,10 +8,10 @@ INHERIT=cmake llvm-r1 pax-utils xdg-utils
 IUSE=alsa bluetooth discord-presence doc egl +evdev ffmpeg +gui llvm log mgba profile pulseaudio sdl systemd telemetry test upnp vulkan +llvm_slot_18
 KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2+ BSD BSD-2 LGPL-2.1+ MIT ZLIB MIT ZLIB ZLIB MIT MIT MIT MIT BSD-2 BSD MPL-2.0 GPL-2+ FatFs || ( Apache-2.0 MIT ) MIT LGPL-2.1+ LGPL-2.1+ MIT ZLIB
-RDEPEND=app-arch/bzip2:= >=app-arch/lz4-1.8:= app-arch/xz-utils >=app-arch/zstd-1.4.0:= dev-libs/hidapi >=dev-libs/libfmt-10.1:= dev-libs/lzo:2 dev-libs/pugixml dev-libs/xxhash media-libs/cubeb media-libs/libsfml:= media-libs/libspng >=net-libs/enet-1.3.18:1.3= net-libs/mbedtls:0= net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) gui? ( dev-qt/qtbase:6[gui,widgets] dev-qt/qtsvg:6 ) llvm? ( llvm_slot_18? ( llvm-core/llvm:18= ) ) profile? ( dev-util/oprofile ) pulseaudio? ( media-libs/libpulse ) sdl? ( media-libs/libsdl2 ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc:= ) vulkan? ( media-libs/vulkan-loader )
+RDEPEND=app-arch/bzip2:= >=app-arch/lz4-1.8:= app-arch/xz-utils >=app-arch/zstd-1.4.0:= dev-libs/hidapi >=dev-libs/libfmt-10.1:= dev-libs/lzo:2 dev-libs/pugixml dev-libs/xxhash media-libs/cubeb media-libs/libsfml:= media-libs/libspng >=net-libs/enet-1.3.18:1.3= net-libs/mbedtls:0= net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) gui? ( dev-qt/qtbase:6[gui,widgets] dev-qt/qtsvg:6 ) llvm? ( llvm_slot_18? ( llvm-core/llvm:18= ) ) profile? ( dev-util/oprofile ) pulseaudio? ( media-libs/libpulse ) sdl? ( >=media-libs/libsdl2-2.30.9 ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc:= ) vulkan? ( media-libs/vulkan-loader )
 REQUIRED_USE=mgba? ( gui ) llvm? ( ^^ ( llvm_slot_18 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dolphin-emu/dolphin/archive/2412.tar.gz -> dolphin-2412.tar.gz https://github.com/epezent/implot/archive/cc5e1daa5c7f2335a9460ae79c829011dc5cef2d.tar.gz -> implot-cc5e1daa5c7f2335a9460ae79c829011dc5cef2d.tar.gz https://github.com/syoyo/tinygltf/archive/c5641f2c22d117da7971504591a8f6a41ece488b.tar.gz -> tinygltf-c5641f2c22d117da7971504591a8f6a41ece488b.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/05fe2cc910a68c9ba5dac07db46ef78573acee72.tar.gz -> Vulkan-Headers-05fe2cc910a68c9ba5dac07db46ef78573acee72.tar.gz https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/archive/009ecd192c1289c7529bff248a16cfe896254816.tar.gz -> VulkanMemoryAllocator-009ecd192c1289c7529bff248a16cfe896254816.tar.gz https://github.com/zlib-ng/zlib-ng/archive/ce01b1e41da298334f8214389cc9369540a7560f.tar.gz -> zlib-ng-ce01b1e41da298334f8214389cc9369540a7560f.tar.gz https://github.com/zlib-ng/minizip-ng/archive/3eed562ef0ea3516db30d1c8ecb0e1b486d8cb70.tar.gz -> minizip-ng-3eed562ef0ea3516db30d1c8ecb0e1b486d8cb70.tar.gz mgba? ( https://github.com/mgba-emu/mgba/archive/8739b22fbc90fdf0b4f6612ef9c0520f0ba44a51.tar.gz -> mgba-8739b22fbc90fdf0b4f6612ef9c0520f0ba44a51.tar.gz )
 _eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	llvm-r1	0bd586d3786517cd63802a520b404dda	llvm-utils	7f49c40879f833f9d07e2d5a9643077b	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	pax-utils	5555f2e75744739fe100ee62c22d28fe	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
-_md5_=bf7be47d1c5015957449d167f133d93a
+_md5_=a66b3601f9aba3715b568820a6f13d65
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index ac1021e62ac1..59a167cbcd76 100644
--- a/metadata/md5-cache/games-misc/Manifest.gz
+++ b/metadata/md5-cache/games-misc/Manifest.gz
diff --git a/metadata/md5-cache/games-misc/ponysay-3.0.3 b/metadata/md5-cache/games-misc/ponysay-3.0.3
index 1343bf781a56..cc2932ba5746 100644
--- a/metadata/md5-cache/games-misc/ponysay-3.0.3
+++ b/metadata/md5-cache/games-misc/ponysay-3.0.3
@@ -1,15 +1,15 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) doc? ( sys-apps/texinfo )
+BDEPEND=python_single_target_python3_13t? ( dev-lang/python:3.13t ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) doc? ( sys-apps/texinfo )
 DEFINED_PHASES=compile install setup
 DESCRIPTION=cowsay reimplemention for ponies
 EAPI=8
 HOMEPAGE=https://github.com/erkin/ponysay
 INHERIT=bash-completion-r1 python-single-r1
-IUSE=doc +non-free bash-completion fish-completion zsh-completion python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+IUSE=doc +non-free bash-completion fish-completion zsh-completion python_single_target_python3_13t python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13
 KEYWORDS=~amd64 ~arm ~arm64 ~m68k ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) fish-completion? ( app-shells/fish ) zsh-completion? ( app-shells/zsh )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
+RDEPEND=python_single_target_python3_13t? ( dev-lang/python:3.13t ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) fish-completion? ( app-shells/fish ) zsh-completion? ( app-shells/zsh )
+REQUIRED_USE=^^ ( python_single_target_python3_13t python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13 )
 SLOT=0
 SRC_URI=https://github.com/erkin/ponysay/archive/3.0.3.tar.gz -> ponysay-3.0.3.tar.gz
 _eclasses_=bash-completion-r1	767861f3744f589ee5291c1698b1c082	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	python-single-r1	47d8ac9be330c9366112b78fd4f8ce57	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=5fec9e22b080c0670c3143555978697f
+_md5_=6e44876ccbc9e169e77890f4cadc69aa
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index 7eb2bd7acf52..3c7b3d0d77fe 100644
--- a/metadata/md5-cache/gui-apps/Manifest.gz
+++ b/metadata/md5-cache/gui-apps/Manifest.gz
diff --git a/metadata/md5-cache/gui-apps/railway-2.7.2 b/metadata/md5-cache/gui-apps/railway-2.7.2
new file mode 100644
index 000000000000..baabe27d299c
--- /dev/null
+++ b/metadata/md5-cache/gui-apps/railway-2.7.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/glib dev-util/blueprint-compiler sys-devel/gettext || ( dev-lang/rust-bin:1.84.0 dev-lang/rust:1.84.0 dev-lang/rust-bin:1.83.0 dev-lang/rust:1.83.0 dev-lang/rust-bin:1.82.0 dev-lang/rust:1.82.0 dev-lang/rust-bin:1.81.0 dev-lang/rust:1.81.0 dev-lang/rust-bin:1.80.1 dev-lang/rust:1.80.1 dev-lang/rust-bin:1.79.0 dev-lang/rust:1.79.0 dev-lang/rust-bin:1.78.0 dev-lang/rust:1.78.0 dev-lang/rust-bin:1.77.1 dev-lang/rust:1.77.1 dev-lang/rust-bin:1.76.0 dev-lang/rust:1.76.0 dev-lang/rust-bin:1.75.0 dev-lang/rust:1.75.0 dev-lang/rust-bin:1.74.1 dev-lang/rust:1.74.1 dev-lang/rust-bin:1.71.1 dev-lang/rust:1.71.1 ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-libs/glib-2.66 >=gui-libs/gtk-4.14:4 >=gui-libs/libadwaita-1.6.0 media-libs/graphene
+DESCRIPTION=Travel with all your train information in one place
+EAPI=8
+HOMEPAGE=https://mobile.schmidhuberj.de/railway/ https://gitlab.com/schmiddi-on-mobile/railway/
+INHERIT=cargo gnome2-utils meson xdg-utils
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=GPL-3+ Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT Unicode-3.0 Unicode-DFS-2016 || ( AGPL-3+ EUPL-1.2 ) openssl
+RDEPEND=>=dev-libs/glib-2.66 >=gui-libs/gtk-4.14:4 >=gui-libs/libadwaita-1.6.0 media-libs/graphene
+SLOT=0
+SRC_URI=https://gitlab.com/schmiddi-on-mobile/railway/-/archive/2.7.2/railway-2.7.2.tar.bz2 https://crates.io/api/v1/crates/addr2line/0.22.0/download -> addr2line-0.22.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aho-corasick/1.1.3/download -> aho-corasick-1.1.3.crate https://crates.io/api/v1/crates/android-tzdata/0.1.1/download -> android-tzdata-0.1.1.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/anstream/0.6.14/download -> anstream-0.6.14.crate https://crates.io/api/v1/crates/anstyle-parse/0.2.4/download -> anstyle-parse-0.2.4.crate https://crates.io/api/v1/crates/anstyle-query/1.1.0/download -> anstyle-query-1.1.0.crate https://crates.io/api/v1/crates/anstyle-wincon/3.0.3/download -> anstyle-wincon-3.0.3.crate https://crates.io/api/v1/crates/anstyle/1.0.7/download -> anstyle-1.0.7.crate https://crates.io/api/v1/crates/async-trait/0.1.78/download -> async-trait-0.1.78.crate https://crates.io/api/v1/crates/atomic-waker/1.1.2/download -> atomic-waker-1.1.2.crate https://crates.io/api/v1/crates/autocfg/1.3.0/download -> autocfg-1.3.0.crate https://crates.io/api/v1/crates/backtrace/0.3.72/download -> backtrace-0.3.72.crate https://crates.io/api/v1/crates/base64/0.22.1/download -> base64-0.22.1.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.6.0/download -> bitflags-2.6.0.crate https://crates.io/api/v1/crates/block-buffer/0.10.4/download -> block-buffer-0.10.4.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/bumpalo/3.16.0/download -> bumpalo-3.16.0.crate https://crates.io/api/v1/crates/bytes/1.5.0/download -> bytes-1.5.0.crate https://crates.io/api/v1/crates/cairo-rs/0.20.0/download -> cairo-rs-0.20.0.crate https://crates.io/api/v1/crates/cairo-sys-rs/0.20.0/download -> cairo-sys-rs-0.20.0.crate https://crates.io/api/v1/crates/cc/1.1.6/download -> cc-1.1.6.crate https://crates.io/api/v1/crates/cfg-expr/0.15.8/download -> cfg-expr-0.15.8.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/chrono-tz-build/0.2.1/download -> chrono-tz-build-0.2.1.crate https://crates.io/api/v1/crates/chrono-tz/0.8.6/download -> chrono-tz-0.8.6.crate https://crates.io/api/v1/crates/chrono/0.4.38/download -> chrono-0.4.38.crate https://crates.io/api/v1/crates/colorchoice/1.0.1/download -> colorchoice-1.0.1.crate https://crates.io/api/v1/crates/convert_case/0.6.0/download -> convert_case-0.6.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.6/download -> core-foundation-sys-0.8.6.crate https://crates.io/api/v1/crates/core-foundation/0.9.4/download -> core-foundation-0.9.4.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/digest/0.10.7/download -> digest-0.10.7.crate https://crates.io/api/v1/crates/displaydoc/0.2.5/download -> displaydoc-0.2.5.crate https://crates.io/api/v1/crates/encoding_rs/0.8.35/download -> encoding_rs-0.8.35.crate https://crates.io/api/v1/crates/env_filter/0.1.0/download -> env_filter-0.1.0.crate https://crates.io/api/v1/crates/env_logger/0.11.4/download -> env_logger-0.11.4.crate https://crates.io/api/v1/crates/equivalent/1.0.1/download -> equivalent-1.0.1.crate https://crates.io/api/v1/crates/errno/0.3.10/download -> errno-0.3.10.crate https://crates.io/api/v1/crates/fastrand/2.2.0/download -> fastrand-2.2.0.crate https://crates.io/api/v1/crates/field-offset/0.3.6/download -> field-offset-0.3.6.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/form_urlencoded/1.2.1/download -> form_urlencoded-1.2.1.crate https://crates.io/api/v1/crates/futures-channel/0.3.30/download -> futures-channel-0.3.30.crate https://crates.io/api/v1/crates/futures-core/0.3.31/download -> futures-core-0.3.31.crate https://crates.io/api/v1/crates/futures-executor/0.3.30/download -> futures-executor-0.3.30.crate https://crates.io/api/v1/crates/futures-io/0.3.30/download -> futures-io-0.3.30.crate https://crates.io/api/v1/crates/futures-macro/0.3.31/download -> futures-macro-0.3.31.crate https://crates.io/api/v1/crates/futures-sink/0.3.31/download -> futures-sink-0.3.31.crate https://crates.io/api/v1/crates/futures-task/0.3.31/download -> futures-task-0.3.31.crate https://crates.io/api/v1/crates/futures-util/0.3.31/download -> futures-util-0.3.31.crate https://crates.io/api/v1/crates/gdk-pixbuf-sys/0.20.0/download -> gdk-pixbuf-sys-0.20.0.crate https://crates.io/api/v1/crates/gdk-pixbuf/0.20.0/download -> gdk-pixbuf-0.20.0.crate https://crates.io/api/v1/crates/gdk4-sys/0.9.0/download -> gdk4-sys-0.9.0.crate https://crates.io/api/v1/crates/gdk4/0.9.0/download -> gdk4-0.9.0.crate https://crates.io/api/v1/crates/generic-array/0.14.7/download -> generic-array-0.14.7.crate https://crates.io/api/v1/crates/getrandom/0.2.12/download -> getrandom-0.2.12.crate https://crates.io/api/v1/crates/gettext-rs/0.7.0/download -> gettext-rs-0.7.0.crate https://crates.io/api/v1/crates/gettext-sys/0.21.3/download -> gettext-sys-0.21.3.crate https://crates.io/api/v1/crates/gimli/0.29.0/download -> gimli-0.29.0.crate https://crates.io/api/v1/crates/gio-sys/0.20.0/download -> gio-sys-0.20.0.crate https://crates.io/api/v1/crates/gio/0.20.0/download -> gio-0.20.0.crate https://crates.io/api/v1/crates/glib-macros/0.20.0/download -> glib-macros-0.20.0.crate https://crates.io/api/v1/crates/glib-sys/0.20.0/download -> glib-sys-0.20.0.crate https://crates.io/api/v1/crates/glib/0.20.0/download -> glib-0.20.0.crate https://crates.io/api/v1/crates/gobject-sys/0.20.0/download -> gobject-sys-0.20.0.crate https://crates.io/api/v1/crates/graphene-rs/0.20.0/download -> graphene-rs-0.20.0.crate https://crates.io/api/v1/crates/graphene-sys/0.20.0/download -> graphene-sys-0.20.0.crate https://crates.io/api/v1/crates/gsk4-sys/0.9.0/download -> gsk4-sys-0.9.0.crate https://crates.io/api/v1/crates/gsk4/0.9.0/download -> gsk4-0.9.0.crate https://crates.io/api/v1/crates/gtk4-macros/0.9.0/download -> gtk4-macros-0.9.0.crate https://crates.io/api/v1/crates/gtk4-sys/0.9.0/download -> gtk4-sys-0.9.0.crate https://crates.io/api/v1/crates/gtk4/0.9.0/download -> gtk4-0.9.0.crate https://crates.io/api/v1/crates/h2/0.4.7/download -> h2-0.4.7.crate https://crates.io/api/v1/crates/hashbrown/0.14.5/download -> hashbrown-0.14.5.crate https://crates.io/api/v1/crates/heck/0.5.0/download -> heck-0.5.0.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/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/http-body-util/0.1.2/download -> http-body-util-0.1.2.crate https://crates.io/api/v1/crates/http-body/1.0.1/download -> http-body-1.0.1.crate https://crates.io/api/v1/crates/http/1.1.0/download -> http-1.1.0.crate https://crates.io/api/v1/crates/httparse/1.8.0/download -> httparse-1.8.0.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/hyper-rustls/0.27.3/download -> hyper-rustls-0.27.3.crate https://crates.io/api/v1/crates/hyper-tls/0.6.0/download -> hyper-tls-0.6.0.crate https://crates.io/api/v1/crates/hyper-util/0.1.7/download -> hyper-util-0.1.7.crate https://crates.io/api/v1/crates/hyper/1.5.1/download -> hyper-1.5.1.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.2/download -> iana-time-zone-haiku-0.1.2.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.60/download -> iana-time-zone-0.1.60.crate https://crates.io/api/v1/crates/icu_collections/1.5.0/download -> icu_collections-1.5.0.crate https://crates.io/api/v1/crates/icu_locid/1.5.0/download -> icu_locid-1.5.0.crate https://crates.io/api/v1/crates/icu_locid_transform/1.5.0/download -> icu_locid_transform-1.5.0.crate https://crates.io/api/v1/crates/icu_locid_transform_data/1.5.0/download -> icu_locid_transform_data-1.5.0.crate https://crates.io/api/v1/crates/icu_normalizer/1.5.0/download -> icu_normalizer-1.5.0.crate https://crates.io/api/v1/crates/icu_normalizer_data/1.5.0/download -> icu_normalizer_data-1.5.0.crate https://crates.io/api/v1/crates/icu_properties/1.5.1/download -> icu_properties-1.5.1.crate https://crates.io/api/v1/crates/icu_properties_data/1.5.0/download -> icu_properties_data-1.5.0.crate https://crates.io/api/v1/crates/icu_provider/1.5.0/download -> icu_provider-1.5.0.crate https://crates.io/api/v1/crates/icu_provider_macros/1.5.0/download -> icu_provider_macros-1.5.0.crate https://crates.io/api/v1/crates/idna/1.0.3/download -> idna-1.0.3.crate https://crates.io/api/v1/crates/idna_adapter/1.2.0/download -> idna_adapter-1.2.0.crate https://crates.io/api/v1/crates/indexmap/2.2.6/download -> indexmap-2.2.6.crate https://crates.io/api/v1/crates/ipnet/2.10.1/download -> ipnet-2.10.1.crate https://crates.io/api/v1/crates/is_terminal_polyfill/1.70.0/download -> is_terminal_polyfill-1.70.0.crate https://crates.io/api/v1/crates/itoa/1.0.11/download -> itoa-1.0.11.crate https://crates.io/api/v1/crates/js-sys/0.3.69/download -> js-sys-0.3.69.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/libadwaita-sys/0.7.0/download -> libadwaita-sys-0.7.0.crate https://crates.io/api/v1/crates/libadwaita/0.7.0/download -> libadwaita-0.7.0.crate https://crates.io/api/v1/crates/libc/0.2.155/download -> libc-0.2.155.crate https://crates.io/api/v1/crates/linux-raw-sys/0.4.14/download -> linux-raw-sys-0.4.14.crate https://crates.io/api/v1/crates/litemap/0.7.4/download -> litemap-0.7.4.crate https://crates.io/api/v1/crates/locale_config/0.3.0/download -> locale_config-0.3.0.crate https://crates.io/api/v1/crates/log/0.4.22/download -> log-0.4.22.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/md-5/0.10.6/download -> md-5-0.10.6.crate https://crates.io/api/v1/crates/memchr/2.7.4/download -> memchr-2.7.4.crate https://crates.io/api/v1/crates/memoffset/0.9.1/download -> memoffset-0.9.1.crate https://crates.io/api/v1/crates/mime/0.3.17/download -> mime-0.3.17.crate https://crates.io/api/v1/crates/miniz_oxide/0.7.4/download -> miniz_oxide-0.7.4.crate https://crates.io/api/v1/crates/mio/1.0.1/download -> mio-1.0.1.crate https://crates.io/api/v1/crates/native-tls/0.2.12/download -> native-tls-0.2.12.crate https://crates.io/api/v1/crates/num-traits/0.2.19/download -> num-traits-0.2.19.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/object/0.35.0/download -> object-0.35.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/openssl-macros/0.1.1/download -> openssl-macros-0.1.1.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-sys/0.9.104/download -> openssl-sys-0.9.104.crate https://crates.io/api/v1/crates/openssl/0.10.68/download -> openssl-0.10.68.crate https://crates.io/api/v1/crates/pango-sys/0.20.0/download -> pango-sys-0.20.0.crate https://crates.io/api/v1/crates/pango/0.20.0/download -> pango-0.20.0.crate https://crates.io/api/v1/crates/parse-zoneinfo/0.3.0/download -> parse-zoneinfo-0.3.0.crate https://crates.io/api/v1/crates/percent-encoding/2.3.1/download -> percent-encoding-2.3.1.crate https://crates.io/api/v1/crates/phf/0.11.2/download -> phf-0.11.2.crate https://crates.io/api/v1/crates/phf_codegen/0.11.2/download -> phf_codegen-0.11.2.crate https://crates.io/api/v1/crates/phf_generator/0.11.2/download -> phf_generator-0.11.2.crate https://crates.io/api/v1/crates/phf_shared/0.11.2/download -> phf_shared-0.11.2.crate https://crates.io/api/v1/crates/pin-project-internal/1.1.7/download -> pin-project-internal-1.1.7.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.14/download -> pin-project-lite-0.2.14.crate https://crates.io/api/v1/crates/pin-project/1.1.7/download -> pin-project-1.1.7.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.30/download -> pkg-config-0.3.30.crate https://crates.io/api/v1/crates/proc-macro-crate/3.1.0/download -> proc-macro-crate-3.1.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.86/download -> proc-macro2-1.0.86.crate https://crates.io/api/v1/crates/quote/1.0.36/download -> quote-1.0.36.crate https://crates.io/api/v1/crates/railway-api-derive/0.1.1/download -> railway-api-derive-0.1.1.crate https://crates.io/api/v1/crates/railway-api/0.1.1/download -> railway-api-0.1.1.crate https://crates.io/api/v1/crates/railway-core/0.1.1/download -> railway-core-0.1.1.crate https://crates.io/api/v1/crates/railway-provider-db-movas/0.1.0/download -> railway-provider-db-movas-0.1.0.crate https://crates.io/api/v1/crates/railway-provider-hafas/0.1.2/download -> railway-provider-hafas-0.1.2.crate https://crates.io/api/v1/crates/railway-provider-motis/0.1.0/download -> railway-provider-motis-0.1.0.crate https://crates.io/api/v1/crates/railway-provider-search-ch/0.1.0/download -> railway-provider-search-ch-0.1.0.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/regex-automata/0.4.7/download -> regex-automata-0.4.7.crate https://crates.io/api/v1/crates/regex-syntax/0.8.4/download -> regex-syntax-0.8.4.crate https://crates.io/api/v1/crates/regex/1.10.5/download -> regex-1.10.5.crate https://crates.io/api/v1/crates/reqwest/0.12.5/download -> reqwest-0.12.5.crate https://crates.io/api/v1/crates/ring/0.17.8/download -> ring-0.17.8.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.24/download -> rustc-demangle-0.1.24.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustix/0.38.34/download -> rustix-0.38.34.crate https://crates.io/api/v1/crates/rustls-pemfile/2.1.2/download -> rustls-pemfile-2.1.2.crate https://crates.io/api/v1/crates/rustls-pki-types/1.5.0/download -> rustls-pki-types-1.5.0.crate https://crates.io/api/v1/crates/rustls-webpki/0.102.3/download -> rustls-webpki-0.102.3.crate https://crates.io/api/v1/crates/rustls/0.23.7/download -> rustls-0.23.7.crate https://crates.io/api/v1/crates/ryu/1.0.18/download -> ryu-1.0.18.crate https://crates.io/api/v1/crates/schannel/0.1.23/download -> schannel-0.1.23.crate https://crates.io/api/v1/crates/security-framework-sys/2.9.1/download -> security-framework-sys-2.9.1.crate https://crates.io/api/v1/crates/security-framework/2.9.2/download -> security-framework-2.9.2.crate https://crates.io/api/v1/crates/semver/1.0.23/download -> semver-1.0.23.crate https://crates.io/api/v1/crates/serde/1.0.204/download -> serde-1.0.204.crate https://crates.io/api/v1/crates/serde_derive/1.0.204/download -> serde_derive-1.0.204.crate https://crates.io/api/v1/crates/serde_json/1.0.120/download -> serde_json-1.0.120.crate https://crates.io/api/v1/crates/serde_spanned/0.6.6/download -> serde_spanned-0.6.6.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.1/download -> serde_urlencoded-0.7.1.crate https://crates.io/api/v1/crates/siphasher/0.3.11/download -> siphasher-0.3.11.crate https://crates.io/api/v1/crates/slab/0.4.9/download -> slab-0.4.9.crate https://crates.io/api/v1/crates/smallvec/1.13.2/download -> smallvec-1.13.2.crate https://crates.io/api/v1/crates/socket2/0.5.7/download -> socket2-0.5.7.crate https://crates.io/api/v1/crates/spin/0.9.8/download -> spin-0.9.8.crate https://crates.io/api/v1/crates/stable_deref_trait/1.2.0/download -> stable_deref_trait-1.2.0.crate https://crates.io/api/v1/crates/subtle/2.6.1/download -> subtle-2.6.1.crate https://crates.io/api/v1/crates/syn/2.0.72/download -> syn-2.0.72.crate https://crates.io/api/v1/crates/sync_wrapper/1.0.2/download -> sync_wrapper-1.0.2.crate https://crates.io/api/v1/crates/synstructure/0.13.1/download -> synstructure-0.13.1.crate https://crates.io/api/v1/crates/system-configuration-sys/0.5.0/download -> system-configuration-sys-0.5.0.crate https://crates.io/api/v1/crates/system-configuration/0.5.1/download -> system-configuration-0.5.1.crate https://crates.io/api/v1/crates/system-deps/7.0.1/download -> system-deps-7.0.1.crate https://crates.io/api/v1/crates/target-lexicon/0.12.15/download -> target-lexicon-0.12.15.crate https://crates.io/api/v1/crates/temp-dir/0.1.12/download -> temp-dir-0.1.12.crate https://crates.io/api/v1/crates/tempfile/3.11.0/download -> tempfile-3.11.0.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.63/download -> thiserror-impl-1.0.63.crate https://crates.io/api/v1/crates/thiserror/1.0.63/download -> thiserror-1.0.63.crate https://crates.io/api/v1/crates/tinystr/0.7.6/download -> tinystr-0.7.6.crate https://crates.io/api/v1/crates/tokio-macros/2.4.0/download -> tokio-macros-2.4.0.crate https://crates.io/api/v1/crates/tokio-native-tls/0.3.1/download -> tokio-native-tls-0.3.1.crate https://crates.io/api/v1/crates/tokio-rustls/0.26.0/download -> tokio-rustls-0.26.0.crate https://crates.io/api/v1/crates/tokio-util/0.7.12/download -> tokio-util-0.7.12.crate https://crates.io/api/v1/crates/tokio/1.39.1/download -> tokio-1.39.1.crate https://crates.io/api/v1/crates/toml/0.8.15/download -> toml-0.8.15.crate https://crates.io/api/v1/crates/toml_datetime/0.6.6/download -> toml_datetime-0.6.6.crate https://crates.io/api/v1/crates/toml_edit/0.21.1/download -> toml_edit-0.21.1.crate https://crates.io/api/v1/crates/toml_edit/0.22.16/download -> toml_edit-0.22.16.crate https://crates.io/api/v1/crates/tower-layer/0.3.3/download -> tower-layer-0.3.3.crate https://crates.io/api/v1/crates/tower-service/0.3.2/download -> tower-service-0.3.2.crate https://crates.io/api/v1/crates/tower/0.4.13/download -> tower-0.4.13.crate https://crates.io/api/v1/crates/tracing-core/0.1.32/download -> tracing-core-0.1.32.crate https://crates.io/api/v1/crates/tracing/0.1.40/download -> tracing-0.1.40.crate https://crates.io/api/v1/crates/try-lock/0.2.5/download -> try-lock-0.2.5.crate https://crates.io/api/v1/crates/typenum/1.17.0/download -> typenum-1.17.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/unicode-segmentation/1.11.0/download -> unicode-segmentation-1.11.0.crate https://crates.io/api/v1/crates/untrusted/0.9.0/download -> untrusted-0.9.0.crate https://crates.io/api/v1/crates/url/2.5.4/download -> url-2.5.4.crate https://crates.io/api/v1/crates/utf16_iter/1.0.5/download -> utf16_iter-1.0.5.crate https://crates.io/api/v1/crates/utf8_iter/1.0.4/download -> utf8_iter-1.0.4.crate https://crates.io/api/v1/crates/utf8parse/0.2.2/download -> utf8parse-0.2.2.crate https://crates.io/api/v1/crates/uuid/1.12.0/download -> uuid-1.12.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version-compare/0.2.0/download -> version-compare-0.2.0.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/want/0.3.1/download -> want-0.3.1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.92/download -> wasm-bindgen-backend-0.2.92.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.42/download -> wasm-bindgen-futures-0.4.42.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.92/download -> wasm-bindgen-macro-support-0.2.92.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.92/download -> wasm-bindgen-macro-0.2.92.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.92/download -> wasm-bindgen-shared-0.2.92.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.92/download -> wasm-bindgen-0.2.92.crate https://crates.io/api/v1/crates/web-sys/0.3.69/download -> web-sys-0.3.69.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-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-core/0.52.0/download -> windows-core-0.52.0.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.5/download -> windows-targets-0.52.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_gnullvm/0.52.5/download -> windows_aarch64_gnullvm-0.52.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_aarch64_msvc/0.52.5/download -> windows_aarch64_msvc-0.52.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_gnu/0.52.5/download -> windows_i686_gnu-0.52.5.crate https://crates.io/api/v1/crates/windows_i686_gnullvm/0.52.5/download -> windows_i686_gnullvm-0.52.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_i686_msvc/0.52.5/download -> windows_i686_msvc-0.52.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_gnu/0.52.5/download -> windows_x86_64_gnu-0.52.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_gnullvm/0.52.5/download -> windows_x86_64_gnullvm-0.52.5.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.5/download -> windows_x86_64_msvc-0.52.5.crate https://crates.io/api/v1/crates/winnow/0.5.40/download -> winnow-0.5.40.crate https://crates.io/api/v1/crates/winnow/0.6.14/download -> winnow-0.6.14.crate https://crates.io/api/v1/crates/winreg/0.52.0/download -> winreg-0.52.0.crate https://crates.io/api/v1/crates/write16/1.0.0/download -> write16-1.0.0.crate https://crates.io/api/v1/crates/writeable/0.5.5/download -> writeable-0.5.5.crate https://crates.io/api/v1/crates/yoke-derive/0.7.5/download -> yoke-derive-0.7.5.crate https://crates.io/api/v1/crates/yoke/0.7.5/download -> yoke-0.7.5.crate https://crates.io/api/v1/crates/zerofrom-derive/0.1.5/download -> zerofrom-derive-0.1.5.crate https://crates.io/api/v1/crates/zerofrom/0.1.5/download -> zerofrom-0.1.5.crate https://crates.io/api/v1/crates/zeroize/1.8.1/download -> zeroize-1.8.1.crate https://crates.io/api/v1/crates/zerovec-derive/0.10.3/download -> zerovec-derive-0.10.3.crate https://crates.io/api/v1/crates/zerovec/0.10.4/download -> zerovec-0.10.4.crate
+_eclasses_=cargo	5ad34dd14ea52875e865e465e0f6421a	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	gnome2-utils	a8cf148ec7f5ae0b1f1d33ae5f7f9e88	meson	99466844dd8d4fcfb07578a76f5a9922	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	rust	44c8464f6266787f32aab8b1f056a28b	rust-toolchain	3f822985d9297438ed2443aa1fbdf33e	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
+_md5_=a2d358de454481d29122386ebc9d7107
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 22d7c4cbcf5f..42feac5038b8 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/gtksourceview-5.12.1 b/metadata/md5-cache/gui-libs/gtksourceview-5.12.1-r1
index e07406777c77..e07406777c77 100644
--- a/metadata/md5-cache/gui-libs/gtksourceview-5.12.1
+++ b/metadata/md5-cache/gui-libs/gtksourceview-5.12.1-r1
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index e676d3ed1c99..8ab28c20b784 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/strawberry-1.2.5 b/metadata/md5-cache/media-sound/strawberry-1.2.6
index 949983b3ee99..7fbd17f47d69 100644
--- a/metadata/md5-cache/media-sound/strawberry-1.2.5
+++ b/metadata/md5-cache/media-sound/strawberry-1.2.6
@@ -12,6 +12,6 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:= dev-libs/glib:2 dev-libs/icu:= dev-libs/kdsingleapplication[qt6(+)] dev-qt/qtbase:6[concurrent,dbus?,gui,network,ssl,sql,sqlite,widgets,X?] media-libs/alsa-lib media-libs/taglib:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 cdda? ( dev-libs/libcdio:= ) chromaprint? ( media-libs/chromaprint:= ) ipod? ( media-libs/libgpod x11-libs/gdk-pixbuf ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( media-libs/libmtp ) loudness? ( media-libs/libebur128 ) pulseaudio? ( media-libs/libpulse ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-taglib udisks? ( sys-fs/udisks:2 ) kde? ( kde-frameworks/kglobalaccel )
 REQUIRED_USE=|| ( alsa pulseaudio )
 SLOT=0
-SRC_URI=https://github.com/strawberrymusicplayer/strawberry/releases/download/1.2.5/strawberry-1.2.5.tar.xz
+SRC_URI=https://github.com/strawberrymusicplayer/strawberry/releases/download/1.2.6/strawberry-1.2.6.tar.xz
 _eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	xdg	3ef49a87c52c8b77c476351195dfe575	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
 _md5_=d9d0c206503933de917daa06825a1693
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 8456ab4d2d4d..14b5ffbab973 100644
--- a/metadata/md5-cache/net-dialup/Manifest.gz
+++ b/metadata/md5-cache/net-dialup/Manifest.gz
diff --git a/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r9 b/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r9
deleted file mode 100644
index fcc007c4cada..000000000000
--- a/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r9
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) >=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 test
-DEPEND=nls? ( virtual/libintl )
-DESCRIPTION=Communication package providing the X, Y, and ZMODEM file transfer protocols
-EAPI=8
-HOMEPAGE=https://www.ohse.de/uwe/software/lrzsz.html
-INHERIT=autotools toolchain-funcs
-IUSE=nls
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://www.ohse.de/uwe/releases/lrzsz-0.12.20.tar.gz https://dev.gentoo.org/~ceamac/net-dialup/lrzsz/lrzsz-m4-0.12.20.tar.bz2
-_eclasses_=autotools	7d91cc798a8afd8f4e0c6e9587296ebe	gnuconfig	ddeb9f8caff1b5f71a09c75b7534df79	libtool	6b28392a775f807c8be5fc7ec9a605b9	multilib	b2a329026f2e404e9e371097dda47f96	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=d2c72d1eea2da4184709370c8677ee88
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 617fd7683b4c..bf4541f116fa 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/ipset-7.23 b/metadata/md5-cache/net-firewall/ipset-7.23
index bd8c0611abd3..5cdfb95f8658 100644
--- a/metadata/md5-cache/net-firewall/ipset-7.23
+++ b/metadata/md5-cache/net-firewall/ipset-7.23
@@ -7,10 +7,10 @@ HOMEPAGE=https://ipset.netfilter.org/ https://git.netfilter.org/ipset/
 IDEPEND=modules? ( sys-apps/kmod[tools] )
 INHERIT=autotools bash-completion-r1 linux-mod-r1 systemd
 IUSE=dist-kernel modules-compress modules-sign +strip modules
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=net-firewall/iptables net-libs/libmnl:= modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://ipset.netfilter.org/ipset-7.23.tar.bz2
 _eclasses_=autotools	7d91cc798a8afd8f4e0c6e9587296ebe	bash-completion-r1	767861f3744f589ee5291c1698b1c082	dist-kernel-utils	97700892f3bc8ee315ee55ff5297a739	edo	367e103a74bf77e6a8da7894d999fa3c	gnuconfig	ddeb9f8caff1b5f71a09c75b7534df79	libtool	6b28392a775f807c8be5fc7ec9a605b9	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	linux-mod-r1	84b53048ef3f4ee4f1b3dce65d43580e	mount-boot-utils	2551bac1a772f4b6beacb494a750ae92	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	systemd	54bd206bb5c4efac6ae28b6b006713b0	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=2d3572c846954fb821e9faf6d30679ed
+_md5_=7f0941ab26f1892cf39d5d0c4303b772
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 31bc05979b58..86fe5daacc23 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.46.5 b/metadata/md5-cache/net-libs/webkit-gtk-2.46.5
index 0cd4700a955d..27b5053c7239 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.46.5
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.46.5
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.13[xml(+)] dev-lang/python:3.12[xml(+)] dev-lang/python:3.11[xml(+)] dev-lang/python:3.10[xml(+)] ) || ( ( dev-lang/ruby:3.2 virtual/rubygems[ruby_targets_ruby32(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ( dev-lang/ruby:3.3 virtual/rubygems[ruby_targets_ruby33(-)] ) ) app-accessibility/at-spi2-core dev-lang/perl dev-util/gdbus-codegen dev-util/glib-utils dev-util/gperf dev-util/unifdef sys-devel/bison sys-devel/gettext virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP virtual/pkgconfig wayland? ( dev-util/wayland-scanner ) >=app-portage/elt-patches-20240116 app-arch/xz-utils app-alternatives/ninja >=dev-build/cmake-3.20.5
+BDEPEND=|| ( dev-lang/python:3.13[xml(+)] dev-lang/python:3.12[xml(+)] dev-lang/python:3.11[xml(+)] dev-lang/python:3.10[xml(+)] ) || ( ( dev-lang/ruby:3.2 virtual/rubygems[ruby_targets_ruby32(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ( dev-lang/ruby:3.3 virtual/rubygems[ruby_targets_ruby33(-)] ) ( dev-lang/ruby:3.4 virtual/rubygems[ruby_targets_ruby34(-)] ) ) app-accessibility/at-spi2-core dev-lang/perl dev-util/gdbus-codegen dev-util/glib-utils dev-util/gperf dev-util/unifdef sys-devel/bison sys-devel/gettext virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP virtual/pkgconfig wayland? ( dev-util/wayland-scanner ) >=app-portage/elt-patches-20240116 app-arch/xz-utils app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
 DEPEND=app-accessibility/at-spi2-core:2 dev-db/sqlite:3 dev-libs/glib:2 dev-libs/hyphen dev-libs/icu:= dev-libs/libgcrypt:0= dev-libs/libtasn1:= dev-libs/libxml2:2 dev-libs/libxslt media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/harfbuzz:=[icu(+)] media-libs/libjpeg-turbo:0= media-libs/libepoxy[egl(+)] media-libs/libglvnd media-libs/libpng:0= media-libs/libwebp:= media-libs/mesa media-libs/woff2 net-libs/libsoup:2.4[introspection?] sys-libs/zlib:0 x11-libs/cairo[X?] x11-libs/gtk+:3[aqua?,introspection?,wayland?,X?] x11-libs/libdrm avif? ( media-libs/libavif:= ) gamepad? ( dev-libs/libmanette ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[egl,opengl,X?] media-plugins/gst-plugins-opus:1.0 media-libs/gst-plugins-bad:1.0 ) introspection? ( dev-libs/gobject-introspection:= ) jpegxl? ( media-libs/libjxl:= ) keyring? ( app-crypt/libsecret ) lcms? ( media-libs/lcms:2 ) seccomp? ( sys-apps/bubblewrap sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) spell? ( app-text/enchant:2 ) systemd? ( sys-apps/systemd:= ) X? ( x11-libs/libX11 ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols )
 DESCRIPTION=Open source web browser engine
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.46.5.tar.xz
 _eclasses_=check-reqs	2a9731073c152554078a9a8df8fc0f1b	cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	gnome.org	e1b4f392dbfedfb8974b71b017937f08	gnome2	26fd01914b36038dc8e964ff4bd03a95	gnome2-utils	a8cf148ec7f5ae0b1f1d33ae5f7f9e88	libtool	6b28392a775f807c8be5fc7ec9a605b9	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	538bce96e5589935b57e178e8635f301	python-any-r1	6ddb5e75c10db046f89ebe39c85e1d82	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	ruby-single	d1b60f2dbb45623756c128d02b2d3497	ruby-utils	a5d18cde09a96648a4d316ada2786cdb	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	xdg	3ef49a87c52c8b77c476351195dfe575	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
-_md5_=5f320031ba32cabe1aea5c7e3c46ec3e
+_md5_=dbce3fdf6e2334b3240e23f2bf6312ef
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.46.5-r410 b/metadata/md5-cache/net-libs/webkit-gtk-2.46.5-r410
index a1af337fec02..35f451cc7729 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.46.5-r410
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.46.5-r410
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.13[xml(+)] dev-lang/python:3.12[xml(+)] dev-lang/python:3.11[xml(+)] dev-lang/python:3.10[xml(+)] ) || ( ( dev-lang/ruby:3.2 virtual/rubygems[ruby_targets_ruby32(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ( dev-lang/ruby:3.3 virtual/rubygems[ruby_targets_ruby33(-)] ) ) app-accessibility/at-spi2-core dev-lang/perl dev-util/gdbus-codegen dev-util/glib-utils dev-util/gperf dev-util/unifdef sys-devel/bison sys-devel/gettext virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP virtual/pkgconfig wayland? ( dev-util/wayland-scanner ) >=app-portage/elt-patches-20240116 app-arch/xz-utils app-alternatives/ninja >=dev-build/cmake-3.20.5
+BDEPEND=|| ( dev-lang/python:3.13[xml(+)] dev-lang/python:3.12[xml(+)] dev-lang/python:3.11[xml(+)] dev-lang/python:3.10[xml(+)] ) || ( ( dev-lang/ruby:3.2 virtual/rubygems[ruby_targets_ruby32(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ( dev-lang/ruby:3.3 virtual/rubygems[ruby_targets_ruby33(-)] ) ( dev-lang/ruby:3.4 virtual/rubygems[ruby_targets_ruby34(-)] ) ) app-accessibility/at-spi2-core dev-lang/perl dev-util/gdbus-codegen dev-util/glib-utils dev-util/gperf dev-util/unifdef sys-devel/bison sys-devel/gettext virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP virtual/pkgconfig wayland? ( dev-util/wayland-scanner ) >=app-portage/elt-patches-20240116 app-arch/xz-utils app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
 DEPEND=app-accessibility/at-spi2-core:2 dev-db/sqlite:3 dev-libs/glib:2 dev-libs/hyphen dev-libs/icu:= dev-libs/libgcrypt:0= dev-libs/libtasn1:= dev-libs/libxml2:2 dev-libs/libxslt media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/harfbuzz:=[icu(+)] media-libs/libjpeg-turbo:0= media-libs/libepoxy[egl(+)] media-libs/libglvnd media-libs/libpng:0= media-libs/libwebp:= media-libs/mesa media-libs/woff2 net-libs/libsoup:3.0[introspection?] sys-libs/zlib:0 x11-libs/cairo[X?] x11-libs/gtk+:3[aqua?,introspection?,wayland?,X?] x11-libs/libdrm avif? ( media-libs/libavif:= ) gamepad? ( dev-libs/libmanette ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[egl,opengl,X?] media-plugins/gst-plugins-opus:1.0 media-libs/gst-plugins-bad:1.0 ) introspection? ( dev-libs/gobject-introspection:= ) jpegxl? ( media-libs/libjxl:= ) keyring? ( app-crypt/libsecret ) lcms? ( media-libs/lcms:2 ) seccomp? ( sys-apps/bubblewrap sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) spell? ( app-text/enchant:2 ) systemd? ( sys-apps/systemd:= ) X? ( x11-libs/libX11 ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols )
 DESCRIPTION=Open source web browser engine
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=4.1/0
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.46.5.tar.xz
 _eclasses_=check-reqs	2a9731073c152554078a9a8df8fc0f1b	cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	gnome.org	e1b4f392dbfedfb8974b71b017937f08	gnome2	26fd01914b36038dc8e964ff4bd03a95	gnome2-utils	a8cf148ec7f5ae0b1f1d33ae5f7f9e88	libtool	6b28392a775f807c8be5fc7ec9a605b9	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	538bce96e5589935b57e178e8635f301	python-any-r1	6ddb5e75c10db046f89ebe39c85e1d82	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	ruby-single	d1b60f2dbb45623756c128d02b2d3497	ruby-utils	a5d18cde09a96648a4d316ada2786cdb	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	xdg	3ef49a87c52c8b77c476351195dfe575	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
-_md5_=946a619b91c41850cb5b72361d9c25c4
+_md5_=7633aa84c909e3b2935afaea6f9eb519
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.46.5-r600 b/metadata/md5-cache/net-libs/webkit-gtk-2.46.5-r600
index 155e59129ca5..f187313eec7c 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.46.5-r600
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.46.5-r600
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.13[xml(+)] dev-lang/python:3.12[xml(+)] dev-lang/python:3.11[xml(+)] dev-lang/python:3.10[xml(+)] ) || ( ( dev-lang/ruby:3.2 virtual/rubygems[ruby_targets_ruby32(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ( dev-lang/ruby:3.3 virtual/rubygems[ruby_targets_ruby33(-)] ) ) app-accessibility/at-spi2-core dev-lang/perl dev-util/gdbus-codegen dev-util/glib-utils dev-util/gperf dev-util/unifdef sys-devel/bison sys-devel/gettext virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP virtual/pkgconfig wayland? ( dev-util/wayland-scanner ) >=app-portage/elt-patches-20240116 app-arch/xz-utils app-alternatives/ninja >=dev-build/cmake-3.20.5
+BDEPEND=|| ( dev-lang/python:3.13[xml(+)] dev-lang/python:3.12[xml(+)] dev-lang/python:3.11[xml(+)] dev-lang/python:3.10[xml(+)] ) || ( ( dev-lang/ruby:3.2 virtual/rubygems[ruby_targets_ruby32(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ( dev-lang/ruby:3.3 virtual/rubygems[ruby_targets_ruby33(-)] ) ( dev-lang/ruby:3.4 virtual/rubygems[ruby_targets_ruby34(-)] ) ) app-accessibility/at-spi2-core dev-lang/perl dev-util/gdbus-codegen dev-util/glib-utils dev-util/gperf dev-util/unifdef sys-devel/bison sys-devel/gettext virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP virtual/pkgconfig wayland? ( dev-util/wayland-scanner ) >=app-portage/elt-patches-20240116 app-arch/xz-utils app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
 DEPEND=!<net-libs/webkit-gtk-2.38:4 !<net-libs/webkit-gtk-2.44:4.1 app-accessibility/at-spi2-core:2 dev-db/sqlite:3 dev-libs/glib:2 dev-libs/hyphen dev-libs/icu:= dev-libs/libgcrypt:0= dev-libs/libtasn1:= dev-libs/libxml2:2 dev-libs/libxslt >=gui-libs/gtk-4.14.0:4[aqua?,introspection?,wayland?,X?] media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/harfbuzz:=[icu(+)] media-libs/libjpeg-turbo:0= media-libs/libepoxy[egl(+)] media-libs/libglvnd media-libs/libpng:0= media-libs/libwebp:= media-libs/mesa media-libs/woff2 net-libs/libsoup:3.0[introspection?] sys-libs/zlib:0 x11-libs/cairo[X?] x11-libs/libdrm avif? ( media-libs/libavif:= ) gamepad? ( dev-libs/libmanette ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[egl,opengl,X?] media-plugins/gst-plugins-opus:1.0 media-libs/gst-plugins-bad:1.0 ) introspection? ( dev-libs/gobject-introspection:= ) jpegxl? ( media-libs/libjxl:= ) keyring? ( app-crypt/libsecret ) lcms? ( media-libs/lcms:2 ) seccomp? ( sys-apps/bubblewrap sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) spell? ( app-text/enchant:2 ) systemd? ( sys-apps/systemd:= ) X? ( x11-libs/libX11 ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols )
 DESCRIPTION=Open source web browser engine
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=6/0
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.46.5.tar.xz
 _eclasses_=check-reqs	2a9731073c152554078a9a8df8fc0f1b	cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	gnome.org	e1b4f392dbfedfb8974b71b017937f08	gnome2	26fd01914b36038dc8e964ff4bd03a95	gnome2-utils	a8cf148ec7f5ae0b1f1d33ae5f7f9e88	libtool	6b28392a775f807c8be5fc7ec9a605b9	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	538bce96e5589935b57e178e8635f301	python-any-r1	6ddb5e75c10db046f89ebe39c85e1d82	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	ruby-single	d1b60f2dbb45623756c128d02b2d3497	ruby-utils	a5d18cde09a96648a4d316ada2786cdb	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	xdg	3ef49a87c52c8b77c476351195dfe575	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
-_md5_=a839abdfee30e6bb1611951f644bd697
+_md5_=9a945ee46a12db375b4f3ffc94489b11
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 5e09d0772fd0..6b6885ef1b24 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/b4-0.14.1 b/metadata/md5-cache/net-mail/b4-0.14.1
deleted file mode 100644
index 2d72c8e638ae..000000000000
--- a/metadata/md5-cache/net-mail/b4-0.14.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/dkimpy-1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/dnspython-2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/patatt-0.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.24[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-vcs/git-filter-repo-2.30[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) || ( ( dev-lang/python:3.12 dev-python/pytest[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pytest[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pytest[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/dkimpy-1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/dnspython-2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/patatt-0.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.24[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-vcs/git-filter-repo-2.30[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Utility for fetching patchsets from public-inbox
-EAPI=8
-HOMEPAGE=https://pypi.org/project/b4/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-python/dkimpy-1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/dnspython-2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/patatt-0.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.24[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-vcs/git-filter-repo-2.30[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://git.kernel.org/pub/scm/utils/b4/b4.git/snapshot/b4-0.14.1.tar.gz
-_eclasses_=distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=5571c95e9448e4ca476eea98d0e4a0e7
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 2126bdfc387e..1553837e7da5 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/dropbox-214.4.5217 b/metadata/md5-cache/net-misc/dropbox-214.4.5217
index 815d7910076b..eec9c65e57f3 100644
--- a/metadata/md5-cache/net-misc/dropbox-214.4.5217
+++ b/metadata/md5-cache/net-misc/dropbox-214.4.5217
@@ -13,4 +13,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-214.4.5217.tar.gz https://uxwing.com/wp-content/themes/uxwing/download/brands-and-social-media/dropbox-icon.svg
 _eclasses_=desktop	3a72ffe0d8e1dd73af3a1c8c15a59fed	multilib	b2a329026f2e404e9e371097dda47f96	pax-utils	5555f2e75744739fe100ee62c22d28fe	systemd	54bd206bb5c4efac6ae28b6b006713b0	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	xdg	3ef49a87c52c8b77c476351195dfe575	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
-_md5_=7c28953f1c226c8afab6b8c9346cce19
+_md5_=c0686fe90729011468826e2c6decf635
diff --git a/metadata/md5-cache/net-misc/dropbox-215.4.7202 b/metadata/md5-cache/net-misc/dropbox-215.4.7202
index eb69638dd078..8696e86853c1 100644
--- a/metadata/md5-cache/net-misc/dropbox-215.4.7202
+++ b/metadata/md5-cache/net-misc/dropbox-215.4.7202
@@ -13,4 +13,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-215.4.7202.tar.gz https://uxwing.com/wp-content/themes/uxwing/download/brands-and-social-media/dropbox-icon.svg
 _eclasses_=desktop	3a72ffe0d8e1dd73af3a1c8c15a59fed	multilib	b2a329026f2e404e9e371097dda47f96	pax-utils	5555f2e75744739fe100ee62c22d28fe	systemd	54bd206bb5c4efac6ae28b6b006713b0	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	xdg	3ef49a87c52c8b77c476351195dfe575	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
-_md5_=300e7a8e210b735559eeb20e20e5735c
+_md5_=420093d44e314699d72b800af1a22573
diff --git a/metadata/md5-cache/net-misc/trurl-0.16 b/metadata/md5-cache/net-misc/trurl-0.16-r1
index 7849f8c96a95..2850ea3b7da8 100644
--- a/metadata/md5-cache/net-misc/trurl-0.16
+++ b/metadata/md5-cache/net-misc/trurl-0.16-r1
@@ -11,6 +11,6 @@ LICENSE=curl
 RDEPEND=>=net-misc/curl-7.81.0
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/curl/trurl/archive/refs/tags/trurl-0.16.tar.gz
+SRC_URI=https://github.com/curl/trurl/releases/download/trurl-0.16/trurl-0.16.tar.gz -> trurl-0.16-tmp.tar.gz
 _eclasses_=multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	python-any-r1	6ddb5e75c10db046f89ebe39c85e1d82	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=ed91a09d02b5ea0864d798f5f56f1b46
+_md5_=b9890c861812746ff98d2e12e2d5b152
diff --git a/metadata/md5-cache/net-misc/trurl-9999 b/metadata/md5-cache/net-misc/trurl-9999
index 7e9640ff2fba..68c011b5e6f1 100644
--- a/metadata/md5-cache/net-misc/trurl-9999
+++ b/metadata/md5-cache/net-misc/trurl-9999
@@ -12,4 +12,4 @@ RDEPEND=>=net-misc/curl-7.81.0
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	875eb471682d3e1f18da124be97dcc81	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	python-any-r1	6ddb5e75c10db046f89ebe39c85e1d82	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=ed91a09d02b5ea0864d798f5f56f1b46
+_md5_=16c9ab56fb6077fcd8ad57a8b0160716
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index 85b66299eb8b..32a251e3ac9d 100644
--- a/metadata/md5-cache/net-news/Manifest.gz
+++ b/metadata/md5-cache/net-news/Manifest.gz
diff --git a/metadata/md5-cache/net-news/liferea-1.15.8 b/metadata/md5-cache/net-news/liferea-1.15.8
index d8d522c9022b..98061c6ff55c 100644
--- a/metadata/md5-cache/net-news/liferea-1.15.8
+++ b/metadata/md5-cache/net-news/liferea-1.15.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/intltool 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 postrm preinst prepare setup
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-db/sqlite:3 dev-libs/fribidi dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/json-glib dev-libs/libpeas:0[gtk,python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?] dev-libs/libxml2:2 dev-libs/libxslt gnome-base/gsettings-desktop-schemas net-libs/libsoup:3.0 net-libs/webkit-gtk:4.1= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) dev-db/sqlite:3 dev-libs/fribidi dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/json-glib dev-libs/libpeas:0[gtk,python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?,python_single_target_python3_13(-)?] dev-libs/libxml2:2 dev-libs/libxslt gnome-base/gsettings-desktop-schemas net-libs/libsoup:3.0 net-libs/webkit-gtk:4.1= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
 DESCRIPTION=News Aggregator for RDF/RSS/CDF/Atom/Echo feeds
 EAPI=8
 HOMEPAGE=https://lzone.de/liferea/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools gnome2-utils optfeature python-single-r1 xdg
-IUSE=python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+IUSE=python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-db/sqlite:3 dev-libs/fribidi dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/json-glib dev-libs/libpeas:0[gtk,python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?] dev-libs/libxml2:2 dev-libs/libxslt gnome-base/gsettings-desktop-schemas net-libs/libsoup:3.0 net-libs/webkit-gtk:4.1= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) dev-db/sqlite:3 dev-libs/fribidi dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/json-glib dev-libs/libpeas:0[gtk,python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?,python_single_target_python3_13(-)?] dev-libs/libxml2:2 dev-libs/libxslt gnome-base/gsettings-desktop-schemas net-libs/libsoup:3.0 net-libs/webkit-gtk:4.1= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13 )
 SLOT=0
 SRC_URI=https://github.com/lwindolf/liferea/archive/refs/tags/v1.15.8.tar.gz -> liferea-1.15.8.tar.gz
 _eclasses_=autotools	7d91cc798a8afd8f4e0c6e9587296ebe	gnome2-utils	a8cf148ec7f5ae0b1f1d33ae5f7f9e88	gnuconfig	ddeb9f8caff1b5f71a09c75b7534df79	libtool	6b28392a775f807c8be5fc7ec9a605b9	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	optfeature	538bce96e5589935b57e178e8635f301	python-single-r1	47d8ac9be330c9366112b78fd4f8ce57	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	xdg	3ef49a87c52c8b77c476351195dfe575	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
-_md5_=74e8d70b8ac211de5a771bb8fe7499d2
+_md5_=b29132498da271068832c410aed233eb
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 8bfe51600f0b..e8319c9f6494 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/airdcpp-webclient-2.11.4 b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.11.4
deleted file mode 100644
index 682ff4a8d0c9..000000000000
--- a/metadata/md5-cache/net-p2p/airdcpp-webclient-2.11.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig || ( dev-lang/python:3.11 dev-lang/python:3.10 >=dev-lang/pypy-3.10[symlink] ) app-alternatives/ninja >=dev-build/cmake-3.20.5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=acct-user/airdcppd acct-group/airdcppd app-arch/bzip2 dev-cpp/websocketpp dev-libs/boost:= dev-libs/leveldb:= dev-libs/libmaxminddb:= dev-libs/openssl:0=[-bindist(-)] net-libs/miniupnpc:= sys-libs/zlib virtual/libiconv nat-pmp? ( net-libs/libnatpmp:= ) tbb? ( dev-cpp/tbb:= )
-DESCRIPTION=Cross-platform Direct Connect client
-EAPI=8
-HOMEPAGE=https://airdcpp-web.github.io/
-INHERIT=cmake python-any-r1 systemd
-IUSE=debug nat-pmp +tbb +webui
-KEYWORDS=amd64 ~riscv x86
-LICENSE=GPL-2+
-PDEPEND=webui? ( www-apps/airdcpp-webui )
-RDEPEND=acct-user/airdcppd acct-group/airdcppd app-arch/bzip2 dev-cpp/websocketpp dev-libs/boost:= dev-libs/leveldb:= dev-libs/libmaxminddb:= dev-libs/openssl:0=[-bindist(-)] net-libs/miniupnpc:= sys-libs/zlib virtual/libiconv nat-pmp? ( net-libs/libnatpmp:= ) tbb? ( dev-cpp/tbb:= )
-SLOT=0
-SRC_URI=https://github.com/airdcpp-web/airdcpp-webclient/archive/2.11.4.tar.gz -> airdcpp-webclient-2.11.4.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	6ddb5e75c10db046f89ebe39c85e1d82	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	systemd	54bd206bb5c4efac6ae28b6b006713b0	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
-_md5_=fef3c4d4fd8980e10f08e800a4049866
diff --git a/metadata/md5-cache/net-p2p/airdcpp-webclient-2.12.1 b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.13.3
index 5667a89b17ca..8fe21a08e53f 100644
--- a/metadata/md5-cache/net-p2p/airdcpp-webclient-2.12.1
+++ b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.13.3
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 >=dev-lang/pypy-3.10[symlink] ) app-alternatives/ninja >=dev-build/cmake-3.20.5 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=acct-user/airdcppd acct-group/airdcppd app-arch/bzip2 dev-cpp/websocketpp dev-libs/boost:= dev-libs/leveldb:= dev-libs/libmaxminddb:= dev-libs/openssl:0=[-bindist(-)] net-libs/miniupnpc:= sys-libs/zlib virtual/libiconv nat-pmp? ( net-libs/libnatpmp:= ) tbb? ( dev-cpp/tbb:= )
+DEPEND=dev-cpp/nlohmann_json acct-user/airdcppd acct-group/airdcppd app-arch/bzip2 dev-cpp/websocketpp dev-libs/boost:= dev-libs/leveldb:= dev-libs/libmaxminddb:= dev-libs/openssl:0=[-bindist(-)] net-libs/miniupnpc:= sys-libs/zlib virtual/libiconv nat-pmp? ( net-libs/libnatpmp:= ) tbb? ( dev-cpp/tbb:= )
 DESCRIPTION=Cross-platform Direct Connect client
 EAPI=8
 HOMEPAGE=https://airdcpp-web.github.io/
 INHERIT=cmake python-any-r1 systemd
-IUSE=debug nat-pmp +tbb +webui
-KEYWORDS=amd64 ~riscv x86
-LICENSE=GPL-2+
+IUSE=nat-pmp +tbb +webui
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=GPL-3+
 PDEPEND=webui? ( www-apps/airdcpp-webui )
 RDEPEND=acct-user/airdcppd acct-group/airdcppd app-arch/bzip2 dev-cpp/websocketpp dev-libs/boost:= dev-libs/leveldb:= dev-libs/libmaxminddb:= dev-libs/openssl:0=[-bindist(-)] net-libs/miniupnpc:= sys-libs/zlib virtual/libiconv nat-pmp? ( net-libs/libnatpmp:= ) tbb? ( dev-cpp/tbb:= )
 SLOT=0
-SRC_URI=https://github.com/airdcpp-web/airdcpp-webclient/archive/2.12.1.tar.gz -> airdcpp-webclient-2.12.1.tar.gz
+SRC_URI=https://github.com/airdcpp-web/airdcpp-webclient/archive/2.13.3.tar.gz -> airdcpp-webclient-2.13.3.tar.gz
 _eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	6ddb5e75c10db046f89ebe39c85e1d82	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	systemd	54bd206bb5c4efac6ae28b6b006713b0	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
-_md5_=332d7464b8b145a7efd785a523399de3
+_md5_=501e1c082245811933c77b47ca387d35
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 3df63c140b34..185759db536d 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/libbraiding-1.3.1 b/metadata/md5-cache/sci-libs/libbraiding-1.3.1
new file mode 100644
index 000000000000..b0fd84bc7971
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/libbraiding-1.3.1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Expose the functionality of cbraid as a shared library
+EAPI=8
+HOMEPAGE=https://github.com/miguelmarco/libbraiding
+KEYWORDS=~amd64 ~riscv
+LICENSE=GPL-3+
+SLOT=0
+SRC_URI=https://github.com/miguelmarco/libbraiding/releases/download/1.3.1/libbraiding-1.3.1.tar.gz
+_md5_=3847e1f556fe14c70bbf8e25b78318b0
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 5b29d2065138..860a273af596 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/config-site-0 b/metadata/md5-cache/sys-apps/config-site-0
index 73a1c4fb6b1d..b408b84c320e 100644
--- a/metadata/md5-cache/sys-apps/config-site-0
+++ b/metadata/md5-cache/sys-apps/config-site-0
@@ -6,4 +6,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 s
 LICENSE=GPL-2
 RDEPEND=!<sys-devel/crossdev-20230209-r1
 SLOT=0
-_md5_=9479dd686ef399b4177de346b80fedea
+SRC_URI=https://gitweb.gentoo.org/proj/config-site.git/snapshot/config-site-0.tar.bz2
+_md5_=8029cbe4ef800cbfef66f692baedcfab
diff --git a/metadata/md5-cache/sys-apps/config-site-99999999 b/metadata/md5-cache/sys-apps/config-site-99999999
new file mode 100644
index 000000000000..2286fced895c
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/config-site-99999999
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure install unpack
+DESCRIPTION=config.site to load dropins from config.site.d
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Base
+INHERIT=git-r3
+LICENSE=GPL-2
+PROPERTIES=live
+RDEPEND=!<sys-devel/crossdev-20230209-r1
+SLOT=0
+_eclasses_=git-r3	875eb471682d3e1f18da124be97dcc81
+_md5_=befcf8192f8bb7de9f73ccb4b6b5f648
diff --git a/metadata/md5-cache/sys-apps/ed-1.21 b/metadata/md5-cache/sys-apps/ed-1.21
new file mode 100644
index 000000000000..2104f4d308e9
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ed-1.21
@@ -0,0 +1,13 @@
+BDEPEND=sys-apps/texinfo || ( >=app-arch/xz-utils-5.4.0 app-arch/plzip app-arch/pdlzip app-arch/lzip ) verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
+DEFINED_PHASES=configure unpack
+DESCRIPTION=Your basic line editor
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/ed/
+INHERIT=edo toolchain-funcs unpacker verify-sig
+IUSE=verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=mirror://gnu/ed/ed-1.21.tar.lz https://download.savannah.gnu.org/releases/ed/ed-1.21.tar.lz verify-sig? ( mirror://gnu/ed/ed-1.21.tar.lz.sig https://download.savannah.gnu.org/releases/ed/ed-1.21.tar.lz.sig )
+_eclasses_=eapi9-pipestatus	d2c134036ac31c3085aebc9147f572bd	edo	367e103a74bf77e6a8da7894d999fa3c	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	unpacker	fb4b84181244b3b9990fa0bf40232dd2	verify-sig	7433426b6b28bf2737ba4b82c8aa8c53
+_md5_=a1f091cb3fab848373f04fa1efb2fdee
diff --git a/metadata/md5-cache/sys-apps/file-5.46 b/metadata/md5-cache/sys-apps/file-5.46
deleted file mode 100644
index cfb980446281..000000000000
--- a/metadata/md5-cache/sys-apps/file-5.46
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-file ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_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(-)?] ) >=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 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzip? ( app-arch/lzlib ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) seccomp? ( >=sys-libs/libseccomp-2.5.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Identify a file's format by scanning binary data for patterns
-EAPI=8
-HOMEPAGE=https://www.darwinsys.com/file/
-INHERIT=distutils-r1 toolchain-funcs multilib-minimal autotools verify-sig
-IUSE=bzip2 lzip lzma python seccomp static-libs zlib zstd python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=BSD-2
-RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzip? ( app-arch/lzlib ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) seccomp? ( >=sys-libs/libseccomp-2.5.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( 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/python-magic ) seccomp? ( >=sys-libs/libseccomp-2.5.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 ) )
-SLOT=0
-SRC_URI=ftp://ftp.astron.com/pub/file/file-5.46.tar.gz verify-sig? ( ftp://ftp.astron.com/pub/file/file-5.46.tar.gz.asc )
-_eclasses_=autotools	7d91cc798a8afd8f4e0c6e9587296ebe	distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	eapi9-pipestatus	d2c134036ac31c3085aebc9147f572bd	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	gnuconfig	ddeb9f8caff1b5f71a09c75b7534df79	libtool	6b28392a775f807c8be5fc7ec9a605b9	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multilib-build	9ac26ea006828266d235e2f0135429b5	multilib-minimal	e9f54d75b074edc47d36994bbc1e2123	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	verify-sig	7433426b6b28bf2737ba4b82c8aa8c53
-_md5_=a98946eab60b19e718b4b52ff3e22f98
diff --git a/metadata/md5-cache/sys-apps/file-5.46-r1 b/metadata/md5-cache/sys-apps/file-5.46-r1
deleted file mode 100644
index bca9d6ba9389..000000000000
--- a/metadata/md5-cache/sys-apps/file-5.46-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-file ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_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(-)?] ) >=app-portage/elt-patches-20240116 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzip? ( app-arch/lzlib ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) seccomp? ( >=sys-libs/libseccomp-2.5.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Identify a file's format by scanning binary data for patterns
-EAPI=8
-HOMEPAGE=https://www.darwinsys.com/file/
-INHERIT=distutils-r1 toolchain-funcs multilib-minimal libtool verify-sig
-IUSE=bzip2 lzip lzma python seccomp static-libs zlib zstd python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=BSD-2
-RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzip? ( app-arch/lzlib ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) seccomp? ( >=sys-libs/libseccomp-2.5.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( 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/python-magic ) seccomp? ( >=sys-libs/libseccomp-2.5.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 ) )
-SLOT=0
-SRC_URI=ftp://ftp.astron.com/pub/file/file-5.46.tar.gz verify-sig? ( ftp://ftp.astron.com/pub/file/file-5.46.tar.gz.asc )
-_eclasses_=distutils-r1	85ccd3b54a6533fb120ee52b7c76a3df	eapi9-pipestatus	d2c134036ac31c3085aebc9147f572bd	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	libtool	6b28392a775f807c8be5fc7ec9a605b9	multibuild	4650a65187015567b4e041bb9bfdb364	multilib	b2a329026f2e404e9e371097dda47f96	multilib-build	9ac26ea006828266d235e2f0135429b5	multilib-minimal	e9f54d75b074edc47d36994bbc1e2123	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	dbf9e34ee8964084651e25907fa8f52c	python-r1	2def7a4ce233dfa344f613025c619a23	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	verify-sig	7433426b6b28bf2737ba4b82c8aa8c53
-_md5_=283af2a30b689252e5f95abccbcfd980
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 6e14f9e143e3..4174e05471ad 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/pam_u2f-1.3.2 b/metadata/md5-cache/sys-auth/pam_u2f-1.3.2
new file mode 100644
index 000000000000..b4f57d1c50ea
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/pam_u2f-1.3.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure
+DEPEND=dev-libs/libfido2:= dev-libs/openssl:= sys-libs/pam
+DESCRIPTION=PAM module for FIDO2 and U2F keys
+EAPI=8
+HOMEPAGE=https://github.com/Yubico/pam-u2f
+INHERIT=flag-o-matic pam
+IUSE=debug
+KEYWORDS=amd64 x86
+LICENSE=BSD ISC
+RDEPEND=dev-libs/libfido2:= dev-libs/openssl:= sys-libs/pam
+SLOT=0
+SRC_URI=https://developers.yubico.com/pam-u2f/Releases/pam_u2f-1.3.2.tar.gz
+_eclasses_=flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	pam	b56d0c9c20fc5b553f13c8ae165a10a5	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=2d62bf36865bff13508fc4b152a91caf
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index fb5c3b7c5500..9453586c6c82 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/gcc-15.0.1_pre20250119 b/metadata/md5-cache/sys-devel/gcc-15.0.1_pre20250119
new file mode 100644
index 000000000000..cf79cd01a97d
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-15.0.1_pre20250119
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20240116 app-alternatives/yacc sys-devel/binutils:* >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-debug/valgrind ) ada? ( || ( sys-devel/gcc:15[ada] <sys-devel/gcc-15[ada] <dev-lang/ada-bootstrap-16 dev-lang/gnat-gpl[ada] ) ) d? ( || ( sys-devel/gcc:15[d(-)] <sys-devel/gcc-15[d(-)] <sys-devel/gcc-12[d(-)] ) ) rust? ( || ( dev-lang/rust-bin:1.84.0 dev-lang/rust:1.84.0 dev-lang/rust-bin:1.83.0 dev-lang/rust:1.83.0 dev-lang/rust-bin:1.82.0 dev-lang/rust:1.82.0 dev-lang/rust-bin:1.81.0 dev-lang/rust:1.81.0 dev-lang/rust-bin:1.80.1 dev-lang/rust:1.80.1 dev-lang/rust-bin:1.79.0 dev-lang/rust:1.79.0 dev-lang/rust-bin:1.78.0 dev-lang/rust:1.78.0 dev-lang/rust-bin:1.77.1 dev-lang/rust:1.77.1 dev-lang/rust-bin:1.76.0 dev-lang/rust:1.76.0 dev-lang/rust-bin:1.75.0 dev-lang/rust:1.75.0 dev-lang/rust-bin:1.74.1 dev-lang/rust:1.74.1 dev-lang/rust-bin:1.71.1 dev-lang/rust:1.71.1 dev-lang/rust-bin:1.54.0 dev-lang/rust:1.54.0 ) )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-debug/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +fortran doc hardened multilib objc pgo objc-gc libssp objc++ openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp pch systemtap d lto cet zstd valgrind custom-cflags ieee-long-double default-znow default-stack-clash-protection modula2 rust time64 libgdiagnostics
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.11
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=15
+SRC_URI=mirror://gcc/snapshots/15-20250119/gcc-15-20250119.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-15.0.0-patches-42.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-15.0.0-musl-patches-2.tar.xz test? ( https://gitweb.gentoo.org/proj/gcc-patches.git/plain/scripts/testsuite-management/validate_failures.py?id=a447cd6dee206facb66720bdacf0c765a8b09f33 -> gcc-validate-failures-a447cd6dee206facb66720bdacf0c765a8b09f33.py )
+_eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	gnuconfig	ddeb9f8caff1b5f71a09c75b7534df79	libtool	6b28392a775f807c8be5fc7ec9a605b9	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	pax-utils	5555f2e75744739fe100ee62c22d28fe	prefix	c3c4c93ebda319c0fa7ed6f942ba1010	python-any-r1	6ddb5e75c10db046f89ebe39c85e1d82	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	rust	44c8464f6266787f32aab8b1f056a28b	toolchain	728648595eb9f2f38891bb87df0a8842	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=16cf0ddded9b57f329c10830178384f9
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index a67c12ccfc8d..be61238e7d91 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/bees-0.11_rc3 b/metadata/md5-cache/sys-fs/bees-0.11_rc3
new file mode 100644
index 000000000000..7b50451d3b22
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/bees-0.11_rc3
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure postinst prepare pretend setup
+DEPEND=>=sys-apps/util-linux-2.30.2 >=sys-fs/btrfs-progs-4.20.2
+DESCRIPTION=Best-Effort Extent-Same, a btrfs dedup agent
+EAPI=8
+HOMEPAGE=https://github.com/Zygo/bees
+INHERIT=linux-info systemd toolchain-funcs
+LICENSE=GPL-3
+RDEPEND=>=sys-apps/util-linux-2.30.2 >=sys-fs/btrfs-progs-4.20.2
+SLOT=0
+SRC_URI=https://github.com/Zygo/bees/archive/v0.11-rc3.tar.gz -> bees-0.11-rc3.tar.gz
+_eclasses_=linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	b2a329026f2e404e9e371097dda47f96	systemd	54bd206bb5c4efac6ae28b6b006713b0	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=faee6040de29a7efde71792e00a0e37b
diff --git a/metadata/md5-cache/sys-fs/bees-9999 b/metadata/md5-cache/sys-fs/bees-9999
index ccb59f2ff59e..b5251fda88b9 100644
--- a/metadata/md5-cache/sys-fs/bees-9999
+++ b/metadata/md5-cache/sys-fs/bees-9999
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure prepare pretend setup unpack
+DEFINED_PHASES=compile configure postinst prepare pretend setup unpack
 DEPEND=>=sys-apps/util-linux-2.30.2 >=sys-fs/btrfs-progs-4.20.2
 DESCRIPTION=Best-Effort Extent-Same, a btrfs dedup agent
 EAPI=8
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/util-linux-2.30.2 >=sys-fs/btrfs-progs-4.20.2
 SLOT=0
 _eclasses_=git-r3	875eb471682d3e1f18da124be97dcc81	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	b2a329026f2e404e9e371097dda47f96	systemd	54bd206bb5c4efac6ae28b6b006713b0	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=3c83b38bcb7da3a1e6e85a24559bdd3b
+_md5_=7b257b6cbb0388b58189f6d5f1f3e69c
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.42 b/metadata/md5-cache/sys-fs/mtools-4.0.42
deleted file mode 100644
index d21a4f90999a..000000000000
--- a/metadata/md5-cache/sys-fs/mtools-4.0.42
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=virtual/libiconv gui? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
-DESCRIPTION=Utilities to access MS-DOS disks from Unix without mounting them
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools
-INHERIT=flag-o-matic
-IUSE=gui
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos ~x64-solaris
-LICENSE=GPL-3
-RDEPEND=virtual/libiconv gui? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
-SLOT=0
-SRC_URI=mirror://gnu/mtools/mtools-4.0.42.tar.bz2
-_eclasses_=flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=9343d096a71ceedce5df9e8a89dec3fa
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.43 b/metadata/md5-cache/sys-fs/mtools-4.0.43
deleted file mode 100644
index 343208b38eff..000000000000
--- a/metadata/md5-cache/sys-fs/mtools-4.0.43
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=virtual/libiconv gui? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
-DESCRIPTION=Utilities to access MS-DOS disks from Unix without mounting them
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools
-INHERIT=flag-o-matic
-IUSE=gui
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos ~x64-solaris
-LICENSE=GPL-3
-RDEPEND=virtual/libiconv gui? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
-SLOT=0
-SRC_URI=mirror://gnu/mtools/mtools-4.0.43.tar.bz2
-_eclasses_=flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=2dc06eb12cef6522988cfb6cca889017
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.45 b/metadata/md5-cache/sys-fs/mtools-4.0.45
deleted file mode 100644
index 380f32ae105f..000000000000
--- a/metadata/md5-cache/sys-fs/mtools-4.0.45
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=app-arch/xz-utils-5.4.0 app-arch/plzip app-arch/pdlzip app-arch/lzip )
-DEFINED_PHASES=configure install unpack
-DEPEND=virtual/libiconv gui? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
-DESCRIPTION=Utilities to access MS-DOS disks from Unix without mounting them
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools
-INHERIT=flag-o-matic unpacker
-IUSE=gui
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos ~x64-solaris
-LICENSE=GPL-3
-RDEPEND=virtual/libiconv gui? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
-SLOT=0
-SRC_URI=mirror://gnu/mtools/mtools-4.0.45.tar.lz
-_eclasses_=flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	unpacker	fb4b84181244b3b9990fa0bf40232dd2
-_md5_=c6d06a48fabacfaad9ef28234aa24a16
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.44 b/metadata/md5-cache/sys-fs/mtools-4.0.47
index b163ebf629fb..cbd2dc8ed3b5 100644
--- a/metadata/md5-cache/sys-fs/mtools-4.0.44
+++ b/metadata/md5-cache/sys-fs/mtools-4.0.47
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools
 INHERIT=flag-o-matic unpacker
 IUSE=gui
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris
 LICENSE=GPL-3
 RDEPEND=virtual/libiconv gui? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
 SLOT=0
-SRC_URI=mirror://gnu/mtools/mtools-4.0.44.tar.lz
+SRC_URI=mirror://gnu/mtools/mtools-4.0.47.tar.lz
 _eclasses_=flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	unpacker	fb4b84181244b3b9990fa0bf40232dd2
-_md5_=c6d06a48fabacfaad9ef28234aa24a16
+_md5_=dde617435d0f98ecaa27e6eacc1b31d3
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 5687c32b3417..e324d4b601a6 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.126 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.126
new file mode 100644
index 000000000000..d4953322f0ea
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.126
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) sparc? ( app-emulation/qemu[qemu_softmmu_targets_sparc,qemu_softmmu_targets_sparc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) app-alternatives/cpio app-alternatives/bc dev-lang/perl sys-devel/bison sys-devel/flex virtual/libelf arm? ( sys-apps/dtc ) arm64? ( sys-apps/dtc ) riscv? ( sys-apps/dtc )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=!initramfs? ( >=sys-kernel/installkernel-14 ) initramfs? ( || ( >=sys-kernel/installkernel-14[dracut(-)] >=sys-kernel/installkernel-14[ugrd(-)] ) )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test +strip
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.1.126
+RDEPEND=!sys-kernel/gentoo-kernel-bin:6.1.126 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig ) sparc? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.1.126
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-136.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-136.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g15.tar.gz -> gentoo-kernel-config-g15.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.102-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.102-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.102-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.102-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.102-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.102-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.102-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.102-gentoo )
+_eclasses_=dist-kernel-utils	97700892f3bc8ee315ee55ff5297a739	kernel-build	181daddd7aea64d9ff4057bd1c7b472e	kernel-install	0b514a68b37af1d396618edfbf1dd064	mount-boot-utils	2551bac1a772f4b6beacb494a750ae92	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	portability	a39e3d646f76cb45d06b44cc1144b8d4	python-any-r1	6ddb5e75c10db046f89ebe39c85e1d82	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	savedconfig	b9131abe556ad2ea96c01b06d658d363	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=4e6d83ea8fc90073829d1bfea229a4fd
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.126 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.126
new file mode 100644
index 000000000000..b079fbf26973
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.126
@@ -0,0 +1,17 @@
+BDEPEND=app-alternatives/bc app-alternatives/lex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) sparc? ( app-emulation/qemu[qemu_softmmu_targets_sparc,qemu_softmmu_targets_sparc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=!initramfs? ( >=sys-kernel/installkernel-14 ) initramfs? ( || ( >=sys-kernel/installkernel-14[dracut(-)] >=sys-kernel/installkernel-14[ugrd(-)] ) )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.1.126
+RDEPEND=!sys-kernel/gentoo-kernel:6.1.126 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.1.126
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-136.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-136.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.126-1.gpkg.tar -> gentoo-kernel-6.1.126-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.126-1.gpkg.tar -> gentoo-kernel-6.1.126-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.126-1.gpkg.tar -> gentoo-kernel-6.1.126-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.126-1.gpkg.tar -> gentoo-kernel-6.1.126-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	97700892f3bc8ee315ee55ff5297a739	kernel-install	0b514a68b37af1d396618edfbf1dd064	mount-boot-utils	2551bac1a772f4b6beacb494a750ae92	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	unpacker	fb4b84181244b3b9990fa0bf40232dd2
+_md5_=38a80b9e302e505bbc80ecf9f3a7b8b3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.126 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.126
new file mode 100644
index 000000000000..176b90cd0230
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.126
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 6.1 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+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.1.126
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-136.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-136.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-136.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-136.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-136.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-136.experimental.tar.xz )
+_eclasses_=crossdev	f04338ff78f213a4a55c5c37b3c6563e	estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	0e01377cce73a7a06321d0ef97388d31	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	optfeature	538bce96e5589935b57e178e8635f301	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=da405c230266d9d14618e9f6e3df5998
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.126 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.126
new file mode 100644
index 000000000000..f829cb1f0739
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.126
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) sparc? ( app-emulation/qemu[qemu_softmmu_targets_sparc,qemu_softmmu_targets_sparc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) app-alternatives/cpio app-alternatives/bc dev-lang/perl sys-devel/bison sys-devel/flex virtual/libelf arm? ( sys-apps/dtc ) arm64? ( sys-apps/dtc ) riscv? ( sys-apps/dtc ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=!initramfs? ( >=sys-kernel/installkernel-14 ) initramfs? ( || ( >=sys-kernel/installkernel-14[dracut(-)] >=sys-kernel/installkernel-14[ugrd(-)] ) )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test +strip verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.1.126
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.1.126
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.126.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g15.tar.gz -> gentoo-kernel-config-g15.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.126.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.102-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.102-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.102-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.102-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.102-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.102-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.102-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.102-gentoo )
+_eclasses_=dist-kernel-utils	97700892f3bc8ee315ee55ff5297a739	eapi9-pipestatus	d2c134036ac31c3085aebc9147f572bd	kernel-build	181daddd7aea64d9ff4057bd1c7b472e	kernel-install	0b514a68b37af1d396618edfbf1dd064	mount-boot-utils	2551bac1a772f4b6beacb494a750ae92	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	portability	a39e3d646f76cb45d06b44cc1144b8d4	python-any-r1	6ddb5e75c10db046f89ebe39c85e1d82	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	savedconfig	b9131abe556ad2ea96c01b06d658d363	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	verify-sig	7433426b6b28bf2737ba4b82c8aa8c53
+_md5_=d80b9cd062762f52af867f69a1a4f2c2
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.125 b/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.126
index cd8f9f2b381c..4a44912f2a62 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.125
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.126
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 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.1.125
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.1.125.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz
+SLOT=6.1.126
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.1.126.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz
 _eclasses_=crossdev	f04338ff78f213a4a55c5c37b3c6563e	estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	0e01377cce73a7a06321d0ef97388d31	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	optfeature	538bce96e5589935b57e178e8635f301	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
 _md5_=89adf488f651c41c474d2e8cd771f631
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-6.12.5 b/metadata/md5-cache/sys-kernel/zen-sources-6.12.10
index e0773bbe8afc..4c6e5cb04950 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-6.12.5
+++ b/metadata/md5-cache/sys-kernel/zen-sources-6.12.10
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm64 ~x86
 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.12.5
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.12.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.12-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.12-8.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.12-8.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.12-8.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v6.12.5-zen1/linux-v6.12.5-zen1.patch.zst
+SLOT=6.12.10
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.12.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.12-13.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.12-13.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.12-13.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.12-13.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v6.12.10-zen1/linux-v6.12.10-zen1.patch.zst
 _eclasses_=crossdev	f04338ff78f213a4a55c5c37b3c6563e	estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	0e01377cce73a7a06321d0ef97388d31	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	optfeature	538bce96e5589935b57e178e8635f301	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	unpacker	fb4b84181244b3b9990fa0bf40232dd2
-_md5_=c51c2776bc1d02c4c503323d4a363077
+_md5_=1e21dde4a97e571683db9fb6c1315ffa
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 7ab05c5bf7ac..88f4e0ed468d 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/freeipmi-1.6.15 b/metadata/md5-cache/sys-libs/freeipmi-1.6.15
new file mode 100644
index 000000000000..955d62baaad1
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/freeipmi-1.6.15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/libgcrypt:= virtual/os-headers
+DESCRIPTION=Provides Remote-Console and System Management Software as per IPMI v1.5/2.0
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/freeipmi/
+INHERIT=flag-o-matic toolchain-funcs
+IUSE=debug doc nagios without-root
+KEYWORDS=~amd64 ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/libgcrypt:= nagios? ( || ( net-analyzer/icinga net-analyzer/nagios ) dev-lang/perl )
+SLOT=0
+SRC_URI=mirror://gnu/freeipmi/freeipmi-1.6.15.tar.gz
+_eclasses_=flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
+_md5_=5cce124f7cbb609b2e262080e9803c25
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index a229d14248dd..e218eadeb532 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	git-r3	875eb471682d3e1f18da124be97dcc81	gnuconfig	ddeb9f8caff1b5f71a09c75b7534df79	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	prefix	c3c4c93ebda319c0fa7ed6f942ba1010	preserve-libs	8692a88c92b5ae250732743932d8ebda	python-any-r1	6ddb5e75c10db046f89ebe39c85e1d82	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	systemd	54bd206bb5c4efac6ae28b6b006713b0	tmpfiles	9a9814db5a3fbd4f1e921c05297e7735	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=fb94d4c6a557fa826ae62580da6548ff
+_md5_=36eff7123f11dd83923f70560f13fe94
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 210bda817b46..6fd7e595aff6 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.1.126 b/metadata/md5-cache/virtual/dist-kernel-6.1.126
new file mode 100644
index 000000000000..91aedac2a2e8
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-6.1.126
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=8
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-6.1.126 ~sys-kernel/gentoo-kernel-bin-6.1.126 ~sys-kernel/vanilla-kernel-6.1.126 )
+SLOT=0/6.1.126
+_md5_=c61071e185cf13c7d794def8cada023a
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 44ff6a5390c3..8000d7339f4f 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/airdcpp-webui-2.11.5 b/metadata/md5-cache/www-apps/airdcpp-webui-2.11.5
deleted file mode 100644
index bfffae9ad3a4..000000000000
--- a/metadata/md5-cache/www-apps/airdcpp-webui-2.11.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Web interface for airdcpp-webclient
-EAPI=8
-HOMEPAGE=https://airdcpp-web.github.io/
-KEYWORDS=amd64 ~riscv x86
-LICENSE=MIT
-RDEPEND==net-p2p/airdcpp-webclient-2.11*
-SLOT=0
-SRC_URI=https://registry.npmjs.org/airdcpp-webui/-/airdcpp-webui-2.11.5.tgz
-_md5_=f954f6cba3fda506909b631a31aabae9
diff --git a/metadata/md5-cache/www-apps/airdcpp-webui-2.12.0 b/metadata/md5-cache/www-apps/airdcpp-webui-2.13.1
index c740b28ddaa6..36be29b8c518 100644
--- a/metadata/md5-cache/www-apps/airdcpp-webui-2.12.0
+++ b/metadata/md5-cache/www-apps/airdcpp-webui-2.13.1
@@ -4,7 +4,7 @@ EAPI=8
 HOMEPAGE=https://airdcpp-web.github.io/
 KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND==net-p2p/airdcpp-webclient-2.12*
+RDEPEND==net-p2p/airdcpp-webclient-2.13*
 SLOT=0
-SRC_URI=https://registry.npmjs.org/airdcpp-webui/-/airdcpp-webui-2.12.0.tgz
-_md5_=49678b45a9a062ff2e9998d94f406602
+SRC_URI=https://registry.npmjs.org/airdcpp-webui/-/airdcpp-webui-2.13.1.tgz
+_md5_=1d8ade6ffa80329988466efdd30479ad
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index f657c20ebf3d..5574beb1fbec 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/nginx-unit-1.33.0 b/metadata/md5-cache/www-servers/nginx-unit-1.33.0
index 9080746a9b36..d274f1c557c8 100644
--- a/metadata/md5-cache/www-servers/nginx-unit-1.33.0
+++ b/metadata/md5-cache/www-servers/nginx-unit-1.33.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=sys-apps/which virtual/pkgconfig
 DEFINED_PHASES=configure install prepare setup
 DEPEND=perl? ( dev-lang/perl:= ) php8-1? ( dev-lang/php:8.1[embed] ) php8-2? ( dev-lang/php:8.2[embed] ) 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 ) ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) ssl? ( dev-libs/openssl:0= ) virtual/libcrypt:0=
 DESCRIPTION=Dynamic web and application server
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( perl python ruby php8-1 php8-2 perl ssl ) python? ( ^^ ( pytho
 SLOT=0
 SRC_URI=https://unit.nginx.org/download/unit-1.33.0.tar.gz -> nginx-unit-1.33.0.tar.gz
 _eclasses_=flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	python-single-r1	47d8ac9be330c9366112b78fd4f8ce57	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	systemd	54bd206bb5c4efac6ae28b6b006713b0	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=8a0ed5b9ac399fc011ab5d659c204c02
+_md5_=44aace33d03d16c6f765f43b3fb2b71e
diff --git a/metadata/md5-cache/www-servers/nginx-unit-1.34.0 b/metadata/md5-cache/www-servers/nginx-unit-1.34.0
index ab2a0c9eddd5..2b9b1ba45def 100644
--- a/metadata/md5-cache/www-servers/nginx-unit-1.34.0
+++ b/metadata/md5-cache/www-servers/nginx-unit-1.34.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=sys-apps/which virtual/pkgconfig
 DEFINED_PHASES=configure install prepare setup
 DEPEND=perl? ( dev-lang/perl:= ) php8-3? ( dev-lang/php:8.3[embed] ) python? ( python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) ssl? ( dev-libs/openssl:0= ) virtual/libcrypt:0=
 DESCRIPTION=Dynamic web and application server
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( perl python ruby php8-3 perl ssl ) python? ( ^^ ( python_singl
 SLOT=0
 SRC_URI=https://unit.nginx.org/download/unit-1.34.0.tar.gz -> nginx-unit-1.34.0.tar.gz
 _eclasses_=flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	python-single-r1	47d8ac9be330c9366112b78fd4f8ce57	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	systemd	54bd206bb5c4efac6ae28b6b006713b0	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=780f4b4120c89690e5697bfba1ee9a26
+_md5_=a9f6e91b180955b50de8ee986bd32f58
diff --git a/metadata/md5-cache/www-servers/nginx-unit-1.34.1 b/metadata/md5-cache/www-servers/nginx-unit-1.34.1
index 86f36de1c4cb..9be9c930a459 100644
--- a/metadata/md5-cache/www-servers/nginx-unit-1.34.1
+++ b/metadata/md5-cache/www-servers/nginx-unit-1.34.1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=sys-apps/which virtual/pkgconfig
 DEFINED_PHASES=configure install prepare setup
 DEPEND=perl? ( dev-lang/perl:= ) php8-3? ( dev-lang/php:8.3[embed] ) python? ( python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) ssl? ( dev-libs/openssl:0= ) virtual/libcrypt:0=
 DESCRIPTION=Dynamic web and application server
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( perl python ruby php8-3 perl ssl ) python? ( ^^ ( python_singl
 SLOT=0
 SRC_URI=https://unit.nginx.org/download/unit-1.34.1.tar.gz -> nginx-unit-1.34.1.tar.gz
 _eclasses_=flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	python-single-r1	47d8ac9be330c9366112b78fd4f8ce57	python-utils-r1	42c5abe4a656a4993a06a4fc61dbdd12	systemd	54bd206bb5c4efac6ae28b6b006713b0	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536
-_md5_=5f2082ee8784667465d5bb7b9ee7071b
+_md5_=a9f6e91b180955b50de8ee986bd32f58
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 9cf74de3165b..1d55e679e9cf 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/gtksourceview-2.10.5-r3 b/metadata/md5-cache/x11-libs/gtksourceview-2.10.5-r4
index d99fec75382e..d99fec75382e 100644
--- a/metadata/md5-cache/x11-libs/gtksourceview-2.10.5-r3
+++ b/metadata/md5-cache/x11-libs/gtksourceview-2.10.5-r4
diff --git a/metadata/md5-cache/x11-libs/gtksourceview-3.24.11-r2 b/metadata/md5-cache/x11-libs/gtksourceview-3.24.11-r3
index 95dc04b4a73e..95dc04b4a73e 100644
--- a/metadata/md5-cache/x11-libs/gtksourceview-3.24.11-r2
+++ b/metadata/md5-cache/x11-libs/gtksourceview-3.24.11-r3
diff --git a/metadata/md5-cache/x11-libs/gtksourceview-4.8.4 b/metadata/md5-cache/x11-libs/gtksourceview-4.8.4-r1
index aa6dc7321d71..aa6dc7321d71 100644
--- a/metadata/md5-cache/x11-libs/gtksourceview-4.8.4
+++ b/metadata/md5-cache/x11-libs/gtksourceview-4.8.4-r1
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 44f9d61e2e9d..48ccc105d75d 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/lumina-1.6.2_p1 b/metadata/md5-cache/x11-wm/lumina-1.6.2_p1
new file mode 100644
index 000000000000..184d9a4af3b1
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/lumina-1.6.2_p1
@@ -0,0 +1,16 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-qt/qtpaths:5 kde-frameworks/extra-cmake-modules app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-wm desktop-utils? ( app-text/poppler[qt5] )
+DESCRIPTION=Lumina desktop environment
+EAPI=8
+HOMEPAGE=https://lumina-desktop.org/ https://github.com/lumina-desktop/lumina
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=plocale cmake xdg optfeature
+IUSE=desktop-utils
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-wm desktop-utils? ( app-text/poppler[qt5] ) app-admin/sysstat media-sound/alsa-utils sys-apps/dbus sys-fs/inotify-tools sys-power/acpi || ( x11-apps/xbacklight sys-power/acpilight ) x11-apps/xinit x11-apps/xrandr x11-misc/numlockx x11-misc/xcompmgr x11-wm/fluxbox
+SLOT=0
+SRC_URI=https://github.com/andreygrozin/lumina/archive/a521c780862034bf2cd18fc0b258c0541def6dc5.tar.gz -> lumina-1.6.2_p1.tar.gz
+_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	538bce96e5589935b57e178e8635f301	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	xdg	3ef49a87c52c8b77c476351195dfe575	xdg-utils	42869b3c8d86a70ef3cf75165a395e09
+_md5_=ffb62a0d84c95593637f7465d9de709d
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 1695ae152822..5b1fae9429c2 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.4.0 b/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.4.0
new file mode 100644
index 000000000000..71c2ec35fdc7
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.4.0
@@ -0,0 +1,12 @@
+BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=>=dev-libs/glib-2.26.0 >=x11-libs/gtk+-3.22.0:3 >=xfce-base/thunar-1.7:= >=xfce-base/xfconf-4.12.0:=
+DESCRIPTION=Thunar plugin to share files using Samba
+EAPI=8
+HOMEPAGE=https://goodies.xfce.org/projects/thunar-plugins/thunar-shares-plugin https://gitlab.xfce.org/thunar-plugins/thunar-shares-plugin/
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.26.0 >=x11-libs/gtk+-3.22.0:3 >=xfce-base/thunar-1.7:= >=xfce-base/xfconf-4.12.0:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/thunar-plugins/thunar-shares-plugin/0.4/thunar-shares-plugin-0.4.0.tar.bz2
+_md5_=f15173781602814a1603dcae9058ab1a
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index bdf9960f7698..fc3d8cbf0ee1 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 18925 BLAKE2B 619b70d5a6596551c44448719b24f5195e7ab5fe56d89e09f9b170e408ceccc6dc3771e6a9aa8b76d4230df211917b3ecc070fa73f911e1347460e1f4fab1bdb SHA512 8cd02bf2eb91481a32cbe19f44c71d37407312e8edcb707771e04a8ea95ee69dee17f964757d7860c748c5decec367e4ed772bb3b5f1e66500d4b0e920866d40
-TIMESTAMP 2025-01-19T06:10:28Z
+TIMESTAMP 2025-01-20T06:10:29Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmeMl1RfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmeN6NVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB8bw/6A/Bj4S8JUYBbxkiLhlAoLXvOiB/79B+3/pV64bafYsqBM7aWkKr4apHg
-3uDrHNAFgt6OcivYY/MJvXZp0uSU8mLo/ru7slmDfTBiMUHMgBEc0zPuivHRHYqW
-Fvxx9qRPlLkNxAEOcopUgSLxKRdsJKrk4GMawiJ3y6j1M9OjEOe+4JGVsHmuCxF0
-eAal9iKplWX393LK9asA4Li04tcyxKOPG0Ah3sFDBwFv2kGWM8tUVcrSZN21pgz4
-t233mrT1rta/zgALIkguYKXn7mCy6wA0PlfBxIsVv3IxS1R6huBAI4VEvZcYoK6n
-JDxyofHXieBXLWSLVHa182xm+qm15a+eYSnO+0yxd6lPQUK+bGVMvmf31mJ29s9+
-PjvHinDfxHj11eoAEHv1ZSLSbBSxwIWjsCOYG4obidm16VarmpvLzc2tDIjZdMwj
-G7rcRlfdjP8Rsct9KYuu2YA5X12Pu/iC0GCJ3eXGQ7rc5klAcppV1pNmYCXEEwKq
-kwkj90N9NHwtQgWCaSpmvt6o5PbW3TR1o2jOBEqP75HKcrO8Du4vao6MeXQau0l8
-tVGLk8g7OhS2dp+S3rl6bgaNu9zE8w4nUFj6YsG/2Faj73sHoeRbzS++C4m9UxHB
-jElTq2u/TQZCduiY5uvTyp5FNuuef7BrO38+sPUhek0LJ9kklrQ=
-=GKu+
+klD2XhAAoE8q4ecKoZuG2hsIMq6WFQtBRUwNAfI/993EEy+TvgVSosHEILrDCx6w
+K7vYDM+188yDDJWd9PhsJAew7K7p0e0jUQ5A8Gogrjtw1CcQ3w/LuCbPCuQr8v+x
+ij2C7kM+gbtK2w04nU05+qGzJClokppIc+Vf863F2oSorpayjviuUoYFBNACdBbD
+wPeW8oXuyNk+HCiyRvTQa2ZHeXSTStP6U4Dbh+dvlHwcOOG+3zvnIGEekCthQ4Wo
+0uweUOccan02ex6GG7ytJxlgisHe9PXh96JcLRQPD3WiI/pF9Ua7+UwtjTV3FRcD
+poHoXXW9rH8sRk+TOoAlxQMaR+C5McEiQppXdrsjaV2xvMfHOfsLXL2pBcO+0CwI
+ignm0ULHI1gpGmXpbAW2aj+fPZMT1sKY1x+l2Udh+8dXL8YUQ+TqLPhg354acJ3v
+fEY1HmYpQfHfsbY4vlZhbonavoTfkSXDidzIfi9eCm6MqWFdqgH2iiRgE9/7Ye8v
+FWtwxxMd10up1NChKZ6t+DFyAmixgILgbtKfLiRJtAQmixcCYrIzUA2dEHuhIPKn
+EQZ4vwqiHrBn+i1YtVMAL0PplV5QPrOc3zC1fq0sFeslUki0oEB3XBW5V5Oh2T2U
+gxrsi+P21HLSg9/IXpIFK3s0h4lSXmVg2ndk+R2XjwN0Nsum3oc=
+=hpDW
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index e6c8cb6397f4..efe95a30eea5 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 19 Jan 2025 06:10:23 +0000
+Mon, 20 Jan 2025 06:10:25 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 15b387c0f7e0..88df02459353 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Jan 19 06:10:22 AM UTC 2025
+Mon Jan 20 06:10:25 AM UTC 2025
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f0a9a1c52b09..bf06cc61915b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 19 Jan 2025 06:15:00 +0000
+Mon, 20 Jan 2025 06:15:00 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 3bd059e2af88..eae86a5a7155 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-dcc5213955fa7ce1b978166159e69fb622f9012a 1737257232 2025-01-19T03:27:12Z
+8987206790e68354c0b3f7e9af3dd2d6161ac4cd 1737351256 2025-01-20T05:34:16Z
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index ef9d75ff06c6..d80e7d9b63d6 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1737267000 Sun 19 Jan 2025 06:10:00 AM UTC
+1737353400 Mon 20 Jan 2025 06:10:00 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 334e041ea3cd..efe95a30eea5 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 19 Jan 2025 06:10:22 +0000
+Mon, 20 Jan 2025 06:10:25 +0000
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 8845e20436a9..9e202d467789 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/lrzsz/Manifest b/net-dialup/lrzsz/Manifest
index 4a8db257ca38..76fce56769b5 100644
--- a/net-dialup/lrzsz/Manifest
+++ b/net-dialup/lrzsz/Manifest
@@ -12,7 +12,5 @@ AUX lrzsz-autotools.patch 8725 BLAKE2B 8f499974f0184784d1e800a43e8fdd09b389bb2a2
 AUX lrzsz-implicit-decl.patch 428 BLAKE2B c08a244d292be32bb49fff6186cbe847c106dee67b3ea463860d1e6387e159af1b106e5f78ea5bce31c347cb7207c95116243fa515e4daafb23d2cc309776480 SHA512 7dd642aa6701671986e6ab1635935c7a8088ad5ee74131b7c486e2e87d748fc835798d1a8a291e85a80ba3f88328ce4f293a8dafb1ebd9924f1f31fb2bd3a7d7
 DIST gettext-0.19.8-runtime-m4.tar.xz 26092 BLAKE2B 671c43cbdc393658c0f9960cf6b743b5126a52ff0a87dbd8a59f6a8c398eecfab7509421d6e01096d73e40f2feb7b2bc229822c4d475d91a703c941134a506b5 SHA512 a5e5a64c7e2bd1a0fa6d426ff72a286027451ff034050541a92ba5a4d7889f925e4674e1df89e0c7e9657329209284995afcb0180a2e441136694556450e4edd
 DIST lrzsz-0.12.20.tar.gz 280938 BLAKE2B 86511ab112da849f5894f18c045f2c8a9dd4c4e97426c1d98c5b91aade6c39e26f4a7e5674e057c9596a240dfd3ef32053fcdc8ee58b33654cf15eec64779b1e SHA512 9bce64036f1f1c65f5910f19802aecaf3dc5ffeab0feeca10fa8d2fe1b83e212391cce23056d22fd0eda52df89e12ede68eb5d22ffcf22f935910d2af7399f12
-DIST lrzsz-m4-0.12.20.tar.bz2 23959 BLAKE2B 933e43f80a40478baef77d69f81fcb04947f2d0afb87f777b0c000ea4223408bf3e55d687cf625ab4835fb30e274f7058ff09ee3b51ad90e09723cd3053ee038 SHA512 c8818381f2e5271bc2dd7d469c0a33a6b22d42d3159b41f168223473a8b03322f3ff91a49ce398e3ef5abe7b355d92b83b1429d0c6d450d19985a60e2e1190d4
 EBUILD lrzsz-0.12.20-r10.ebuild 1956 BLAKE2B 48e83fbde8f0d90a9e475ae23c8ed4ab0c9ca562434b3bfc433c5767c9042abd86e1979a7997d869677d8d9420a14dc87dd5789e24c321f06df774981b7899c8 SHA512 15e7b09aae5e7c45409bb3d87d4b8d394da9c475519a72850daf9b9a15290dea5d9ecefd36d83947c81cb9c27fb2f9ea2685ec916c76b05930989bb8d09336b6
-EBUILD lrzsz-0.12.20-r9.ebuild 1916 BLAKE2B 8c0ca5cda2f8a0ebe8c5efb1055a0042bf7a0a1efff4426f7cbb19f4fdb0441e59832680e7498fb4aa377a867c05c12dde6ab6166afac7f713d0b9b37b37637a SHA512 75bd2245d5975e8ecd6a74635f7e18f5cc5ec7d779c088008624e9f68ac6662a3b8f6331fd10458aa9636d60f6fa6aa03b5bd299f8b052aaa94072f94c087425
 MISC metadata.xml 333 BLAKE2B df605c89da2e450f542b023df0a51e50a6177752593c7b2e97fab91cade3550cb0a93ebade7edcd4e4569853987b57449226709d6fb96643a5057e2e80d986ae SHA512 806f343912c267d02df9ab3715f57a63c6457db97f67c0737114533fb99bf94ab2f8ebe5da839f4b19993d6d705be6efc549783d42100ee49b77e57ffbda7908
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r9.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r9.ebuild
deleted file mode 100644
index f9405537db43..000000000000
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r9.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Communication package providing the X, Y, and ZMODEM file transfer protocols"
-HOMEPAGE="https://www.ohse.de/uwe/software/lrzsz.html"
-SRC_URI="
-	https://www.ohse.de/uwe/releases/${P}.tar.gz
-	https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-m4-${PV}.tar.bz2
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="nls"
-
-DEPEND="nls? ( virtual/libintl )"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-autotools.patch
-	"${FILESDIR}"/${PN}-implicit-decl.patch
-	"${FILESDIR}"/${P}-automake-1.12.patch
-	"${FILESDIR}"/${P}-automake-1.13.patch
-	"${FILESDIR}"/${P}-gettext-0.20.patch
-	"${FILESDIR}"/${P}-AR.patch
-	"${FILESDIR}"/${P}-configure-clang16.patch
-	"${FILESDIR}"/${P}-gettext-0.22.patch
-	"${FILESDIR}"/${P}-disable-nls.patch
-	"${FILESDIR}"/${P}-c99.patch
-	"${FILESDIR}"/${P}-fix-integer-overflow.patch
-)
-
-DOCS=( AUTHORS COMPATABILITY ChangeLog NEWS \
-	README{,.cvs,.gettext,.isdn4linux,.tests} THANKS TODO )
-
-src_prepare() {
-	default
-
-	# automake is unhappy if this is missing
-	>> config.rpath || die
-	# This is too old.  Remove it so automake puts in a newer copy.
-	rm missing || die
-	# Autoheader does not like seeing this file.
-	rm acconfig.h || die
-	# embed default m4 files in case gettext is not installed
-	mv "${WORKDIR}"/m4 . || die
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-
-	econf $(use_enable nls)
-}
-
-src_test() {
-	# Don't use check target.
-	# See bug #120748 before changing this function.
-	emake vcheck
-}
-
-src_install() {
-	default
-
-	local x
-	for x in {r,s}{b,x,z} ; do
-		dosym l${x} /usr/bin/${x}
-		dosym l${x:0:1}z.1 /usr/share/man/man1/${x}.1
-		[ "${x:1:1}" = "z" ] || dosym l${x:0:1}z.1 /usr/share/man/man1/l${x}.1
-	done
-}
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index e5593a427fc6..0d0f74a50c5f 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 47329c949a56..b03299e5a0cf 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -8,5 +8,5 @@ AUX ipset.systemd-r1 492 BLAKE2B 78fd7b122e0fe08b36d36e736d18b7a5f0bf1aa78802f1b
 DIST ipset-7.22.tar.bz2 694069 BLAKE2B 9daaff54adb6f9daf69cd7dabbd9134d8fcf8cd7f8ef0c52296961579ad3c8202087158a01664228eff70356ba97f77ec61abbab7c7ce323112fbdc32abd661b SHA512 e375a9110eb7974480147c57eb2cff4bdd03c7704cdae006a3d254cc80fada587aa8aee25a86f7cab29db83f5e283c5f9a47a314297317660ebba5097f623d79
 DIST ipset-7.23.tar.bz2 695655 BLAKE2B a596630d12a8bcc1383475627e5e62b7be4c17570ae9d3650b9dbcac0ec46324e1ac7c0e7e11f674fb5354871538f6f15e57476ac752b1ac1415023d837904e6 SHA512 5a43c790abf157a55db5a9a22cb5f28a225f5c7969beda81566a2259aa82c9d852979eb805b11b4347f47c6a0c2cc4de6f14e4733bee5b562844422a45fb9dab
 EBUILD ipset-7.22-r2.ebuild 3567 BLAKE2B e3775ef8927c1bd96d30064e04c9302d4e3025cbd6b9c73af9b2f65956a198b2164b9c9903eb9f0bc49122c98df0c89de12e970610f3de88118da93fccc9cabf SHA512 11d975b834bf0b376396a88265b8f65c3fbbb442c02826292926a6e31e045eb7ff2bec4447e11deae76e55b75cf3424b227999bf6505465f89977f673ebda897
-EBUILD ipset-7.23.ebuild 3439 BLAKE2B 16b29300ee71dbd9971cd4b471f5dea73e8c8a9bec5213a9b98f728cfc0f134875b59d8da5512f27459c524ea3d84bd774220288c1a4e39070ffd3b5095c7ad1 SHA512 cc41fee6e8f08ba3160b19374eb166958b9e7ac785ac5761198397c7af97be7aedd82472b07752d2d711ba6fd485c56abf38d96f83b7822cd06144c23808142e
+EBUILD ipset-7.23.ebuild 3433 BLAKE2B 75331e5aef92ecb3dcb2492ebd44c188f020d6f2740e76b9b50ae6513c1088a307452b5bd3505857c6ad6a8154cb9424890b0df6ade01d28a92b6fd05240357c SHA512 757f1363cae266639269e5861e54c4cb27fdfb62ceab9c165fb1bc5a187e0b722647aa5da44941755bac2a4ccb7cb158619cc358af2307f1f7c6c46b6ab58be6
 MISC metadata.xml 475 BLAKE2B e1e06003a410249ed76d39b74ccbcd64b8572ff05f1c818729d787cecfb19cfa9c7e3463473688abc7a398efb908b0c7145bad88bbb7259e69f1b7d985584bcc SHA512 d0a3dca6593e8a62cbf5c325eb59b620137af8d8f5a463702c4d6ec102fd03b8adbbdcd9358777d0461f57a98d892d359d80b8f722d3f322f3d4766d762f6585
diff --git a/net-firewall/ipset/ipset-7.23.ebuild b/net-firewall/ipset/ipset-7.23.ebuild
index 00688b5a1675..431969f5d7cd 100644
--- a/net-firewall/ipset/ipset-7.23.ebuild
+++ b/net-firewall/ipset/ipset-7.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	net-firewall/iptables
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 654d1c167a88..36d79980c158 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index c164a95db89d..ced69a5a7e45 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -5,7 +5,7 @@ DIST webkitgtk-2.46.5.tar.xz 42898600 BLAKE2B 04f824f9864749c13810318c06e5da9026
 EBUILD webkit-gtk-2.44.4-r410.ebuild 7909 BLAKE2B 637ade4977c2abc8806dd6dbe7478ac553dad8afdca52b6462b05fdd55e0541dc7ac009341ce603332c0db99cfd613b23a15ecca33c276ca0e1ea99aa6473b89 SHA512 49bb6abae1f14df378b704539f22807d139221901d896f591e5034f237bcfc19bc23432e3ee84709d25677f9b6d4c5095919d0ddf451020198d69226f324ce18
 EBUILD webkit-gtk-2.44.4-r600.ebuild 8650 BLAKE2B a8fac804c760d959abb0db55d197122023e481423911f59bdfdb702ebd7457eab924ff33f485bc9324ad430dfbaa53b7e21b7a5a83c84bb9083945c6e416cf9d SHA512 1206812c90a0236850bfd2ca0cdb2e45d86df75bb1a275ca27832b7b8fbbd17f8da63ccbf67f17fe76065aea49f39de70adf72f71feadc66aa5429d374a490a2
 EBUILD webkit-gtk-2.44.4.ebuild 7757 BLAKE2B d235cc4dc49fd8bae7930e52a8775096cd7e5517e5adecbf37fdff2a8f6538134fe77398a64f1ba204d605b5137f911eeeeb7ba4ba630ba719b06c6d3d07d512 SHA512 1bc2fde1b201baa0559f0cb5decb6ad63e85fb058965471fc399d83fb7f367ed2d88239a7779a96e1438574f6a075034c68a4ef2026131b877dbfa354db313e6
-EBUILD webkit-gtk-2.46.5-r410.ebuild 7885 BLAKE2B 55662ef153b262f7f168f9b811b19ae28fd19dfa8cecce7cfd1054d49248b66295887e3b4a2123deb61dde685c8d948c09ba2c72f1bd2e77dd26a16935dbd725 SHA512 5c7c0e6c9a86710607ad8b10bb85d856b422d354f5eeb85badcb3edd93ebf45e2ae8003c2f899ac54402b4fc86058311819327f5e13dd39d3c3c1bc2a5291642
-EBUILD webkit-gtk-2.46.5-r600.ebuild 8629 BLAKE2B 52567f387a6a9835fcf6b11d378a74a211af1f33bf701c692207515c9dc8903da9e2d5dd5b38103027a68f41d6aad987cf7e98bd8f1616c753e07f9cf5d5423a SHA512 26a5727d5f7ab5cc39d7fbab3e56521df16ea92e9cecba52c4c81f841a1a5b1e1e56b6bc37684cf124d602c2f3c0398334cbe833bd4cad7e1d418867cde451c2
-EBUILD webkit-gtk-2.46.5.ebuild 7883 BLAKE2B ced4a4d3309aa3c90408956a87a2e32bc305fbc0efae87b3227ad96c1187e184048c7a777c54fbe2efa9bb48cc9e4caa56f971642e080a4cfd0e34432a82e49c SHA512 4e20e0e72033934bb72267329afe7029a62c867ab5e82fe15e50a0c41b648268055e16368bca5f74c56d9c9dc8e9521d3c5600ae707431fe898ed51095e3eb30
+EBUILD webkit-gtk-2.46.5-r410.ebuild 7892 BLAKE2B 52f06efd6a196704598721a538246d2f4dffff96dda5307978369db4b8a18d04ae6b017aebedf426476cfdf7affbe89bd6313c438258ef47d996b1f82c0ea184 SHA512 8a0c5da10a47353f91659f4d5eb6684eeaa2a063a3ad1565333029544912f47345d4b58a7f26d1c5ce7f8495ecaf7a46fa6472293dcb8f1baab253c94326ae95
+EBUILD webkit-gtk-2.46.5-r600.ebuild 8636 BLAKE2B fb5c0507d1abfa9ef060a1ae95dfcd6a49d5ca947eebf7377deccee8efe2ad51096a96283c483d7ced25f408ca670d44bbe1571a85d86d18729c52e3ac6b52a3 SHA512 9c8e0b0a9ea2c6239aa1017f90ab5a877d5af551990eb20ef303400d4d776093ac660ba1f8b3532454b669b55df0ab8b143f86ffafc508e3ac0e97e9df450292
+EBUILD webkit-gtk-2.46.5.ebuild 7890 BLAKE2B 60ad0e5ba9c1109612722a18639b71d038820d66edbe8a701803b3bcd09b3e12df1e53fc25a1fbc97dc49b19ebeaf1ba1c2e51e794fcdd6fec6cb9be634e6b82 SHA512 fdc096cee0557b34e8566e4b743217bf9fb324f4e0f88c697aefe7057ca37e0bbbca21d2889190d14f8f2003c3c5a3bdac1b806cbd49e29cf6146fa22e0b9e62
 MISC metadata.xml 615 BLAKE2B 5527ca0439e337193601d221df1b5f9b85c6f4ea0b0867fe8ac0548307672de45fe956fe61c0044b778644c8079271eba565854ab041ce45738dd98a9b3db39e SHA512 4681816de7821ede7c252e62a4cb29ee5c6e88f1799972a7325b40ed1998f9462835ca38c42dc65eeac4c0bcb0d672593af857fcf442cced865bdfdefe063eb1
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.5-r410.ebuild
index c2c81d0400bc..e3bb04a8eb6b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.46.5-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.46.5-r410.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 PYTHON_REQ_USE="xml(+)"
 PYTHON_COMPAT=( python3_{10..13} )
-USE_RUBY="ruby31 ruby32 ruby33"
+USE_RUBY="ruby31 ruby32 ruby33 ruby34"
 
 inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.5-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.5-r600.ebuild
index 2c9364b16a9f..f9115674d7d8 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.46.5-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.46.5-r600.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 PYTHON_REQ_USE="xml(+)"
 PYTHON_COMPAT=( python3_{10..13} )
-USE_RUBY="ruby31 ruby32 ruby33"
+USE_RUBY="ruby31 ruby32 ruby33 ruby34"
 
 inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.5.ebuild
index 7cc42be9dc2d..65c69ce20ad7 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.46.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.46.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 PYTHON_REQ_USE="xml(+)"
 PYTHON_COMPAT=( python3_{10..13} )
-USE_RUBY="ruby31 ruby32 ruby33"
+USE_RUBY="ruby31 ruby32 ruby33 ruby34"
 
 inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
 
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index a9844b0acc39..186fa486166e 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/b4/Manifest b/net-mail/b4/Manifest
index 5a2a7bc02a3b..5518d97a4cb3 100644
--- a/net-mail/b4/Manifest
+++ b/net-mail/b4/Manifest
@@ -1,5 +1,3 @@
-DIST b4-0.14.1.tar.gz 268141 BLAKE2B 128a061600aeea7c0b05fc69ad1e36be55086dff4b66e1456151fae375457dcd60113a4bc1335878227fb86763d0d1ed74f103c683f17634e80cb4c6fedbe078 SHA512 6e77d9e7e49fee5ccada275ceda51280310bf71f17e910d30c4b9e6346cf7595563c5cc489963e0cb16aa68606e7ba8050ead19454c294469820fbf30a948c36
 DIST b4-0.14.2.tar.gz 268868 BLAKE2B fe9d9be83163084659c7a68ce5791d3a680abdfa6e1c1d0c14468bac5e58d702e6f2ae19418cd7b92509cbec20952cb8411bed04a73b03c01f5171c157d66312 SHA512 8883fe0d198870c77665e1febbdcca44a639ad564b526f3c1a1f32559cbffacb555a1b6e6ab15b2c775ed0d82042f4ad775e356317af8bdae4f31f21e6602f7b
-EBUILD b4-0.14.1.ebuild 854 BLAKE2B dab6f09bed672ff3ca9c6266c50fcec61d22c7425003d978b3a7e1d63f2e5a88e226c882f9254966896f181b2b3299014acc5154a9118915cc0ad43660ec95d0 SHA512 02da87ca3e41b24a7ed7d2a00be9c20e1f69428405ed89fe3d536d15a2a3493ca4b00a476a7d8a238187e21d03ca8e6390f5818f34fe7c0946f5214ce68c115c
 EBUILD b4-0.14.2.ebuild 854 BLAKE2B dab6f09bed672ff3ca9c6266c50fcec61d22c7425003d978b3a7e1d63f2e5a88e226c882f9254966896f181b2b3299014acc5154a9118915cc0ad43660ec95d0 SHA512 02da87ca3e41b24a7ed7d2a00be9c20e1f69428405ed89fe3d536d15a2a3493ca4b00a476a7d8a238187e21d03ca8e6390f5818f34fe7c0946f5214ce68c115c
 MISC metadata.xml 446 BLAKE2B f96eb9538edadca533c06e394bd1e1f2757d18047a1fc2a213a1dd570477998f84fef0f953156de3c77887413246bd8253273decd4c5187034dfefd1343f8eb4 SHA512 b52ef601316358ef314cb2c96ad94b8e36ec7f130006d391b9854c2ddac94840c306c3e2c474690906226011615cd9739b24b9942ae837948c337698fe70f170
diff --git a/net-mail/b4/b4-0.14.1.ebuild b/net-mail/b4/b4-0.14.1.ebuild
deleted file mode 100644
index 793028281105..000000000000
--- a/net-mail/b4/b4-0.14.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-inherit distutils-r1
-
-DESCRIPTION="Utility for fetching patchsets from public-inbox"
-HOMEPAGE="https://pypi.org/project/b4/"
-# pypi lacks tests
-SRC_URI="https://git.kernel.org/pub/scm/utils/b4/b4.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/dkimpy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-2.1[${PYTHON_USEDEP}]
-	>=dev-python/patatt-0.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.24[${PYTHON_USEDEP}]
-	>=dev-vcs/git-filter-repo-2.30[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index e8e2507382fe..30e72d07023f 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 74a2563b8c17..4a4c1ad77f44 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -4,6 +4,6 @@ AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a521
 DIST dropbox-icon.svg 574 BLAKE2B a73a0906b5b03dc3214010736164fcdbceb6d91463ed95133b5117277cd635c8a77ec3e7ca8338538e5a6a2c4a23f3ef0186184bc1dc770b3c7f3a219f00faa6 SHA512 cd7ad8fea652f0713a00e7fbd88d6c22949dde216040f2ba7c903db70cb6c5c9ec85202831c0863c3bb2cf339b4ea0c6731d7b2d56750b63a4f36160815e4346
 DIST dropbox-lnx.x86_64-214.4.5217.tar.gz 112333087 BLAKE2B e787a4a26e7f5cdf26aea10d1d13799751231534a94893e39a2537a1bb85c64dba4b5ace222885c5b754bf7a27c49c5b0433551854b3395e5b67cf00300a79db SHA512 0cd69a509909592073e00a784e71a4a38c15441b8ca9a39167e5701a08c3d8d7f1e7bdec90b4211dc6ab0ca79f35f77f2a9f734a1c23bff63b81068b51cce163
 DIST dropbox-lnx.x86_64-215.4.7202.tar.gz 112251332 BLAKE2B 8c9ad1d79e71bc8ad1e2a91453333d5b002196f0a309a7505e4fc0fa82704654f21e5896f1082a1d85acc7ef67c9edbc9c80f6b16d655772f0aafbaa56f5353c SHA512 711327f51d7d6a176607dc7704ca5358885c9546ac476b34d0d1dbe293f50baac139f442dc694a50e842ba08a9312ea81fc73921d7d1dd4bf26407ac5cb06acf
-EBUILD dropbox-214.4.5217.ebuild 2714 BLAKE2B 78a42c7a3631d96c21b45cd35aae4aaa6d1c14c21c4edaa57eaf03dcdb031068863ea344e138d2096dbadbd7219054ee92e37355be41f563d3412f584ee4eb51 SHA512 814853c0d4029da4461fd51eca31b8aef9e693a84d130bac5624b7eedeb6a835610799337ed21d3e6c111fbba6ed5d6ee6e11e05dba2e9c5aec30648499502de
-EBUILD dropbox-215.4.7202.ebuild 2715 BLAKE2B a666189524674667966e3144d65726052a8fad6f034660a932a4726f19860bff861526078eb68f19b8ca8366ab5af3e043de89f02bc988318231a3adf7634e7c SHA512 e4e2545b5800379acfc92416b7840b72f03f53c269c5ae82a40a9d69ef7b167fe2060afbba7c1364f7d2ad67a7b0a08a17879777c52a7748014e57e4d815ba8c
+EBUILD dropbox-214.4.5217.ebuild 2733 BLAKE2B 5d6167b5049d86e59db41b704f999e3c6984a241bee50fdeffc93d585228e782ec86010cd550f6c3964322434345d2845d057a8f86a97be98785e2f4c823b174 SHA512 8e9be4d622d64c1c92f3563e032243a147dbd868f17a7c84dc3c3dc10c9936904dd31eaad2383284f6686a7e21d3051bac2214c96527bc532aa2098e72dae41c
+EBUILD dropbox-215.4.7202.ebuild 2734 BLAKE2B 8e6b1d63343edbe6beb530049237ee5f6b123688dc04147152c8ef12171a6e2dc70177ec36557db13a26fda8803adc1e0ada615f37701ed3152e67d3a921c4ee SHA512 8876eddde064d6ddcb1580b8a3190828dfa059cad037507d5d13573a46aa6c509ffe68901e9860eac748b0a99f0cb4308b55756d1e96e06aa93a3b05f1318428
 MISC metadata.xml 336 BLAKE2B 0932d5cb97ca50abfbfd49b3b209733da73c94ed41ef1087e6c43c4e65f3a09186f74c507cf0db5d64a1c5231d3560a7d6a8bb6130e95e1d5dbb7f3974801df3 SHA512 25bee9aa1ab64f01bb4544dec14b4b98bcb3877714ec33c6cbed4cdd3362d2a4cab58f425cad3723398e4ee0a2ba16a550ab38ff9f974cd0c5046df1b34b5eb0
diff --git a/net-misc/dropbox/dropbox-214.4.5217.ebuild b/net-misc/dropbox/dropbox-214.4.5217.ebuild
index f639cdd4db8c..1cc4d0f0e51e 100644
--- a/net-misc/dropbox/dropbox-214.4.5217.ebuild
+++ b/net-misc/dropbox/dropbox-214.4.5217.ebuild
@@ -101,6 +101,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	xdg_pkg_postinst
+
 	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
 	einfo " your user's home directory.  To prevent this, run the following as"
 	einfo " each user who will run dropbox:"
diff --git a/net-misc/dropbox/dropbox-215.4.7202.ebuild b/net-misc/dropbox/dropbox-215.4.7202.ebuild
index afc5b3e0496e..8bce8f921402 100644
--- a/net-misc/dropbox/dropbox-215.4.7202.ebuild
+++ b/net-misc/dropbox/dropbox-215.4.7202.ebuild
@@ -101,6 +101,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	xdg_pkg_postinst
+
 	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
 	einfo " your user's home directory.  To prevent this, run the following as"
 	einfo " each user who will run dropbox:"
diff --git a/net-misc/trurl/Manifest b/net-misc/trurl/Manifest
index 551ca5f7445f..3456a4bc4a37 100644
--- a/net-misc/trurl/Manifest
+++ b/net-misc/trurl/Manifest
@@ -1,4 +1,4 @@
-DIST trurl-0.16.tar.gz 54414 BLAKE2B ace93c0ec54e81131bed91a78092bb5a2768a92cf2dee763f29327221a2b5ac3f657c7500e1f1cb895a29c1dd73500c15140eaadede72a6ee57a31d7ebe5c414 SHA512 4411769ba36109dc0e0c27ff605b7b6eb9dc9da3ab53290dc0049f44d853f7363699a9e22716dbf4c2d912f5c0c1556ea0d14f55475f44b48ea2e320b00a75e7
-EBUILD trurl-0.16.ebuild 1024 BLAKE2B 2e3bbe81f7ed22e19df021e07217f0472ffee451092d37ec0c9ebbcaba6ae76eab524c5a5657caae2aec3c2ae18d40da106b6b46c2e486a27bf3530518e1d513 SHA512 ad7efdda7fb83432ceca5174138f9d4b329c2977e785dd9461c22fd67fa37dc8fdf744da1ab31f7b298c836b7a62e50bb04651f4294643f1c107f7ef4626274c
-EBUILD trurl-9999.ebuild 1024 BLAKE2B 2e3bbe81f7ed22e19df021e07217f0472ffee451092d37ec0c9ebbcaba6ae76eab524c5a5657caae2aec3c2ae18d40da106b6b46c2e486a27bf3530518e1d513 SHA512 ad7efdda7fb83432ceca5174138f9d4b329c2977e785dd9461c22fd67fa37dc8fdf744da1ab31f7b298c836b7a62e50bb04651f4294643f1c107f7ef4626274c
+DIST trurl-0.16-tmp.tar.gz 59327 BLAKE2B d349cf57eb4ad048a9d4a15aac0d0f9e6e577f379eb97b21530d2e080d78e1cb333aca7625805e0e6e555f356bad985e0961c43d499d02b9369b505b8c8d2757 SHA512 da4f7afd4a0685037549543ece23ad30d8f98ed9613d9050cbb269524ea4242d097bf74f7642c386d664eb2f24aff910f3cae9c8efda0e6a4f6a2a644a8c82f2
+EBUILD trurl-0.16-r1.ebuild 1196 BLAKE2B 0c2a268c68d59fc310ffd407dac60261c3e496ebdefb70318d171a20b6d1c0f0f5b62897e3ff61c9051b655f6e14e6b492af87abe9e14078d1682f1030988903 SHA512 82dfefc71323013ac16251dcec37bdb9de6374f57defde35f3f12139b39d207775571a378d8d1b267d508d5975e56032015d99622eff7eec3e3582f21f88a39c
+EBUILD trurl-9999.ebuild 1001 BLAKE2B df4426f5b9958af6b2b219373e82d7769f9701b94310030cb07505743a1febd19125bee2cd2a2048f10608e0ba58c1f041e317c0f8a8f6840f5d10375d578d65 SHA512 f56b9bebddd039c0f3c65dc7295d390f34714f64223458bfff3af13a73bb6e512f85c4de6b0b8586e296c58c43704a1ca2a8e9b68e328aea438c8245f986fdc9
 MISC metadata.xml 315 BLAKE2B 4ae563841f80987d7156bfa13ab36c79f42b60d598dd5425cd877489f874e09cf8d13fa858b1ddb476cebc6a9af1383865bef0d1f82f6ad51aab58e05a225201 SHA512 c0c5e3d8cef3912c447145a6a8131056c13e6865e40eccb1ba422ae3e8ffa0038f7938133e1d05c7686be0886f44f479db53746a6fc2656d7c2d7b0e7e057766
diff --git a/net-misc/trurl/trurl-0.16.ebuild b/net-misc/trurl/trurl-0.16-r1.ebuild
index 0818842536b1..227ea49cde7b 100644
--- a/net-misc/trurl/trurl-0.16.ebuild
+++ b/net-misc/trurl/trurl-0.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,9 +13,10 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/curl/trurl"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/curl/trurl/archive/refs/tags/${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-${P}
-
+	## Temporary workaround for trurl-0.16.gz already existing as a different
+	## file in mirrors.
+	SRC_URI="https://github.com/curl/trurl/releases/download/${P}/${P}.tar.gz -> ${P}-tmp.tar.gz" ##
+	#SRC_URI="https://github.com/curl/trurl/releases/download/${P}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64"
 fi
 
diff --git a/net-misc/trurl/trurl-9999.ebuild b/net-misc/trurl/trurl-9999.ebuild
index 0818842536b1..001952499158 100644
--- a/net-misc/trurl/trurl-9999.ebuild
+++ b/net-misc/trurl/trurl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,9 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/curl/trurl"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/curl/trurl/archive/refs/tags/${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-${P}
-
+	SRC_URI="https://github.com/curl/trurl/releases/download/${P}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64"
 fi
 
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index 2db738174bd4..460f14243545 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index f898bef6c32c..06aa250fbd74 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -2,5 +2,5 @@ AUX liferea-1.15.5-libxml2.patch 980 BLAKE2B 432393168bd985a9f15d6943b9384029f77
 DIST liferea-1.15.5.tar.gz 1878299 BLAKE2B e74c67fa1b124dabdd3abec2ecb7d42e9d3f36bdb14c5edc2f645aa9f163c71822f43e0eb44761c4be8e14e39c7cf74218e825a87a20c208601a8dcbf7629ab8 SHA512 7d3ec5dd46ccecc3879adba1daf180b05e043f256694146dad466fd8f0a7c840a4dff39d5facbbd304cbb287578c7a258cf83191dfd726077ac332b1d167db17
 DIST liferea-1.15.8.tar.gz 1829024 BLAKE2B 0a24cef596f8278034b53f909d84edfd994b38165c6ea30b3aa973157e6bb2725b026748b1f17f630597906d61de7fde1db4160c3b343c50d342f68b9fcbcd11 SHA512 19433433849d729f4314dc603cbd7bb824694bfb7f042a97bb2bec38627e56e1b8cbcbef0573f473bfef620a165de28ad16788cdec1f31462eb939b6d7794272
 EBUILD liferea-1.15.5-r1.ebuild 1789 BLAKE2B 49a6694832cc15a0f9a54a9c80f1c17404d622029c66cf3e853f76837a8c2847a768e14ceb4f006980e9ef6db9ba7088f1a37813d2a535434f9842680e9cf129 SHA512 acca6481594dce1d020d1821462a8057a4235409fbdc1f0329187ff18c75e6a2a962350d565313be3700dcd8c5445d16c184cab9d0b45ae1c391d1f93a6958ef
-EBUILD liferea-1.15.8.ebuild 1744 BLAKE2B 1f3d36135344e939a43d1f679270db0298f5822da5d0f62e78c06dad949345f00f658ecc29fe4c013d0d392b058c748b7df661191af0ce74783f4b19e8d80f2b SHA512 747ea0ce64e34ef93fe4f1720ac85b332f0ce4780c403fcbbc23b81b7bba6c302614cc258b480a7f186d9c9743b405d8e79c62ed6691b504538b239c771dcf0e
+EBUILD liferea-1.15.8.ebuild 1744 BLAKE2B 55e9bd21a0c108144a479f41b1dc2376455ce26b3b02351a46e0151ba7541161f474ed66fe3324de6858ece6692479f1004c6a3c18de8e867692f35dcb584dae SHA512 fa575e653e11b4439ce341e8de09c32521138533b9e5558dfb32960fcdc1b736dd8f9c6e69b42f82f3b6373fe15e28af4bf9f28193b6a02df328bb8afbed9178
 MISC metadata.xml 629 BLAKE2B 88e0018637621448c67f2b514c11f3be85a6f2a4a1a0d7af0df0bea2e2cff8651bf8d064c17c314a31da0090231e35811cd60ad8b2a25175e997dc4a2487ead1 SHA512 ae109cd972bf652d0598b660ef74bba8783d097fe87b1ed5839975c3788a905f1768176ec914b03d6e495c89ccac121ea807fd088f77d7c96e582e175a9aae13
diff --git a/net-news/liferea/liferea-1.15.8.ebuild b/net-news/liferea/liferea-1.15.8.ebuild
index e7c6bad358e3..89029b453a69 100644
--- a/net-news/liferea/liferea-1.15.8.ebuild
+++ b/net-news/liferea/liferea-1.15.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit autotools gnome2-utils optfeature python-single-r1 xdg
 
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index b96cd617f1e3..0249492524b5 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/airdcpp-webclient/Manifest b/net-p2p/airdcpp-webclient/Manifest
index 2d5eba07bec2..1602dde79663 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -2,12 +2,10 @@ AUX airdcpp-webclient-2.12.1-miniupnpc-2.2.8.patch 700 BLAKE2B 3e611b191e231ee4f
 AUX airdcppd.confd 198 BLAKE2B 7d3fbce6527a7f1971f544a37215fa73ed1f19bc5f6c4c3ef90c28b170b84ecd3a82da77b582b69ef442a9a455752192ba4b6b33aeb9a43587c0209fdf380342 SHA512 025ec93c208173771fe697574c9161b9af8d740eab0b1290c8d3857961dc3635339bdb9c18b97fdde6fa7dc8924f4453b9c609ca57e61f1cad9ff47683fb613e
 AUX airdcppd.initd 584 BLAKE2B 6e19d6088b26153527fa51e3789c3968647af3f7a2b1fbe2b355587b14eef94b8800a78565ce3bd54f0474542496bfd9f80566c36fcf6f1e51f55c48aa0654ee SHA512 f6de7a576eaef662e73dd488acd956371891278a6fa6c912be864c630a22435541deaca9055c6d7912bf483de228db2cd0bd9c9666a1a436de55112561783721
 AUX airdcppd.service 302 BLAKE2B 5e446eb4253c71648e8e6850da4d71e6f16bdb6d82b611882ba4b1ff755073ff611a5502f5f9dbfc94020610ccef9a022add2f85721d464cba94907320618e66 SHA512 79aa352d7943e5297835ec226142661f084a39bd8ccaebace8d4356db995e2eff7c77a9f04ee636bd50e61103bc5a30e83fa126ffa8d77ec068053da2c1b9508
-DIST airdcpp-webclient-2.11.4.tar.gz 958611 BLAKE2B f0ff3a39c8615edbc541a952460b831eefd37f1825da4881da147c54a00612479382a9d69d4399f55fbdd77c77ab6716097594c8d10c6a3839db5ae14d11cc87 SHA512 0ab8fbdc6d1b815546724bfdcd436aa2e07ffdb499b91a3506db18c2f494f76bc1203d0d9d3cfd3ae6ad9d0f2fb4038df46aada0515747e2477c7f6595a05436
-DIST airdcpp-webclient-2.12.1.tar.gz 961603 BLAKE2B bc17fb3b3643b1d699f7c0ef958616759d87cd96467318a592c1460e355d512a3efc0e793a3098f8074f02d5af47b1ef33b65fbe7a6c9a955bbdc472d323f637 SHA512 0f662311d208b937c946b41a617c82a0e72442fb7c2bef09d56ec71931bde35bd1024ce53cb3bf7deda3eaaac31ecbe8fa2c66c337c0833db655f80f5e5156be
 DIST airdcpp-webclient-2.12.2.tar.gz 793005 BLAKE2B 777a8aa3e5425566ae15f6ae616796953c653890aac607f8c3799c7a959335a0c7bed9380e85a9f6174d989392d909056faff582d42292174c2609de4b7451dc SHA512 29ad24d1714e86123ed0d3ef226934682001202c0197df9d83c4a225503786a5853cd4bf31f90eb30a98351fba0d246e02ca4ba9ffe71f6bda760021f095b9b2
 DIST airdcpp-webclient-2.13.2.tar.gz 829418 BLAKE2B c75654b169ab1958f5f9ab972499a8aca0b4ef7690fef86c5498068c072b179e2cfab30a8d8f80a2f950939d138a6e0876f9a4a696b72aacebb1386f062c83ac SHA512 e3212d472e8af3005e5a0154670e7a2b1c7474c482700bc2d0f84e040d93fb06d96e8771de911d82ee1b158f7e98af24edee82f87bcd9ed70cb236fbf2794cb3
-EBUILD airdcpp-webclient-2.11.4.ebuild 1381 BLAKE2B 0b64fcc853b9a9857dfe1a55145500903fb718753a737229e5a733f797f711b22aaa0bd2ad8d0ef96acb58cb59e6c100e5c5e852c13f7060e2ce39e5c00b5716 SHA512 f091e9945199d16e8ee3f90df23b9861552bd17c4b5b7480d9fd82e0fb161fbcefd83b9b5804c7d1474f9b15945f5029917cedf5fd8c120b730d8c24c17eb40f
-EBUILD airdcpp-webclient-2.12.1.ebuild 1437 BLAKE2B 7544123224affe4db124c5907d062ccb693804564d0039c5844180c0a547b8863d073e28e2430dd39bac3044be8660cb1e2615373da9715584c942e3f8ffe51a SHA512 c00edc017997091b882a2fdf07e734964d79be06206b0c398f033d08467e0722d15f0517deb87587eabf4590c0b3b3f19f009a511aa9c8b80bef25f91fc8d337
+DIST airdcpp-webclient-2.13.3.tar.gz 829955 BLAKE2B 990463a3c3cf05a6f503e385dc371353bc4a17703a4cfa9784167bdbd6ef49b557b7ccd230a2cd7fd0832115a6bfcbde4da5711b755305101280e5fe2fc1d99a SHA512 c74c6ab57325a39b470e8cdfc99f59fd4e163df3b2a2d7bad8a2a9e07fd3b9372cf310dbc228a7f547adc5d9de54269b3cb19b7a710ab96ecb0fd2da0022e615
 EBUILD airdcpp-webclient-2.12.2.ebuild 1416 BLAKE2B 6f740b80553f81029fc7b0a06088ebbd7004d15fbc3718b092ce513a2493a86f311261bb07e9e39f8f9ba3afa46e9ed6edbe38e295d3ce9ee0563db54efda502 SHA512 0b75576339606d5370fa18232dccaec725423f9b18cdab0bd5cccb52e801d379fc5033ed171140c95ad5692449a0e786f94d78e291a6f10b268376d28da850f4
 EBUILD airdcpp-webclient-2.13.2.ebuild 1360 BLAKE2B 01ff4e68d5b6119c89edbfd272781e8c2be6fa8a8c55f060ebc5dff3243dcec31a0280bc03c1f71bee16d2feb91096d92c3f81b0d2d66a9f1269498b433a88ab SHA512 eb4392fe06332ac14fdb30e48d4734b7603bc0f66c4f6770d66fa76299ddf9ad34734e2061708e47adfe6ff4150b2a3bf36438182d5a54e20966d24ce4f35b55
+EBUILD airdcpp-webclient-2.13.3.ebuild 1360 BLAKE2B 8a5c5afaf5fcfb99cc95fc17ab155b955e2f0566cc93f6fa208f0f42fa6d5747a762e8d67a551a28318b627e925a1fc671af78a0a7c97a7d24e305a0be0294e7 SHA512 08ff0cd8486351a02743935fc56e47b16d4db248f21eba9c63721e88c64b45dfa1e72bcc1625781972819d449c84a5b04efa689d65949a5561cc2f26176a8e31
 MISC metadata.xml 805 BLAKE2B f62a540005c5d447e9ddd18b31eb88b1e875161af3b54e8c8753034700a70f28b3d4059d34988a8cf9225c2588ac921b39293e30ed2abf65a2bd0970b75a4628 SHA512 f8ff1e2d21ad685843abdb11672450b08c190203fbaead9170985dcf14332b7deebefb1565df6ce88671a87eb5e22ae80df5eaccf4c42ad49e882dd00b7ec81d
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.12.1.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.12.1.ebuild
deleted file mode 100644
index e6d1af1f4eed..000000000000
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.12.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit cmake python-any-r1 systemd
-
-DESCRIPTION="Cross-platform Direct Connect client"
-HOMEPAGE="https://airdcpp-web.github.io/"
-SRC_URI="https://github.com/airdcpp-web/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="debug nat-pmp +tbb +webui"
-
-RDEPEND="
-	acct-user/airdcppd
-	acct-group/airdcppd
-	app-arch/bzip2
-	dev-cpp/websocketpp
-	dev-libs/boost:=
-	dev-libs/leveldb:=
-	dev-libs/libmaxminddb:=
-	dev-libs/openssl:0=[-bindist(-)]
-	net-libs/miniupnpc:=
-	sys-libs/zlib
-	virtual/libiconv
-	nat-pmp? ( net-libs/libnatpmp:= )
-	tbb? ( dev-cpp/tbb:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-"
-PDEPEND="webui? ( www-apps/airdcpp-webui )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-miniupnpc-2.2.8.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_NATPMP=$(usex nat-pmp)
-		-DENABLE_TBB=$(usex tbb)
-		-DINSTALL_WEB_UI=OFF
-	)
-	CMAKE_BUILD_TYPE=$(usex debug Debug Gentoo) cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	newconfd "${FILESDIR}/airdcppd.confd" airdcppd
-	newinitd "${FILESDIR}/airdcppd.initd" airdcppd
-	systemd_dounit "${FILESDIR}/airdcppd.service"
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Run 'airdcppd --configure' to set up ports and authentication"
-	fi
-}
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.4.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.13.3.ebuild
index fe61b08cdcf2..91129dbea10e 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.4.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.13.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 
 inherit cmake python-any-r1 systemd
 
@@ -11,10 +11,10 @@ DESCRIPTION="Cross-platform Direct Connect client"
 HOMEPAGE="https://airdcpp-web.github.io/"
 SRC_URI="https://github.com/airdcpp-web/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="amd64 ~riscv x86"
-LICENSE="GPL-2+"
+LICENSE="GPL-3+"
 SLOT="0"
-IUSE="debug nat-pmp +tbb +webui"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="nat-pmp +tbb +webui"
 
 RDEPEND="
 	acct-user/airdcppd
@@ -31,7 +31,10 @@ RDEPEND="
 	nat-pmp? ( net-libs/libnatpmp:= )
 	tbb? ( dev-cpp/tbb:= )
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	dev-cpp/nlohmann_json
+	${RDEPEND}
+"
 BDEPEND="
 	virtual/pkgconfig
 	${PYTHON_DEPS}
@@ -44,7 +47,7 @@ src_configure() {
 		-DENABLE_TBB=$(usex tbb)
 		-DINSTALL_WEB_UI=OFF
 	)
-	CMAKE_BUILD_TYPE=$(usex debug Debug Gentoo) cmake_src_configure
+	cmake_src_configure
 }
 
 src_install() {
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 320d1c3cec65..7392de29f3a9 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 51a4a4f192c5..b25f73a7228f 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,11 +17,15 @@
 
 #--- END OF EXAMPLES ---
 
+# Matt Jolly <kangie@gentoo.org> (2025-01-11)
+# We can bootstrap with mrustc on amd64.
+dev-lang/rust -mrustc-bootstrap
+
 # Michał Górny <mgorny@gentoo.org> (2024-12-24)
 # OpenMP offloading is supported on 64-bit architectures only.
 llvm-core/clang-runtime -offload
 
-# Alfred Wingate <parona@protonmail.com> <2024-12-16)
+# Alfred Wingate <parona@protonmail.com> (2024-12-16)
 # Only available on amd64.
 media-video/handbrake -qsv
 
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index d5b2e4430917..c3caa1362c00 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Matt Jolly <kangie@gentoo.org> (2025-01-11)
+# Stable-mask until mrustc is stabilised
+dev-lang/rust mrustc-bootstrap
+
 # Ionen Wolkens <ionen@gentoo.org> (2024-09-27)
 # dev-qt/qtremoteobjects:6 has not been stabilized yet.
 dev-python/pyqt6 remoteobjects
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 219b112edc32..64e9abd1ad0f 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -3,6 +3,10 @@
 
 # New entries go on top.
 
+# Matt Jolly <kangie@gentoo.org> (2025-01-11)
+# mrustc currenly only works on amd64.
+dev-lang/rust mrustc-bootstrap
+
 # Volkmar W. Pogatzki <gentoo@pogatzki.net> (2025-01-09)
 # No suitable versions of dev-libs/protobuf available.
 =dev-java/protobuf-java-4.29.3 system-protoc
diff --git a/profiles/license_groups b/profiles/license_groups
index db32bd75ce9f..0f36cdbdf275 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Please report bugs or other requests at bugs.gentoo.org and assign to
@@ -34,7 +34,7 @@ OSI-APPROVED-FREE 0BSD AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL
 # Licenses in this list should NOT appear directly or indirectly in
 # @FSF-APPROVED or @OSI-APPROVED.
 # Note: Licenses for fonts should be included in @MISC-FREE-DOCS.
-MISC-FREE AIFFWriter.m Allegro alternate AMPAS BEER-WARE boehm-gc BSD-1 BSD-2-with-patent BSD-with-attribution BSD-with-disclosure buddy bufexplorer.vim BZIP2 CAOSL CDDL-1.1 CDDL-Schily coldspringharbor CPL-0.5 Crypt-IDEA curl DES docbook dom4j DUMB-0.9.3 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy iASL icu IDPL imagemagick Info-ZIP inner-net Interbase-1.0 ipadic Ispell JasPer2.0 JDOM JOVE Khronos-CLHPP LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LLGPL-2.1 LPPL-1.0 LPPL-1.3 lsof matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-AMD NCSA-HDF netcat NEWLIB ngrep NPSL-0.95 Old-MIT openafs-krb5-a Openwall otter par PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils rc rdisc regexp-UofT repoze RSA RtMidi rwpng sash scanlogd sdlsasteroids Sendmail Sendmail-Open-Source SMAIL Snd Spencer-99 SSLeay symlinks Sympow-BSD tablelist tcltk tcp_wrappers_license TeX TeX-other-free TextMate-bundle the-Click-license Time-Format Time-modules tm-align torque-2.5 Toyoda trio UCAR-Unidata unicode URT VTK w3m wm2 xbatt xboing XC Xdebug xtrs ZSH
+MISC-FREE AIFFWriter.m Allegro alternate AMPAS BEER-WARE boehm-gc BSD-1 BSD-2-with-patent BSD-with-attribution BSD-with-disclosure buddy bufexplorer.vim BZIP2 CAOSL CDDL-1.1 CDDL-Schily coldspringharbor CPL-0.5 Crypt-IDEA curl DES docbook dom4j DUMB-0.9.3 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy iASL icu IDPL imagemagick Info-ZIP inner-net ipadic Ispell JasPer2.0 JDOM JOVE Khronos-CLHPP LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LLGPL-2.1 LPPL-1.0 LPPL-1.3 lsof matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-AMD NCSA-HDF netcat NEWLIB ngrep NPSL-0.95 Old-MIT openafs-krb5-a Openwall otter par PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils rc rdisc regexp-UofT repoze RSA RtMidi rwpng sash scanlogd sdlsasteroids Sendmail Sendmail-Open-Source SMAIL Snd Spencer-99 SSLeay symlinks Sympow-BSD tablelist tcltk tcp_wrappers_license TeX TeX-other-free TextMate-bundle the-Click-license Time-Format Time-modules tm-align torque-2.5 Toyoda trio UCAR-Unidata unicode URT VTK w3m wm2 xbatt xboing XC Xdebug xtrs ZSH
 
 # Metaset for all free software
 FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED-FREE @MISC-FREE
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index dc5f672a520e..589986c9da33 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -835,7 +835,6 @@ app-metrics/collectd:filecaps - When set collectd daemon will have set required
 app-metrics/collectd:java - Must be set (workaround for java-pkg-opt-2 eclass limitation) when you want java or genericjmx plugin
 app-metrics/collectd:udev - Enable optional udev usage in disk plugin; Required for smart plugin
 app-metrics/collectd:xfs - Enable optional capability to filter on XFS file system in df plugin; Requires XFS headers from sys-fs/xfsprogs
-app-metrics/node_exporter:systemd - Enables systemd collector by default
 app-metrics/prometheus-podman-exporter:btrfs - Collect metrics for btrfs filesystem
 app-misc/FreeSSM:small-resolution - Build the app for small resolution screeens
 app-misc/anki:gui - Enable support for a graphical user interface. Disable for standalone sync server.
@@ -1891,6 +1890,7 @@ dev-lang/ruby:systemtap - Enable SystemTap/DTrace tracing
 dev-lang/rust:clippy - Install clippy, Rust code linter
 dev-lang/rust:dist - Install dist tarballs (used for bootstrapping)
 dev-lang/rust:miri - Install miri, an interpreter for Rust's mid-level intermediate representation (requires USE=nightly, sometimes is broken)
+dev-lang/rust:mrustc-bootstrap - Use dev-lang/mrustc to build the bootstrap Rust sysroot from this package's source
 dev-lang/rust:nightly - Enable nightly (UNSTABLE) features (NOTE: it does not install nightly version, just enables features marked as nightly at time of release)
 dev-lang/rust:parallel-compiler - Build a multi-threaded rustc (experimental, not tested by upstream)
 dev-lang/rust:rust-analyzer - Install rust-analyzer, A Rust compiler front-end for IDEs (language server)
@@ -1925,6 +1925,7 @@ dev-libs/apache-arrow:json - Enables read/write json format
 dev-libs/apache-arrow:parquet - Enables read/write parquet data format
 dev-libs/apache-arrow:re2 - Build with support for regular expressions using the re2 library
 dev-libs/appstream:apt - Enables Debians APT support
+dev-libs/appstream:compose - Enable appstream compose
 dev-libs/appstream-glib:fonts - Enable fonts support for appstream-builder.
 dev-libs/appstream-glib:stemmer - Add word stemming via dev-libs/snowball-stemmer.
 dev-libs/apr:old-kernel - Enable compatibility with older kernels
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 4ca8a9c0d418..fe4b2b31b62f 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/libbraiding/Manifest b/sci-libs/libbraiding/Manifest
index d143684b32d5..911a28fdffeb 100644
--- a/sci-libs/libbraiding/Manifest
+++ b/sci-libs/libbraiding/Manifest
@@ -1,3 +1,5 @@
+DIST libbraiding-1.3.1.tar.gz 393142 BLAKE2B 6a012005549c6de513463f887202dd0c2774f10d2c72b9bae4b46e73d5592b01011760d034e2c8eb9abbe0f56db3932d96a062e19f767b9efb4f9b639a9f719f SHA512 358c53365f318e5fd77f2332e0f70374d720ebacb9426a2d24abc4e4eff179ff315bbd7447211797e097a0bbead7efc73b2c26f1e068bdb86766af1144a2e823
 DIST libbraiding-1.3.tar.gz 389034 BLAKE2B edc4fbe0a06afec3ddb9c3fa2d63f388ec16bb355100ecf1bb104f72ebf1975d92abc973e8ba118f5cafe998ea4587dc9f456a7a45d076cdae429d607c335a9b SHA512 da8c24183eeaf21a79cd7f723b0082e29e3185594b7cf6695e58de9677a64838da361220b35dd140c920d64dbf5cbf1f1c6f4129709c57efc5d624b766ccd69f
+EBUILD libbraiding-1.3.1.ebuild 567 BLAKE2B 60580d27f3c909fae1d4c765692dfe083c761ae2fb896d4bef9008321d75bba73b615c148d4f4088bbbecdc83400b82a262476f4abb0dbc4f23783f8ee60bbe3 SHA512 ef9bfdc86f3e942b755a0a697add380eea46cbf8952651ae935e36e18bec030491597b7b11e353b0c901937de84854823487243d9f0567bf3de0c36d52f0561c
 EBUILD libbraiding-1.3.ebuild 566 BLAKE2B 5a168e7c76cdbda6f1a9553128de1643b619757f693ae1aec88fad06ad7e4b05b1bdaabdb279caa09348b5c162ee071d47e8f75ff31c62f8131a4460660226f1 SHA512 dc8a4b9335728ad6b4e652e4ec39f55e9eb64262fcf02e2c089a92b153fa47bfe8cb40effd4f1c78da37880e2012a1266863ebf32264d4aba47dfe67325279a0
 MISC metadata.xml 1040 BLAKE2B de527a0accea92adf75f22b086920888d621f9c3e24c1a136149af13f4eaa8fdf4127354d6805b5e50d1772c906ff1db7dfd906eb7156908e95b5058c1c490f7 SHA512 cf25e11fae981f51eb8b9a16db8495f49d27e2a1e038e29bdf41f836aa2d56e9204b8912b9725d333ea2e3ba75ab52303e784d6ac3bc82f83f5e44509d71ccba
diff --git a/sci-libs/libbraiding/libbraiding-1.3.1.ebuild b/sci-libs/libbraiding/libbraiding-1.3.1.ebuild
new file mode 100644
index 000000000000..0edd4d6824f3
--- /dev/null
+++ b/sci-libs/libbraiding/libbraiding-1.3.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Expose the functionality of cbraid as a shared library"
+HOMEPAGE="https://github.com/miguelmarco/libbraiding"
+
+SRC_URI="https://github.com/miguelmarco/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+# A few source headers still say GPLv2, but I believe that to be an
+# oversight: https://github.com/jeanluct/cbraid/issues/4
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 8037bca0e1b9..a4741767a9c1 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/config-site/Manifest b/sys-apps/config-site/Manifest
index b5b05d7c93dd..f6e089ab3bf7 100644
--- a/sys-apps/config-site/Manifest
+++ b/sys-apps/config-site/Manifest
@@ -1,3 +1,4 @@
-AUX config.site.in 311 BLAKE2B 95398d6619e4a02f9a19af7f99e6cd5fa838260b19c97639ae4c98b04d31ef6d255f55d42a3dcf85096b2cbbd701aa87096b61aae0e2df475686a4db70f495fc SHA512 1d23537502b172ee31bd23612dc1ef20ec8c08936c45945d0fbfa0b1d7ddf28fd94a17d8aceeb20e8aeac98b2aa44ec31d4f06e854fc42a97b215211b143d7a8
-EBUILD config-site-0.ebuild 577 BLAKE2B 250337a3e7b1fb23d9266c1a5fb396b6443e938664c1fa172eddc1d3b300337be72a082a2768e28a36dfd62c3bf6f5ec8521c7bbe93d9526ece8310d15145be2 SHA512 9867d32578b2fd3fa928719a5956075ba2c5d8a4ee81e5b42adf3684e88e854aeb24c7675fe6cdf41234937b848c46808bc1dfe34e6204e696fa26f205ddefa4
-MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
+DIST config-site-0.tar.bz2 6588 BLAKE2B 98ad7836316d68fc27e1dc18b419d088e2047f3ebbbb2b7e8a0ab6de4c66c3ae438504146398e697a246ae09804cdcc229701ce2ba52de469cf8e78798fedaa8 SHA512 0e02848dc3176a0963b99d8d785e3a0150917156d9db897d665ede2ddcd8dfacd334b0c761975671c161f79107622226caf2fc422e1c34fa28b83ec78a1ec93a
+EBUILD config-site-0.ebuild 763 BLAKE2B 9e718c89b37dea4ecfa94e69a80c6041b425a58e99cbd6c9ae021ace1c7828f63fa028d7c0397a7405566634c0cc18db256cd1cc12d3d92c9a63c257c9fa8bf1 SHA512 d8f92958e02a5407e8e86971c0634ab5a0a85abf3004a58b573524b9d0225f8c8c71322f0ec971960721419ee1c75cc765969d988529c4ee185bbb8d84cb96c6
+EBUILD config-site-99999999.ebuild 771 BLAKE2B 8e1b9c907091a3d1db6619dcfd120daedeb155031e8c1b7bd5c9d5a54c5254d9a137562d1f1d04531d882b68c1cfe5e4c0b851940fe0009e46a66198e73b5e1d SHA512 e790930fef2491f96feb4e8d71ffedb9a566bb45a61a4f9feb9d37cf7a9d3960af1ce0e526592c16a1f6040f95c5059b603aa2039842da2fe114585e64d78de5
+MISC metadata.xml 363 BLAKE2B fc302a71aa66a2632a240ecd7a698f4b25f4de9b159b5135108cfaf08e3d16dad0e8442b6d51b2b4733e113f3afb3107c05052b0a1d0ee4d7cb33b0bb793ef0c SHA512 b2ebda3f958630db98f7cd654fc2a1faf6a95d677a28185e3ff9c889265cbe469a9bcec28a8b5967d2f725a526b8f0551df7ea241fd26bb4667f64c805c70e87
diff --git a/sys-apps/config-site/config-site-0.ebuild b/sys-apps/config-site/config-site-0.ebuild
index 8389fd2cd449..c829b6ca517d 100644
--- a/sys-apps/config-site/config-site-0.ebuild
+++ b/sys-apps/config-site/config-site-0.ebuild
@@ -1,21 +1,26 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DESCRIPTION="config.site to load dropins from config.site.d"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Base"
-S=${WORKDIR}
+if [[ ${PV} == 99999999 ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/config-site.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/config-site.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="!<sys-devel/crossdev-20230209-r1"
 
 src_configure() {
 	sed -e "s|@datarootdir@|${EPREFIX}/usr/share|" \
-		"${FILESDIR}/config.site.in" > config.site || die
+		config.site.in > config.site || die
 }
 
 src_install() {
diff --git a/sys-apps/config-site/config-site-99999999.ebuild b/sys-apps/config-site/config-site-99999999.ebuild
new file mode 100644
index 000000000000..684dc2b292a0
--- /dev/null
+++ b/sys-apps/config-site/config-site-99999999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="config.site to load dropins from config.site.d"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Base"
+if [[ ${PV} == 99999999 ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/config-site.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/config-site.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="!<sys-devel/crossdev-20230209-r1"
+
+src_configure() {
+	sed -e "s|@datarootdir@|${EPREFIX}/usr/share|" \
+		config.site.in > config.site || die
+}
+
+src_install() {
+	insinto /usr/share
+	doins config.site
+}
diff --git a/sys-apps/config-site/files/config.site.in b/sys-apps/config-site/files/config.site.in
deleted file mode 100644
index 1e732cf28aaa..000000000000
--- a/sys-apps/config-site/files/config.site.in
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-for script in "@datarootdir@/config.site.d"/*.conf; do
-	test -f "${script}" || continue
-	test -r "${script}" || continue
-	echo "${0##*/}: loading site script ${script}"
-	. "${script}" || break
-done
-unset script
diff --git a/sys-apps/config-site/metadata.xml b/sys-apps/config-site/metadata.xml
index 65e1fc82d859..762976366bb4 100644
--- a/sys-apps/config-site/metadata.xml
+++ b/sys-apps/config-site/metadata.xml
@@ -4,4 +4,8 @@
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="gentoo">proj/config-site</remote-id>
+		<remote-id type="github">gentoo/config-site</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index 440e762447ed..a6aea0af57bd 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,4 +1,7 @@
 DIST ed-1.20.2.tar.lz 69182 BLAKE2B 5a9d36dba98488e3cacb3e4c0b9d70003345ca94dbf9a3ebd3181b93567b9ef94df0e72614e99e2c6dde4929933d9333c6dba90fafcea6962e2c1abccb0525af SHA512 5efad386399035329892d8349500544f76e1b18406e164aae35af872c15a0935d412dd4a6996bd15b960d0e899857cc7d8657805f441b1b9f2ae3d73c73dcf4f
 DIST ed-1.20.2.tar.lz.sig 72 BLAKE2B f62d5fc9d909cd1f665ed2b4793407d1d91981bad6b4da0383b84936d03d2ee78c37dca1f0c09fbb84cbbfd8211980ea489b897ff14834773185fce0339c7fe3 SHA512 dc895c0634d73c5ddaaffc78c8dd86df88c477607a7d5f1828229009e2a72091cbb24286dbad295019a30651cc6e98d07a1181b0ae38b94d66cb28532876098e
+DIST ed-1.21.tar.lz 69718 BLAKE2B 60d5b962f58e5214202071887d80b523e53100c5a93cb1b06dd3192fa5a4b0059a537b87906738384380f28091ee0e1833908a260536e82ab436441411c383d3 SHA512 ac65287dff9f85c22194c98d658a147eac65e1f192d1564cd940ef9b5317be46a48aaefa16f37ab45513568d28503f4da15bed7adfacf0dfa5c28492adceaac3
+DIST ed-1.21.tar.lz.sig 72 BLAKE2B 265a4fba89d36faaa0fb92dc5dcebd8ec4b6ff6faead1e795193eae36960ea80232395764bdfe797bb7c9b1e951bfa3c802c34dfd169f971a67a117d8f949265 SHA512 032ee6bfc84302562ceb8904ff86e5767691e38f6405b6a49653e91fb8955a6f99a565782b1d42209983ae311a4b192a89493345e6ad546803141ca07888b093
 EBUILD ed-1.20.2.ebuild 1332 BLAKE2B 80e942c42870f9fcd68cc2222fb79492897c7334f6e3236fd1e962de6e006e46a75241824cf0c7483f5b631c94f7fe6d500f8234f626eb68c8abe8908e94d3ee SHA512 1ae71b64c75f518681ebcff4991946d46eaf992a1e85d19b436d379a1889c918694dffddf3ff8d4f29a1f36f5a37f792f5179147b5ce6f1e9e921bcc754cd673
+EBUILD ed-1.21.ebuild 1269 BLAKE2B 732354c350a25755d507eae3efb08a1bc6699b10d96d0b88e7a52131f1df62ee89a0f41f0a2e260248a5a8dc1683a53992143706abb3de173231aa9740fa5601 SHA512 2e98b74b25eb456a9a3767f28729d8d736b9b7f9f97227e4a51a86970ea13519c6c4a93c4b6985fe03b1c0037f04e0b7ad242ac06a82ea9ded4629f06ec8e5cd
 MISC metadata.xml 337 BLAKE2B 40506db26223e7d375b03972929e04e5684f0ee5d722248819d28d424daf9f2f4effd07a7491cdba9d77185712593fe8fd182c058bff2ff0ba4341aff383dc7d SHA512 5709e973094bd7fda825a3a223c04f8ce04ba9e2f609466c7cf56da4f62d4155562669bbfd808acd2f7db17434ca5871cdc50962a6bfdae3c4edeca1bb4736df
diff --git a/sys-apps/ed/ed-1.21.ebuild b/sys-apps/ed/ed-1.21.ebuild
new file mode 100644
index 000000000000..da8a31ecdc78
--- /dev/null
+++ b/sys-apps/ed/ed-1.21.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/antoniodiazdiaz.asc
+inherit edo toolchain-funcs unpacker verify-sig
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Your basic line editor"
+HOMEPAGE="https://www.gnu.org/software/ed/"
+SRC_URI="
+	mirror://gnu/ed/${MY_P}.tar.lz
+	https://download.savannah.gnu.org/releases/ed/${MY_P}.tar.lz
+	verify-sig? (
+		mirror://gnu/ed/${MY_P}.tar.lz.sig
+		https://download.savannah.gnu.org/releases/ed/${MY_P}.tar.lz.sig
+	)
+"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2+"
+SLOT="0"
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+BDEPEND="
+	sys-apps/texinfo
+	$(unpacker_src_uri_depends)
+	verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )
+"
+
+src_unpack() {
+	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.lz{,.sig}
+	unpacker "${DISTDIR}"/${MY_P}.tar.lz
+}
+
+src_configure() {
+	edo ./configure \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		--bindir="${EPREFIX}/bin" \
+		--prefix="${EPREFIX}/usr"
+}
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index b1adc1954d7b..d1d194676a3f 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -10,8 +10,6 @@ DIST file-5.45.tar.gz.asc 163 BLAKE2B 1405080c63412e9c66bfe06086ecee28b276b77cc2
 DIST file-5.46.tar.gz 1312892 BLAKE2B 2b1df136f01c253cc490b483c644403da0674692ef97ef9e1239878328cfb8ce2bc418c14626145719c69acab00d56b63b5340a2b56c276c996b1e6ad1bfe9b6 SHA512 a6cb7325c49fd4af159b7555bdd38149e48a5097207acbe5e36deb5b7493ad6ea94d703da6e0edece5bb32959581741f4213707e5cb0528cd46d75a97a5242dc
 DIST file-5.46.tar.gz.asc 195 BLAKE2B 7a2a65f10cbfe921ae633a9bee3a56a98b8e3100b8cbfe4b4871ce3960f28e62bb9e7425f5c1bfe9b126f43d7dd4ddcb36220f07f979072a8ef5fe62c14b5ef8 SHA512 93f99b468bbda29eab6e37fdee1f1806a10b18206a85c68e888e967678cfd128bb9c34bc9835a699e447623ddf0e2ea041039a682f7be1db2ab37935fd4aafa0
 EBUILD file-5.45-r4.ebuild 4238 BLAKE2B 6e5a129ed8fe1795bf2c545cc994aac6d3f81f1c519bd481fa30578a7906a48a536f9ad9be46408de7d7685416cfea1e00b247aa1e75292a85259f31b8860aaf SHA512 ca51f4d086d211c04165e91c6156997f5906b153f67cda76471986d3e47a44dff0e908f26a53794987e631659a7cdc0b1f3daef0d5d653f50d9219336ee0e794
-EBUILD file-5.46-r1.ebuild 4064 BLAKE2B e7b70ee3708a06cd2179dcc2d81dad9e6a77e1ab2b9b9bd5020dd4fa3f4bc39fb76b6c6763116a6485a8e83390d8fbb7ae9d41101b3f85a7900a25cc0445f6d9 SHA512 4a7e809e989f22d6781de048dac3de11603b89f489ba033bc49fa4c89e96d487a75889f12c34078e44a5c2fae88ce7eec38f4d3a9696ccc337dc524f82fa297e
 EBUILD file-5.46-r2.ebuild 4111 BLAKE2B 0b18cfd4ec8ba97fafeca12e064228543db6f68df7e32d47181f39235f1c5bfbea1f56aec68e75caa1d05224fc680dd486261e4282f9e8bb1b0a55d6696d155e SHA512 f9510e62d55d1a0c040119a461c28652e8709628d18aebbd3e33b4c7d1683ea24d867da0449ff5c0b38432f728941f56c1b5acb8da5b040730a3da3c222fe141
-EBUILD file-5.46.ebuild 4110 BLAKE2B 15a3a108c10a8645a97710ef62b97835fa4bb412911770084418c5cd36f3cf8175d28c0bc358da62b320cb09b0173a5553c20316a0ccf84c87c17e8c71fb1b88 SHA512 513f8f4f66b64a70aed208bce753505b62c9f72c3f2547ff42762b17febe16ebf8bf076395fe6519c0838a2b31e04cb81cee85d72cfa24c98f745dc5468d47f5
 EBUILD file-9999.ebuild 4029 BLAKE2B defc76fdcaf58b596f5f0890d2f4704ee78b700c8705b5d8d164b1b870f9599a1a31ac642dbc0dd7ab5b181adc57da2acb674ec3391e19897350a7e4143a92b4 SHA512 1f5ec6ac6c6eeb3faadee96a57396b13730450d87d6c9b926fa5a790508a754cf59830d651a5ceb746b625ed887394400f1b48453b21e3073ec6bfce8efec737
 MISC metadata.xml 439 BLAKE2B d937d412b733516f49ca24a5de5238688ba56c06872cec060608139cb551f78e165e05990bcf6ea5bb1e98d27eb2650f5a972a4cded85eb67dbe9218d5d705b8 SHA512 20ff0c1b94dae95c3b277cfcc10da2b6ff31582cfe8f4e2ae60a74ec45db2a854eef40950f354465a45563ee6333f327566565e40cb16249d191bde585c5b1f2
diff --git a/sys-apps/file/file-5.46-r1.ebuild b/sys-apps/file/file-5.46-r1.ebuild
deleted file mode 100644
index 592b6a25c65f..000000000000
--- a/sys-apps/file/file-5.46-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 toolchain-funcs multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/glensc/file.git"
-	inherit autotools git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/file.asc
-	inherit libtool verify-sig
-	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )"
-
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
-fi
-
-DESCRIPTION="Identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="bzip2 lzip lzma python seccomp static-libs zlib zstd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	lzip? ( app-arch/lzlib )
-	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
-	seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	${DEPEND}
-	python? (
-		${PYTHON_DEPS}
-		!dev-python/python-magic
-	)
-	seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
-"
-BDEPEND+="
-	python? (
-		${PYTHON_DEPS}
-		${DISTUTILS_DEPS}
-	)
-"
-
-# https://bugs.gentoo.org/898676
-QA_CONFIG_IMPL_DECL_SKIP=( makedev )
-
-PATCHES=(
-	"${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not upstream yet
-	"${FILESDIR}/file-5.45-seccomp-sandbox.patch"
-	"${FILESDIR}/file-5.46-zip.patch"
-)
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	else
-		elibtoolize
-	fi
-
-	# Don't let python README kill main README, bug #60043
-	mv python/README.md python/README.python.md || die
-
-	# bug #662090
-	sed -i 's@README.md@README.python.md@' python/setup.py || die
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-fsect-man5
-		$(use_enable bzip2 bzlib)
-		$(multilib_native_use_enable lzip lzlib)
-		$(use_enable lzma xzlib)
-		$(use_enable seccomp libseccomp)
-		$(use_enable static-libs static)
-		$(use_enable zlib)
-		$(use_enable zstd zstdlib)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-build_src_configure() {
-	local myeconfargs=(
-		--disable-shared
-		--disable-libseccomp
-		--disable-bzlib
-		--disable-xzlib
-		--disable-zlib
-	)
-
-	econf_build "${myeconfargs[@]}"
-}
-
-need_build_file() {
-	# When cross-compiling, we need to build up our own file
-	# because people often don't keep matching host/target
-	# file versions, bug #362941
-	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
-}
-
-src_configure() {
-	local ECONF_SOURCE="${S}"
-
-	if need_build_file ; then
-		mkdir -p "${WORKDIR}"/build || die
-		cd "${WORKDIR}"/build || die
-		build_src_configure
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		# bug #586444
-		emake -C src magic.h
-		emake -C src libmagic.la
-	fi
-}
-
-src_compile() {
-	if need_build_file ; then
-		# bug #586444
-		emake -C "${WORKDIR}"/build/src magic.h
-		emake -C "${WORKDIR}"/build/src file
-		local -x PATH="${WORKDIR}/build/src:${PATH}"
-	fi
-
-	multilib-minimal_src_compile
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_test() {
-	multilib-minimal_src_test
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_test
-	fi
-}
-
-python_test() {
-	eunittest
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		default
-	else
-		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog MAINT # README
-
-	# Required for `file -C`
-	insinto /usr/share/misc/magic
-	doins -r magic/Magdir/*
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_install
-	fi
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/sys-apps/file/file-5.46.ebuild b/sys-apps/file/file-5.46.ebuild
deleted file mode 100644
index 782ba5774ccb..000000000000
--- a/sys-apps/file/file-5.46.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 toolchain-funcs multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/glensc/file.git"
-	inherit autotools git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/file.asc
-	inherit autotools verify-sig
-	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )"
-
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
-fi
-
-DESCRIPTION="Identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="bzip2 lzip lzma python seccomp static-libs zlib zstd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	lzip? ( app-arch/lzlib )
-	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
-	seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	${DEPEND}
-	python? (
-		${PYTHON_DEPS}
-		!dev-python/python-magic
-	)
-	seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
-"
-BDEPEND+="
-	python? (
-		${PYTHON_DEPS}
-		${DISTUTILS_DEPS}
-	)
-"
-
-# https://bugs.gentoo.org/898676
-QA_CONFIG_IMPL_DECL_SKIP=( makedev )
-
-PATCHES=(
-	"${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not upstream yet
-	"${FILESDIR}/file-5.45-seccomp-sandbox.patch"
-)
-
-src_prepare() {
-	default
-
-	#if [[ ${PV} == 9999 ]] ; then
-	#	eautoreconf
-	#else
-	#	elibtoolize
-	#fi
-	# Just for file-5.45-32-bit-time_t-deux.patch, drop in 5.46
-	eautoreconf
-
-	# Don't let python README kill main README, bug #60043
-	mv python/README.md python/README.python.md || die
-
-	# bug #662090
-	sed -i 's@README.md@README.python.md@' python/setup.py || die
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-fsect-man5
-		$(use_enable bzip2 bzlib)
-		$(multilib_native_use_enable lzip lzlib)
-		$(use_enable lzma xzlib)
-		$(use_enable seccomp libseccomp)
-		$(use_enable static-libs static)
-		$(use_enable zlib)
-		$(use_enable zstd zstdlib)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-build_src_configure() {
-	local myeconfargs=(
-		--disable-shared
-		--disable-libseccomp
-		--disable-bzlib
-		--disable-xzlib
-		--disable-zlib
-	)
-
-	econf_build "${myeconfargs[@]}"
-}
-
-need_build_file() {
-	# When cross-compiling, we need to build up our own file
-	# because people often don't keep matching host/target
-	# file versions, bug #362941
-	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
-}
-
-src_configure() {
-	local ECONF_SOURCE="${S}"
-
-	if need_build_file ; then
-		mkdir -p "${WORKDIR}"/build || die
-		cd "${WORKDIR}"/build || die
-		build_src_configure
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		# bug #586444
-		emake -C src magic.h
-		emake -C src libmagic.la
-	fi
-}
-
-src_compile() {
-	if need_build_file ; then
-		# bug #586444
-		emake -C "${WORKDIR}"/build/src magic.h
-		emake -C "${WORKDIR}"/build/src file
-		local -x PATH="${WORKDIR}/build/src:${PATH}"
-	fi
-
-	multilib-minimal_src_compile
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_test() {
-	multilib-minimal_src_test
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_test
-	fi
-}
-
-python_test() {
-	eunittest
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		default
-	else
-		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog MAINT # README
-
-	# Required for `file -C`
-	insinto /usr/share/misc/magic
-	doins -r magic/Magdir/*
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_install
-	fi
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 604cf0a4608d..1339035e2b9f 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/pam_u2f/Manifest b/sys-auth/pam_u2f/Manifest
index a914a9dceb2e..fd2161106ea6 100644
--- a/sys-auth/pam_u2f/Manifest
+++ b/sys-auth/pam_u2f/Manifest
@@ -1,6 +1,8 @@
 AUX pam_u2f-1.1.1-fix-Makefile.patch 1174 BLAKE2B 274826e8af955fa2515c5b9a6e4de3357b5c8631324376ecfd2be8d8129c59d9a07764f4ad9594b7dfe4364f73a4b8035e5cbf04b97e5f966f087a555eb1551a SHA512 3d76994be0f17158e23c7e4b45c5994d720e01dd510313bdd3831a7d68cf91325f1c615466dc07452a98efdd21e5f368ad1d76d108c8ac1558b5ba7c387320ef
 DIST pam_u2f-1.1.1.tar.gz 429822 BLAKE2B 8ed44f82295ea24fe30c5830971afd29a23b48e173c3cb69d3dcaf73b142de36f86087eaee69b1793a8846fdb2efc5530d52fa9f40e4357e6cd2ea9960b9bb39 SHA512 ca81c78e67c17c369117e9d38e50033eaa96e0b15673521db2c382de1aa2566f7406fb43801a5938758480966c5e7316943769db5be826983d3865710e0274c1
 DIST pam_u2f-1.3.0.tar.gz 456281 BLAKE2B 602ce0fd00105f7fbdea1805a5efde1302149d9f7977f3c52d576d7f4b9a1a95678b1463f19107b494e62c3722e319e05e0ec54f5839f70b855b59eecdf92112 SHA512 03c09601f1988dd7f6b0cb4eeb6e9f2368de50df2cb8e2b4269e16c8111b08b2d115e6fad7bbca3482e9577ccf2885ab3fef652d9fb99db7890ba93ce6c0fd4d
+DIST pam_u2f-1.3.2.tar.gz 475593 BLAKE2B 5cc812c7471d2b7b70af85219a50b8fd146a0590cc2fb7ac5ab35b817bc93e0f173cda19658938615d4982bf39ca8a57817766b9bd8b30b507e047d579f9c7f3 SHA512 0233740c4712006d24e65a45c0eca59fc642c5c6b65fdaec66a8d898f926dbd1f770792e447da12b91d098bda4114957f7e10dd8cfbdfaf9e4c5524fadceb0e2
 EBUILD pam_u2f-1.1.1.ebuild 703 BLAKE2B 5a8e571eed0ca4247bff3141a97705e1d65a7b8de6477f4041bf048147b3196d79b07358c41bfd9f34b46f551ff6159a6076ca6c08a1fb0382a8f1927195e4a2 SHA512 b84725ec01198ea64f880eb59e30c64b89d39b6f73fcc83397069a67beedb136c9fb999867e764645075a341a9762e3f79939c6270dfc68daf69526c78edf48f
 EBUILD pam_u2f-1.3.0.ebuild 594 BLAKE2B d25f890cee41d1e6c6f72abe909d5a224919d55f193b1a30c4dcd2f5f956d6ab7c4489678261fff8d28d04a0f5f39b409022e04f55fd4c3c4c0f8fdd6e03ae06 SHA512 353ffb7d63b0f20becebb8a3728e4f11579860835a81191acde1378311fff610b95c1033c6ba89d88fb6d203e3a16d952e14761878a701c6a880bcb9b7211922
+EBUILD pam_u2f-1.3.2.ebuild 594 BLAKE2B a3169c7f5b108528cd7454c7bd2606fd21b35659416fb584a0e1bbd632543c88d15e802f22ab5a5731fdc87e8a4962053bd2d359b1d7b1bbf0638db5b4bdd81c SHA512 4ccdf9a7c688645e60b7bc77be19e1b3db469947808cdc84dee23810da6097a6ef461929ace79bcee5bb7bd9c6e4d9252d23824c1c4b2cd4010797e99a6ce928
 MISC metadata.xml 516 BLAKE2B fd1a5757181de8b2d72b11b799ea5596cc5c25b2f74d70ac45d60b519734edcc28b8b4c4b5b17f48eb16c6b724d0bc0bb58f68e1497804794dda162093c09661 SHA512 1fc7b0ffdea7b0a4d3b36219ba72a5548328e029ec599c08a4e0231081c72cc333f6b3166a30a6eaa73979673614dfe800496b7cf2efe55b7b16c08dcc065022
diff --git a/sys-auth/pam_u2f/pam_u2f-1.3.2.ebuild b/sys-auth/pam_u2f/pam_u2f-1.3.2.ebuild
new file mode 100644
index 000000000000..2f5ce7c613e7
--- /dev/null
+++ b/sys-auth/pam_u2f/pam_u2f-1.3.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic pam
+
+DESCRIPTION="PAM module for FIDO2 and U2F keys"
+HOMEPAGE="https://github.com/Yubico/pam-u2f"
+SRC_URI="https://developers.yubico.com/${PN/_/-}/Releases/${P}.tar.gz"
+
+LICENSE="BSD ISC"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+DEPEND="
+	dev-libs/libfido2:=
+	dev-libs/openssl:=
+	sys-libs/pam"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	use debug || append-cppflags -UDEBUG_PAM -UPAM_DEBUG
+	econf --with-pam-dir=$(getpam_mod_dir)
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 00c7d3e3592b..d32cacbb3727 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index ce3a66af984b..c8e1a87af4de 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -32,8 +32,10 @@ DIST gcc-14-20250118.tar.xz 88214804 BLAKE2B dd35140f0565d419eee272f70e668a8614c
 DIST gcc-14.1.0-musl-patches-1.tar.xz 3600 BLAKE2B 4cd920b7ca1f122cae806707564d8e45bfd48e78c88788a12a301f6068b5a5f335d8885e67479ac536c66aeaa81f2ecb7240ae56e9fc821a7246ab66b453711f SHA512 61c48d90a55dfc2129d96aee69d939d6a89f6407f69f7bd12c1a619f28989f471fd219d731958f8e62b0fd650c32300f0ad8dc06d5df23d9fc8c1a77fe210c25
 DIST gcc-14.2.0-patches-7.tar.xz 14244 BLAKE2B 11236e91e1fe83fec8ffaa40ec0cdd4b52a00a951e9aa9a7a0a932b234b8f1a9603333a7ccf55859f4ef53dd4d8ad1fd5c1d2514b6e45fce5b86bb58622a0ecc SHA512 5a4d86d943e31fa068b5a784c0132bd83c23243dcb3cf972557a42e004469a415e1b3185f31b1bb36f916594d475f266a2fda031a414e4a15e0bbfe471269eee
 DIST gcc-15-20250112.tar.xz 90584884 BLAKE2B 35200ad43eaca0b97d330d22abb517ee5f8d196b83d40650e5a2e39b5a847b2c686108d15edf998df511992930bf3464b7e63d4562c17a6330a22a693b795122 SHA512 cd2b282eb7cd352fb326df692b653572319edc179ae6dec0c96ead858da4a85134098e128afa9dd76ff691262fd3cfce176c38420a78f56121b039a2a297f63e
+DIST gcc-15-20250119.tar.xz 90709176 BLAKE2B da815cd472c0bb4101fb65fac73e93d8da8981c268880222501deb48f03865824773f93ae182ec60465e2b122a1503936dc10337b9b87dfdd15cde5e18641026 SHA512 9f3bb4ff5b04fe84ec3ce5342a29ca1d98f1988c0b3703c63b3f5bd5d58d035ed7c676cdf6bf730f5399a7b461e2929f28494f9ca4a87a6783c6e30114d2c838
 DIST gcc-15.0.0-musl-patches-2.tar.xz 3076 BLAKE2B 0073248fe4f7dd827980559017b5aa1fb5c4c46acc9ad5c410dc152fd1e44966d3066bf7152338573cb45b1c36027de5f0c519abd414d97a37bccef07f6a5281 SHA512 295f1a669020bbe2874e9b03afd46b5d083073b276fca3543f3767a2d74f35df81cf0a67abad50c200cf7a3af36ec98ff9977cb7d5c19f334af7d3bb1926a3de
 DIST gcc-15.0.0-patches-41.tar.xz 33308 BLAKE2B d95b2798837a40380d06818fb047b7a5ea2e5a20de12a760b168c4dbb39c7af6b45621034d17250754f6dbc83dacdd7a75ff41c505b158bcf2090eca678d5f05 SHA512 203bedbab8e5d139ac3421e6347a2aecba48f5757ea524241feff7154eb918dad0c7f9f7505bf9041ab67b7c57170f5ea26f8160af3b268aec2b9a1113325733
+DIST gcc-15.0.0-patches-42.tar.xz 26904 BLAKE2B 21fad98bfa977cb359dfeecec5b35d4470429acf103f99e3519a34f87926225e83257f23eb2983adf68d2a8a3089f7769dedfde7302ef9f55c30b59bba47d1bb SHA512 3ede6bf4c908a179b4b9bf8d281385a6ecf64be481479c88ad0b250b6c93050ff76dd2cf6fc9b12bf8b503a123cad2b8c418abc4ab233524d7bd78e1d9f31009
 DIST gcc-8.5.0-patches-4.tar.xz 18616 BLAKE2B 7594cbaea5daecf1a0b3d526c06aeba0a84c6da66aee2e105a51fda6be8d30a37ccc3814281b284a4582d892a1d556bca063551584edfc2525bed8ea5b6888e7 SHA512 1aa5742c361186637e7855f06feb1a4547e7d4d5de6e51f3d049e0ef3c19e2eff179465f52781739f59422035b7f8e4c0efa3844849f920f3c96acfdc37ca6a6
 DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B aa81a1a730fd7371360f6abed6ba78b5843fd18c58d5de5687acc320741b9e430e85df3535a1ef7a26051409be8d2f0945f503e5968480d919103123a99d4b12 SHA512 92f599680e6b7fbce88bcdda810f468777d541e5fddfbb287f7977d51093de2a5178bd0e6a08dfe37090ea10a0508a43ccd00220041abbbec33f1179bfc174d8
 DIST gcc-9.5.0-patches-2.tar.xz 14324 BLAKE2B 1d3bf3e673108ad2fcdcb86daefb4603d1c9f6aa815e34d1591054d466b76d6f50cce124ab4760528c4951ea16eb00888a3e6485417f81ebf250548732df4a8e SHA512 a6d6f650aaf0bd193a17ac279649f0544a282cea295824384c59341c3000eac4b574b60e00dd427585d928f9768166abf85168b47772132790ad98854acacbbf
@@ -61,6 +63,7 @@ EBUILD gcc-14.2.1_p20250111.ebuild 1440 BLAKE2B e19fede45adb75c13176dc209b4ffa68
 EBUILD gcc-14.2.1_p20250118.ebuild 1440 BLAKE2B e19fede45adb75c13176dc209b4ffa6818bd0753db3dd8710327bf8402307f5e48bef65116de97b437987a0eceb153156c3996250ab240f06c68d946f29f2fd5 SHA512 d966850a6b8759390507ffe1975298975699a2272f293e69cef9173b3c252065685ded61a8870700d2dd4d420525d4813243daed279ac7836e00dab4c2cd116f
 EBUILD gcc-14.3.9999.ebuild 1410 BLAKE2B 0f77f0e17b7bf3d617ed4feec61406108d92e9ac8bd3597651b7f6814c45ddf56393228cda23fccf189e3fa106b9d389196da4f565283a10923bfe29a06fbfe2 SHA512 802582faf27fe46fcd75b8b917aa155739e4e0f70d010f14bf42cea3007da124a53fe1ee903e6004d4d8277350ac88d7ade78f79ce8a036b29e14dec45ba2d15
 EBUILD gcc-15.0.0_pre20250112-r3.ebuild 1360 BLAKE2B 2664e6319b5295dcee40ab54f116eb5d95e74f62c9c49895199f2e9ba0c708732ff2ed04ee4c6f427e414383f7033c74613fc3f373f7731273097a154dfaecf1 SHA512 6482fae23fb13f6d726b77d4241026a58e9e0afe9fde4191cc879a9c953625b2c92213d76427f743a5ef54cc4d90eddccc66562e09c21ba48ea15336c8540d51
+EBUILD gcc-15.0.1_pre20250119.ebuild 1360 BLAKE2B 87f127b63e1fc913bd57a354fb9d9a8e8628f22767793ce4a54be7f29ec5af0dd02e22103644318a32f1dcee378e3ece07cc714523d8f9955b377d8d4cb6c610 SHA512 41c9ea8e3932e365c369551c4c9649780cfa8fed2b9b682a1359e4fc8c415ae945f2e59e9d045701bec266946808ff2e486d2fa26eae30e4efe657cbd1a11659
 EBUILD gcc-15.0.9999.ebuild 1332 BLAKE2B 6f17f77603522bac72d4d57094cc086263a9bfe6273c04d91b169ebc23d78fa2943c0950d4a40fe846d9d92648e54ca54ad1cecd5446ed5710062f9dca569b4b SHA512 4e4a673229a36dee68238e10efb2d9e0ff1c530411395e5230bbf567c92342a4b79d0ecb0ec91573c52fd8b5efd5cf6d20e612971848c9529378e0c42c0e213d
 EBUILD gcc-8.5.0-r2.ebuild 549 BLAKE2B 2856372670c76fbe54778c0532815e3510b01b1c8aad99acc3e9183bf6829251952e29887340895625c1e421e19302430ae1a0a8dddcd8470bd71cc221f0b6b0 SHA512 559ba0dbdc7542b6af5d101f19a5b3c9eab38b9996c26330834ffa924fd8c792988f223b492e6ac84255eccbc4af762be50c2d60e84ca24b7a9ebba134608c6d
 EBUILD gcc-9.5.0.ebuild 1257 BLAKE2B b398cea6cb4227fd126b85feb3e735f6b505236f54aecc9983e46fd30dbfcd8f16e80680c231567212c7cbd524b0d485574f7c5c5830137f9ebeea089a641e90 SHA512 0faea0a2389563bede22ba172ae6ab490a693c221bf6700152e9f63b23fad8d74a595a50c40cdf2eed32ee5e9cdddfdb6e2907629036c94034327f5772c93f6f
diff --git a/sys-devel/gcc/gcc-15.0.1_pre20250119.ebuild b/sys-devel/gcc/gcc-15.0.1_pre20250119.ebuild
new file mode 100644
index 000000000000..f62140512804
--- /dev/null
+++ b/sys-devel/gcc/gcc-15.0.1_pre20250119.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+TOOLCHAIN_HAS_TESTS=1
+PATCH_GCC_VER="15.0.0"
+PATCH_VER="42"
+MUSL_VER="2"
+MUSL_GCC_VER="15.0.0"
+PYTHON_COMPAT=( python3_{10..12} )
+
+if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=master
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# Don't keyword live ebuilds
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index b3d3e4a6804f..c76fa35be5e1 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest
index 89986374540c..2cc96ec5f37c 100644
--- a/sys-fs/bees/Manifest
+++ b/sys-fs/bees/Manifest
@@ -2,7 +2,9 @@ AUX 0001-HACK-crucible-Work-around-kernel-memory-fragmentatio.patch 1183 BLAKE2B
 AUX 0001-context-demote-abandoned-toxic-match-to-debug-log-le.patch 1500 BLAKE2B c6f6895b92caae4ac8de83931574f87274d7798889c0589859204d73cd41072ee6967ae908c8509e7f5c929f3a4f04c73932b72a27ab3d244cef254ebc15030e SHA512 82e3e8872e4b9943afff883c3ee420a8850b337914fc0b388171f1331c4cd900778c2263b98ff1705f50f7cd3ffe5868d7f88ec48ab68217471a21573a559479
 AUX 0002-HACK-crucible-Work-around-kernel-memory-fragmentatio_v2.patch 1445 BLAKE2B e1ebe9c50deeaf7eed82c738d172ab332c5048ab192150cc967843ea16f387631ee44c201c43f49c3c0a032a735219f3a08881e5f92fbbf5b85d050eebb1c7f8 SHA512 75655e40084a0f8660773293693d0a214d34c6bb2f861c2e502a4cc5a1576d5c8084b8af87f790155f419affa56886c23eed09532f82c29b2623f553a5c82999
 DIST bees-0.10.tar.gz 177509 BLAKE2B 269cf65d5250a07297dfaee6c0fd6bc25199d63fe423d63ce39df8bcdb64d6f8110a0e03d0dc7dc1b105a8886f2a9364da8878481546eaa8dbf3dc46abc569ed SHA512 77a4ae3d66430c2d9dc0351c16c60bad95f21e238fc00f5f5787f55929ba75ee25212ac4bb4a3e4a9419cec27bbcfd2987aa925a54bc2872609b38a698dbedc3
+DIST bees-0.11-rc3.tar.gz 193475 BLAKE2B bb3d867843266ea5766bc079d6731c79bdc80b9df5cf08a3fa3361ecbe439002a396610b32d3875085c672cf891b55c61ccce7260d22a537d705c2a89b040e4c SHA512 66f42ff60ccdbd56a022d94370aa856453d016d69469c503a2182535b630e5b6d0d0fecf12574f1b23750942b48a9473414424cb9ad1954ef11a3b7a8e6ea1a6
 EBUILD bees-0.10-r1.ebuild 4151 BLAKE2B d0b2ddea9523905f3a5620aa6e0da3c595a405afd34a9ab5488a20e7b1f5c77130d9b56b3856a236004982d6069f213ddacf28a9234f3498cc805b4f9a980f56 SHA512 35d51de04f606c5fe35bd0dd071c58e435398dc304f0520e307974a2436bc358856580f35f1611a8e45b6e1d16b4b67d050308ac61dfb8ea8c60872c616f47cd
 EBUILD bees-0.10.ebuild 4076 BLAKE2B dad615a8ad7fada7c1cd31a5cffa6fad2cdcbc1cf241cc6e602d927cd9c182289d944663365cbeaa27a2f14f89cd8150e7c7196c19b5bbd4cb2580dae80bc19c SHA512 53a60088a2e078e1dec4899d77961c51976f941ca3952de32ddacdb6c03b4e6350d977f159b7a845ec45901bb4cb77b19ca9aebeec2ef1cc7867740df74adbbb
-EBUILD bees-9999.ebuild 4782 BLAKE2B d191d127ce13f1caff8ec7f36b22dab6a95bab5a1ef368b6f6c4645cd1316110f04abe669a15521ab10b59dc969f86e11550bb34f1f8555c405886f86eb1de47 SHA512 e3503e6cd9cd492c37a8f380201d0bf0cd494b3369a7b67811db98f6929833d17d00753426e64e4ef727ced60797a73c825c1987d9210981034b0a73bac54ede
+EBUILD bees-0.11_rc3.ebuild 4809 BLAKE2B 3735114fb0938c72db642ac7f50e672db50657d7d7fe292fbaec8abed4cb74b62b2dae19c92afe13e6c57c409037de34a6eaa9991f93c12cdaddc25f7fcd0430 SHA512 45aa785c348097bc9bb4379995781d628e83713f2700d24dfdac9b191ba002874e56a6000ae69a06cb29ce44a605c3f5146cd8362c65da1fa8e3e8610c23ff51
+EBUILD bees-9999.ebuild 4822 BLAKE2B ff033fca18453e76d49490318246bb34bc2067aba6c6af1660621fcaef37faf45f15cfe52dbbc53d7493e2b8ff8a5c4e19771db271e78e5f42f7d37c7f598c28 SHA512 4ff9f174be78b93805d3471c884494920cd0196669103580de10ba31bf9b7aaa17ff45d2f9ad62090828e8668c8ba1a7a687389b72d61a028922eeb9eaa10db0
 MISC metadata.xml 529 BLAKE2B 69ea069e33d1af7c2c38aa7f8fc61516f23c586ad162d9581859829b084c8da3ef76278173e1ac3afa1ef432355ab14f2ecc01d07f039f8447c20cc27b22d633 SHA512 cb9ba7a32c6a8269f7303ebd41bf0e21f4325560b40bba10aff08a05d07170f9f0e35e687e688f6793c0abf994c9b23f90a47b9d32544636f2d6b5ab51140bd3
diff --git a/sys-fs/bees/bees-0.11_rc3.ebuild b/sys-fs/bees/bees-0.11_rc3.ebuild
new file mode 100644
index 000000000000..c2a394c8ae3a
--- /dev/null
+++ b/sys-fs/bees/bees-0.11_rc3.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent"
+HOMEPAGE="https://github.com/Zygo/bees"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Zygo/bees.git"
+else
+	MY_PV=${PV/_/-}
+	MY_P=${P/_/-}
+	S=${WORKDIR}/${MY_P}
+
+	SRC_URI="https://github.com/Zygo/bees/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="
+	>=sys-apps/util-linux-2.30.2
+	>=sys-fs/btrfs-progs-4.20.2
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~BTRFS_FS"
+ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if kernel_is -lt 4 11; then
+			ewarn "With kernel versions below 4.11, bees may severely degrade system performance"
+			ewarn "and responsiveness. Especially, the kernel may deadlock while bees is"
+			ewarn "running, it's recommended to run at least kernel 4.11."
+			ewarn
+		elif kernel_is -lt 4 14 29; then
+			ewarn "With kernel versions below 4.14.29, bees may generate a lot of bogus WARN_ON()"
+			ewarn "messages in the kernel log. These messages can be ignored and this is fixed"
+			ewarn "with more recent kernels:"
+			ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0"
+			ewarn
+		elif kernel_is -lt 5 7 0; then
+			ewarn "With kernel versions below 5.4.96 and 5.7, the kernel may hold file system"
+			ewarn "locks for a long time while at the same time CPU usage increases when bees is"
+			ewarn "operating. bees tries to avoid this behavior by excluding very common extents"
+			ewarn "from deduplication. This has only a minimal impact on dedupe effectiveness."
+			ewarn
+		fi
+		if kernel_is -lt 5 1 0; then
+			ewarn "IMPORTANT: With kernel versions below 5.1.0, you may experience data corruption"
+			ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically"
+			ewarn "later kernel, that includes older LTS versions released after 5.0.4:"
+			ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+"
+			ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching"
+			ewarn
+		fi
+		if kernel_is -lt 5 4 19; then
+			ewarn "With kernel versions below 5.4.19, bees may trigger a btrfs bug when running"
+			ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst"
+			ewarn "case. Especially, kernels 5.1.21 and 5.2.21 should be avoided. Kernels 5.0.x"
+			ewarn "after 5.0.21 should be safe. In the best case, affected kernels may force"
+			ewarn "the device RO without writing corrupted meta-data. More details:"
+			ewarn "https://github.com/Zygo/bees/blob/master/docs/btrfs-kernel.md"
+			ewarn
+		fi
+		if kernel_is -gt 5 15 106; then
+			if kernel_is -lt 6 3 10; then
+				ewarn "With kernel versions 5.15.107 or later, there is a memory fragmentation"
+				ewarn "issue with LOGICAL_INO which can lead to cache thrashing and cause IO"
+				ewarn "latency spikes. This version ships with a work-around at the cost of not"
+				ewarn "handling highly duplicated filesystems that well. More details:"
+				ewarn "https://github.com/Zygo/bees/issues/260"
+				ewarn
+			fi
+		fi
+		if kernel_is -lt 5.7; then
+			ewarn "WARNING: Kernel versions lower than 5.7 are no longer really supported by"
+			ewarn "bees. While there should be no unexpected data loss, you may experience"
+			ewarn "severe slowdowns or even system lockups."
+			ewarn
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		elog "Bees recommends running the latest current kernel for performance and"
+		elog "reliability reasons, see README.md."
+		elog
+		elog "NEWS: bees now defaults to a much improved extent-based scanner. It is compatible"
+		elog "with your existing state database in \`\$BEESHOME\` but it may start over from the"
+		elog "beginning. However, it will keep the state of the old scanner, so you can switch"
+		elog "back and forth. To actually use the new scanner, use scan mode 4 or remove the"
+		elog "scan mode parameter from your init script. Requires kernel 4.14 or higher!"
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i 's/ -Werror//' makeflags || die
+}
+
+src_configure() {
+	tc-export CC CXX AR
+	cat >localconf <<-EOF || die
+		ETC_PREFIX="${EPREFIX}/etc"
+		LIBEXEC_PREFIX="${EPREFIX}/usr/libexec"
+		PREFIX="${EPREFIX}/usr"
+		SYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)"
+		DEFAULT_MAKE_TARGET=all
+	EOF
+	if [[ ${PV} != "9999" ]] ; then
+		echo BEES_VERSION=v${MY_PV} >>localconf || die
+	fi
+}
+
+src_compile() {
+	default
+	# localconf quotes leak in the systemd unit but are still needed for spaces
+	sed -i 's/"//g' scripts/beesd@.service || die
+}
diff --git a/sys-fs/bees/bees-9999.ebuild b/sys-fs/bees/bees-9999.ebuild
index 193a07fc4468..965748b64f91 100644
--- a/sys-fs/bees/bees-9999.ebuild
+++ b/sys-fs/bees/bees-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,11 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Zygo/bees.git"
 else
-	SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	MY_PV=${PV/_/-}
+	MY_P=${P/_/-}
+	S=${WORKDIR}/${MY_P}
+
+	SRC_URI="https://github.com/Zygo/bees/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64"
 fi
 
@@ -28,10 +32,6 @@ RDEPEND="${DEPEND}"
 CONFIG_CHECK="~BTRFS_FS"
 ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
 
-PATCHES=(
-	"${FILESDIR}/0001-context-demote-abandoned-toxic-match-to-debug-log-le.patch"
-)
-
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		if kernel_is -lt 4 11; then
@@ -85,12 +85,16 @@ pkg_pretend() {
 			ewarn "severe slowdowns or even system lockups."
 			ewarn
 		fi
+	fi
+}
 
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		elog "Bees recommends running the latest current kernel for performance and"
 		elog "reliability reasons, see README.md."
 		elog
 		elog "NEWS: bees now defaults to a much improved extent-based scanner. It is compatible"
-		elog "with your existing state database in `\$BEESHOME` but it may start over from the"
+		elog "with your existing state database in \`\$BEESHOME\` but it may start over from the"
 		elog "beginning. However, it will keep the state of the old scanner, so you can switch"
 		elog "back and forth. To actually use the new scanner, use scan mode 4 or remove the"
 		elog "scan mode parameter from your init script. Requires kernel 4.14 or higher!"
@@ -112,7 +116,7 @@ src_configure() {
 		DEFAULT_MAKE_TARGET=all
 	EOF
 	if [[ ${PV} != "9999" ]] ; then
-		echo BEES_VERSION=v${PV} >>localconf || die
+		echo BEES_VERSION=v${MY_PV} >>localconf || die
 	fi
 }
 
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 755c544c8b2f..8d461d51018f 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1,11 +1,5 @@
-DIST mtools-4.0.42.tar.bz2 441506 BLAKE2B 07afec0aea49427ec71ae8ddde9c1dceb33b2533e9acbde3564b0715efce784b5ea8c2122ff588f84e42435abb73ac9912520fd654a078bf0336e62f35f3ce2a SHA512 fd8d56d2dea9ce5e2b311b29ebdd4d89ec7baaf5f2fbfdc85019d480eff4d198ebf0e591c0f28ee1e39d8b81d49d7d4e9ed94b0e94e5b02ce9bbc03632124811
-DIST mtools-4.0.43.tar.bz2 443673 BLAKE2B d000839bbb6bc647eb5a32b08b40b1350cd0a85fd564f0705ecbfe20f8f4ef21bf2d59cd0ccd7a159c829c019c6c2f3cbdef82ff3f4a9e8828cc13d44ddabd1d SHA512 b70e483688124a653dd333ab127494dab12d413809680a4846dc4ae5c166a0b9938a2ab290e518c1f1a5b18ed96d2c2a29d92d61b16b772a4ab5e495379fe410
-DIST mtools-4.0.44.tar.lz 389267 BLAKE2B 1a6a9d257fc07cf27280a535feac873d27690fb02114b293e31d7c8441de6bbdbd57a13f4ba62ce5a5093cd45683776dd8e61ac822b1d3d44eb98cd21f7b9088 SHA512 8977f43b1cd25a0d1052f9f8f140d73d432bd49a7a4737d0b743a9f8ccec5aff6bbbdc07455011ecc49038b1b1dfd6908dda8c46d06389b1511875f9bc654f84
-DIST mtools-4.0.45.tar.lz 389733 BLAKE2B bb23b310fea5d10e5f0c0ed543e0f8cbac9ba4177128419b6e05fb4a06896a64ddccb27c932eb41c339a0167706e729c2f209837874fe4ac4d165a534802031c SHA512 dd5869fee6f376deab2beb3d5168045a6abc7bbfdea35a274369420c99771ee89477629364a8c677dfba56e0df5c7d2760b6cbfba2d425a89a7b8c21f2b6e538
 DIST mtools-4.0.46.tar.lz 391300 BLAKE2B 997e766b215aebefb23d57f357ea0b95db62a7e3b40712597c38aa11c0f9c47dc43b0b6a34bfa2b976ec8298ed221c5d7d81e9f16dbeb0a4812e3a6cbff16a16 SHA512 1af737cc4793a2e6afe14b5595f085f8aa29e58bf4d8ba89454c7b9a10041a0ebe06fd50b525332c38805c7a9b014fc4379ae1cc259da7626974c6b6a061e727
-EBUILD mtools-4.0.42.ebuild 1060 BLAKE2B d92adedc56a0e1546c388ec7131c11e2c9a14b5fee3fd9d30be1da012d04479b440f56ed410ad598e020b85562ef18aba787e876ba380a05127fe9ae0cc1feef SHA512 a54c3be439cccb4393e965be0f50b23608f338ae611d2f6d3a4b411032638318f178b05198623c8bab2d537ccda40bfac4ac70d4d48353b3ed0409b61384047e
-EBUILD mtools-4.0.43.ebuild 1060 BLAKE2B f26d54fc0f2584f27560d2160efc8d527a70ecd317727adfb051e04bd20bd53ef32568ad96e3a8420256f1416d6c2b52203a5830d25c09bb267cbe58968b3c8c SHA512 852d8572c2f89299ee51e8608ef1d0f500bdc4308fd6d637f3ba4201034158b5c1266b5eab7e64d4e9a9b01845bea1b68327606333d265f86012e7618f8b2304
-EBUILD mtools-4.0.44.ebuild 1106 BLAKE2B 19e50766eebc08fe10b45f1ebabce0cc3b5b9e1e640ab12462c0b41acb3a7f95467447c07bcff1a414700c22ae69ee9d8258e68944e6f5a89e88a4501b359fe7 SHA512 ee30772edcbc8df7a5595b9408bfcb9b48f67adc8f74f20061427d4df6e23a2ddadc54e1b46d61b758ad33708421ef8092aacebe5f31124133a43939282a2af3
-EBUILD mtools-4.0.45.ebuild 1106 BLAKE2B 19e50766eebc08fe10b45f1ebabce0cc3b5b9e1e640ab12462c0b41acb3a7f95467447c07bcff1a414700c22ae69ee9d8258e68944e6f5a89e88a4501b359fe7 SHA512 ee30772edcbc8df7a5595b9408bfcb9b48f67adc8f74f20061427d4df6e23a2ddadc54e1b46d61b758ad33708421ef8092aacebe5f31124133a43939282a2af3
+DIST mtools-4.0.47.tar.lz 391656 BLAKE2B 52fdfdaaea09cf3809b0432237b1491be9c2869fe839e951f11178970ebbc82d9dc4bc6446015e50f44098171493c4d4d191d23c03a0b83819b1dd66934493f1 SHA512 7d3db137a121f5fa54b1b2565048a3be5ac197f25240da037c8200232a0282b1541eb220359e6759e96e77836d2babc0b5a9894c91c5ba7b87b9acc5d1458c81
 EBUILD mtools-4.0.46.ebuild 1106 BLAKE2B d49ab2afe53dd8f3927f5fe5b2baf6075f49cacccd04b6743d20d3bf2f4620f9edac654f4c9e9cbb9d09ef6955ad189ab52adc70d045cd13042d11758c6b8d97 SHA512 44cc66a4e79c19ffd8d39775f7629aa3f3327b6f34f90a807e36ce08eb56d2d5e75b3bc8749154d7eb0accbf6b0c481b9fe2e4532a1aa81c173933d00b24ec62
+EBUILD mtools-4.0.47.ebuild 1113 BLAKE2B 75a5f90687c4ec45906f3878dabcb2c15e122f683c9997acaf43aa27cb5b201952f711e0a5f7a2a129a0b6774db02a3935723a3d040a1faa6f331abe25d291aa SHA512 9037f38a81fa8624473a0ef615ba4097dea5d180cd5e8b68e6a01c5d799933bcdd90f01826041f2c692913322a08c091df833aa7142f769183709d0effec5a66
 MISC metadata.xml 375 BLAKE2B 7b9f85cb5e60ac6716012455042af65e14007d0b913842352098db7a79256b07096b51645ad294dad1d3be6f7acd3aa05bf52985a0cafce9faa78bde4de0a073 SHA512 827ce3643138e41a4ab9b652e16035bfa9e9a0714e69e979841feca48231d4bdbd37252e1d3aa2b5c4753e38215eadc58f8e43c00914ec9888d66078ea5f91c4
diff --git a/sys-fs/mtools/mtools-4.0.42.ebuild b/sys-fs/mtools/mtools-4.0.42.ebuild
deleted file mode 100644
index 7ced3a0a5905..000000000000
--- a/sys-fs/mtools/mtools-4.0.42.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="Utilities to access MS-DOS disks from Unix without mounting them"
-HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos ~x64-solaris"
-IUSE="gui"
-
-RDEPEND="
-	virtual/libiconv
-	gui? (
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	if ! use elibc_glibc && ! use elibc_musl ; then
-		# bug #447688
-		append-libs "-liconv"
-	fi
-
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/mtools
-		$(use_with gui x)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local -a DOCS=( README* Release.notes )
-
-	default
-
-	insinto /etc/mtools
-	doins mtools.conf
-
-	# Default is fine
-	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die
-}
diff --git a/sys-fs/mtools/mtools-4.0.43.ebuild b/sys-fs/mtools/mtools-4.0.43.ebuild
deleted file mode 100644
index 525c9a7b8aa5..000000000000
--- a/sys-fs/mtools/mtools-4.0.43.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="Utilities to access MS-DOS disks from Unix without mounting them"
-HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos ~x64-solaris"
-IUSE="gui"
-
-RDEPEND="
-	virtual/libiconv
-	gui? (
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	if ! use elibc_glibc && ! use elibc_musl ; then
-		# bug #447688
-		append-libs "-liconv"
-	fi
-
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/mtools
-		$(use_with gui x)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local -a DOCS=( README* Release.notes )
-
-	default
-
-	insinto /etc/mtools
-	doins mtools.conf
-
-	# Default is fine
-	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die
-}
diff --git a/sys-fs/mtools/mtools-4.0.45.ebuild b/sys-fs/mtools/mtools-4.0.45.ebuild
deleted file mode 100644
index ada3bde4563a..000000000000
--- a/sys-fs/mtools/mtools-4.0.45.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
-
-inherit flag-o-matic unpacker
-
-DESCRIPTION="Utilities to access MS-DOS disks from Unix without mounting them"
-HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos ~x64-solaris"
-IUSE="gui"
-
-RDEPEND="
-	virtual/libiconv
-	gui? (
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="$(unpacker_src_uri_depends)"
-
-src_configure() {
-	if ! use elibc_glibc && ! use elibc_musl ; then
-		# bug #447688
-		append-libs "-liconv"
-	fi
-
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/mtools
-		$(use_with gui x)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local -a DOCS=( README* Release.notes )
-
-	default
-
-	insinto /etc/mtools
-	doins mtools.conf
-
-	# Default is fine
-	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die
-}
diff --git a/sys-fs/mtools/mtools-4.0.44.ebuild b/sys-fs/mtools/mtools-4.0.47.ebuild
index ada3bde4563a..00ad3bb1d910 100644
--- a/sys-fs/mtools/mtools-4.0.44.ebuild
+++ b/sys-fs/mtools/mtools-4.0.47.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="gui"
 
 RDEPEND="
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 08d9495a435f..9230f810b978 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 8874d5ea6f45..6b3f25401b4a 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-6.1-134.base.tar.xz 6754804 BLAKE2B 36d49584071a74207d07d353e67b
 DIST genpatches-6.1-134.extras.tar.xz 4056 BLAKE2B 7612c02201b9db803c7b7c0b0c6e8c48dab78783e4d144eaf2e798fd0f1fe1e192138dea1802fa7a17385c6ca65ddf9b089cc3e547ca23efa36bda45cf355f5e SHA512 33e35c97ba7017e0b8c78f53aa4ab91e57c0a1f1fc246fec6ba6c3a091577bda2f99ecb1d909f3599d9123f2d99e756b7b6bb5b8086c8ff4cefc28a1827e5410
 DIST genpatches-6.1-135.base.tar.xz 6772832 BLAKE2B 7aad4f211cbebf17baf43c2009e2343f3bb737d8665def616fe5aeed2816e9dffab4762d8a4cb3929c325315db5787d7404dbffe05ac23c3fc0c3327d5449d55 SHA512 ad3a1ffbba27a5ad0895367023db24be96cdb365c02dd77c49fa1e47866db77962a022d268cdebd156ac6e00bcfc24cd571b82b4a772a65f2f8d72874b8e8184
 DIST genpatches-6.1-135.extras.tar.xz 4060 BLAKE2B 3940d48e36b2986d8e97e8cfb56bbbc1118efa61a6077eb4a0c68a8962e03bf1d9896bcdc85f7fb478ff88219f4c10db7af7e83bbd328df2077fd56f309298d6 SHA512 6ad629028fe2b1d38d3949dca050673cf89b57fe229492a9964253f6129183d85ea9200fd3c008d95b0f58251029541895e1675d7ab5cf4c22446006a9765f14
+DIST genpatches-6.1-136.base.tar.xz 6772616 BLAKE2B dbc95219a1c641003a1dce638afcb4f8fac4d291258d7e9e8723fd10835e3eaedfe6b28bfc77db5457d2484053079854ac8ae7ef28d614062ff20d0455764f4d SHA512 99c5609fdeb02c56561b382678f9e33a6fd4dbc454e3dd80bd871a2dfb5ad81ce721125c2def3571de3b80bfbcaa12b322d9a46176e17cfa4c72eafed90e9942
+DIST genpatches-6.1-136.extras.tar.xz 4056 BLAKE2B beb562de00607a2dad56c4fd338f2c5c0453d116336aa8167263547b2a48def2551b051e9cf53ae0c9525cdb280596b3ad1f740721f425ac150fb654881a5d76 SHA512 28a227ee754d258b671213a54489454134922b5d9bc2b4f9f6f51ecb2f23f237e9f0a2ec190e3aa3be46f038d5d35db1a7957b7d4ebb6eef2883ad94d1fb5af2
 DIST genpatches-6.12-10.base.tar.xz 680556 BLAKE2B 1e8b7fc1e380a238f2d3eb9778e0632a3d8d2a9fd59578c866b80d0f6d8452e737aecd3a443f576c9df434d2a81968be7382006db2ca032c9253168bb4463633 SHA512 f5a3dfe69b2dc0517f29a019b20abda79e608bdba568e838c1ceb8d26613fd7536c30f5f92336820a2cf33e89e7470455333b530292e0b63590e2def4d089147
 DIST genpatches-6.12-10.extras.tar.xz 4060 BLAKE2B 9cf7abbfb23624ba1acd2c7fa972154d9c66bcba6e9170c9ba860f7370263cc9c8fa2dce8f1d663bdd10f2f95539a91f1c1f6e914c3a0bffae641c6c73cbec54 SHA512 cf3dc0120d4048cce2f2eb7f105cdeb9c70a95381518523bcbd8df126ad8fb5035b1d6862bd01f5530830e74f27d1a64f8c999382aeca327e80f385b7bb9ceb5
 DIST genpatches-6.12-11.base.tar.xz 711536 BLAKE2B a9911cbb7cca5e6f3b06adba52289957eaccbdef25aa1d1f610ac7d7fde2a1cce46095e3d48b281a9ff0a9e88559a492833f0f39cf151ba560d6f3ff8fa5a4b3 SHA512 d33a54716e726cc8d19b366a7ad1cc51822eba4fa329eda596e6e7dbd851a9725db4e5f4bb827f36a26604b7c0b5a60154a2310f99b18265fb3c68251420fc1c
@@ -74,6 +76,10 @@ DIST gentoo-kernel-6.1.125-1.amd64.gpkg.tar 73000960 BLAKE2B 34049964226c50f2023
 DIST gentoo-kernel-6.1.125-1.arm64.gpkg.tar 65730560 BLAKE2B 56801e6c6ffb5e669f1fbf8d9d95f1f2a49be58bdb2f38dd056ff2ff02d494e7e2e43d6e493d72f8100a43f0c11cb8f074822c319754823042ff4a675263e9db SHA512 5b87abab148597cbeed43988e52abc2f99f53dab405d955676e765aa4f470144bd4b38ffe730673a925f727a9d0839d7afdcafd4fc8fd5761f8db231d25f4600
 DIST gentoo-kernel-6.1.125-1.ppc64le.gpkg.tar 59924480 BLAKE2B 2334fb4c12cf7d4cf11fe4b3bb58d8aa11af9004fd97d87e1b5dab83b3d11557a1b2834b7c8659cf907c050b3e5fe9ea5c4197d54a3f8a48bbb8907f40ed3e70 SHA512 bdf805232cf12e8625a8f5874e6bc374fa2de711de4582ecab3c668bc1f9258f51b77a9ac8cb6aa55429046a719376325bfb40ed302c465ef7b0514046be8b88
 DIST gentoo-kernel-6.1.125-1.x86.gpkg.tar 62382080 BLAKE2B 744a5555991612eb784a1f906b0499dfb2428d9e0304ebe282c6627b03563e5ccfe40c47212f792f56b134a1ec10acf00f1ac40c8fa1b4771e2598eb75ecb57e SHA512 351a9c1d9ca07effdafb82e62f3bae004d2d1342c58cec65c97351f9363f478c8288570c0f4bf77252a2d0fc063cb1ddd6c347cf7cc80855afa48cdaacb5bb02
+DIST gentoo-kernel-6.1.126-1.amd64.gpkg.tar 73031680 BLAKE2B 0f91d5f4c980934d74b0049d9aecf62396ddfa893242e18adeeb8945750fdab6bf75ce7c6fd49d5f925a8918bcf075674a8f8eb2dc4867839fa031189b1bc389 SHA512 4262bc88d8e01268c27e945b00495c15b17b757cf9da2250b956d582fb69dd026bb8d142de9f2ce0188a9d34ad9ead3a317ebe785f1875efd331feca495767a2
+DIST gentoo-kernel-6.1.126-1.arm64.gpkg.tar 65730560 BLAKE2B f429827066c63344f2edf5af47413c74c8f4348a96a049d4c974e8c1e9b94e82f8759e42a743ded14f4eac7437f275df1bdaf0548ceb455a3a014e43f44c2054 SHA512 149ebca698a900b7025127099aef657e59c6c47bcfe480c03f023ca3ad9a70a80912861321b680a9a1155d632dd551bded0dde2156469d444b84d5fc45c36fcb
+DIST gentoo-kernel-6.1.126-1.ppc64le.gpkg.tar 59924480 BLAKE2B 7ea5b27d7fd731c65d375b542fb0211899728aa13a34a9eabb5efb28ad1ceb82ff067f3ccfba01cf4021689749c63be9f147a9a27652b4c10b397c9ec18defde SHA512 e8a932535d30a8c26d05b78f036d4eaf11148af59e335dca1f547d0c9b84c8ec62933aa88ae9f55068ba6758913bed1bf7208ac55f44c0ddd50dfb8157bcb307
+DIST gentoo-kernel-6.1.126-1.x86.gpkg.tar 62371840 BLAKE2B 2dd07310aecd97805ebb6dc74dc620dc2996baaf08bf2c94c9f15d472db00bd97a552f48ff3794497f94bc70a30bda1dd5e0a0b5cece53dc2a8d5ff8446abda2 SHA512 90712aa8e785f6ea5bddba73fd10dad8a07f8676482c87a23ec2ef2df871d21b153b8973494b2d8533d7e30739cf6322c17bd74e10a38c2c33b56ee68f745e23
 DIST gentoo-kernel-6.12.10-1.amd64.gpkg.tar 301516800 BLAKE2B 44bf837abfd4165d0d6a01e08fcea264c3579e5d4f41dda716049fc8ab9905b748b0216b858ad6952a9ffa7574cdbcbaf054c11ac150af21cbacb2d7e82b1019 SHA512 119f4e51d7bba1f146d7bd7ed6e992e688c6eedfeecbc066af9d9af960111df9f0e517fd8e6503784cefed4e8ac53951785071dd401938dc0e976aa6b9babe00
 DIST gentoo-kernel-6.12.10-1.arm64.gpkg.tar 277606400 BLAKE2B e60b300544e8b5bd26207792c2ccf3630035cdfbc6c93296c83f40b19123ef1161dd7f68256a4f1f8b598e0898a736ee499e0cb8c5f314d95da57b44f76ee8ba SHA512 d4a535644955d8a508c28ed1ef293811261cd422dcbe54b18511de2c2ec05e2ef1c06202582f37060fd577a608af47370dbbbb8743528ab1a3bf4f391582d735
 DIST gentoo-kernel-6.12.10-1.ppc64le.gpkg.tar 73103360 BLAKE2B 2563681d420ac7f700c9bc59aa040303405ed0494f845047c8efe8751b26783394ace15f0c32e85e337d998cdde91fc3a7018f739642d6dc3dac8efd22a7e21e SHA512 557decc01e9979c1927823f05bb94cab78b2ec4eab2daf092e9d6cbbca63018343aa5c998197bdbf1149fcac79512d5d9f1b89e1da19607749a9984811cb5eb5
@@ -132,6 +138,7 @@ EBUILD gentoo-kernel-bin-6.1.122.ebuild 3415 BLAKE2B a055768b284fe252a8561a59800
 EBUILD gentoo-kernel-bin-6.1.123.ebuild 3415 BLAKE2B 2a82d9eebf57975c51ebac5e8cac306831d29d423756bbf6d2b8c4a92df78ceed832c80ccf6d201921b8e174f2a4e9c5f2807a0cb7f1e2b25ab71c14e67ff01b SHA512 00081dd1717126236d8468f054e6ac9c07ee1c2c281b221e47585b2d5892a79e967ab49c4b333eabb7056c2afd8648fc8b510b6b8fc2623a340fde47112ea3de
 EBUILD gentoo-kernel-bin-6.1.124.ebuild 3415 BLAKE2B 2a82d9eebf57975c51ebac5e8cac306831d29d423756bbf6d2b8c4a92df78ceed832c80ccf6d201921b8e174f2a4e9c5f2807a0cb7f1e2b25ab71c14e67ff01b SHA512 00081dd1717126236d8468f054e6ac9c07ee1c2c281b221e47585b2d5892a79e967ab49c4b333eabb7056c2afd8648fc8b510b6b8fc2623a340fde47112ea3de
 EBUILD gentoo-kernel-bin-6.1.125.ebuild 3415 BLAKE2B 2a82d9eebf57975c51ebac5e8cac306831d29d423756bbf6d2b8c4a92df78ceed832c80ccf6d201921b8e174f2a4e9c5f2807a0cb7f1e2b25ab71c14e67ff01b SHA512 00081dd1717126236d8468f054e6ac9c07ee1c2c281b221e47585b2d5892a79e967ab49c4b333eabb7056c2afd8648fc8b510b6b8fc2623a340fde47112ea3de
+EBUILD gentoo-kernel-bin-6.1.126.ebuild 3415 BLAKE2B 2a82d9eebf57975c51ebac5e8cac306831d29d423756bbf6d2b8c4a92df78ceed832c80ccf6d201921b8e174f2a4e9c5f2807a0cb7f1e2b25ab71c14e67ff01b SHA512 00081dd1717126236d8468f054e6ac9c07ee1c2c281b221e47585b2d5892a79e967ab49c4b333eabb7056c2afd8648fc8b510b6b8fc2623a340fde47112ea3de
 EBUILD gentoo-kernel-bin-6.12.10.ebuild 4840 BLAKE2B 9d284df32218317e248b99bba07507fdcb812eb9c154e368f76039bcd9dbbeb2d7fe5667616ef1b6ce77c529d24e0f22a8806959330b40a5298eaa064fca4678 SHA512 ef018e3a5c254bf0e71d0a4fafc0881dbc038cda99feaaa27e4722aaf656b5e969877739ea9d2d32b1bf5f150eaa977ea5904805b6234b22fd387b1620b2a98a
 EBUILD gentoo-kernel-bin-6.12.7.ebuild 4840 BLAKE2B 9d284df32218317e248b99bba07507fdcb812eb9c154e368f76039bcd9dbbeb2d7fe5667616ef1b6ce77c529d24e0f22a8806959330b40a5298eaa064fca4678 SHA512 ef018e3a5c254bf0e71d0a4fafc0881dbc038cda99feaaa27e4722aaf656b5e969877739ea9d2d32b1bf5f150eaa977ea5904805b6234b22fd387b1620b2a98a
 EBUILD gentoo-kernel-bin-6.12.8.ebuild 4840 BLAKE2B 9d284df32218317e248b99bba07507fdcb812eb9c154e368f76039bcd9dbbeb2d7fe5667616ef1b6ce77c529d24e0f22a8806959330b40a5298eaa064fca4678 SHA512 ef018e3a5c254bf0e71d0a4fafc0881dbc038cda99feaaa27e4722aaf656b5e969877739ea9d2d32b1bf5f150eaa977ea5904805b6234b22fd387b1620b2a98a
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.126.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.126.ebuild
new file mode 100644
index 000000000000..dd88c26ac6f2
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.126.ebuild
@@ -0,0 +1,138 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 10 ))
+BINPKG=${PF/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local HOSTLD="$(tc-getBUILD_LD)"
+	if type -P "${HOSTLD}.bfd" &>/dev/null; then
+		HOSTLD+=.bfd
+	fi
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTLD="${HOSTLD}"
+		HOSTAR="$(tc-getBUILD_AR)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP="$(tc-getSTRIP)"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+		READELF="$(tc-getREADELF)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+
+	# Overwrite the identifier in the prebuilt package
+	echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die
+
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 729115eaacbe..1a7cdd356399 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-6.1-134.base.tar.xz 6754804 BLAKE2B 36d49584071a74207d07d353e67b
 DIST genpatches-6.1-134.extras.tar.xz 4056 BLAKE2B 7612c02201b9db803c7b7c0b0c6e8c48dab78783e4d144eaf2e798fd0f1fe1e192138dea1802fa7a17385c6ca65ddf9b089cc3e547ca23efa36bda45cf355f5e SHA512 33e35c97ba7017e0b8c78f53aa4ab91e57c0a1f1fc246fec6ba6c3a091577bda2f99ecb1d909f3599d9123f2d99e756b7b6bb5b8086c8ff4cefc28a1827e5410
 DIST genpatches-6.1-135.base.tar.xz 6772832 BLAKE2B 7aad4f211cbebf17baf43c2009e2343f3bb737d8665def616fe5aeed2816e9dffab4762d8a4cb3929c325315db5787d7404dbffe05ac23c3fc0c3327d5449d55 SHA512 ad3a1ffbba27a5ad0895367023db24be96cdb365c02dd77c49fa1e47866db77962a022d268cdebd156ac6e00bcfc24cd571b82b4a772a65f2f8d72874b8e8184
 DIST genpatches-6.1-135.extras.tar.xz 4060 BLAKE2B 3940d48e36b2986d8e97e8cfb56bbbc1118efa61a6077eb4a0c68a8962e03bf1d9896bcdc85f7fb478ff88219f4c10db7af7e83bbd328df2077fd56f309298d6 SHA512 6ad629028fe2b1d38d3949dca050673cf89b57fe229492a9964253f6129183d85ea9200fd3c008d95b0f58251029541895e1675d7ab5cf4c22446006a9765f14
+DIST genpatches-6.1-136.base.tar.xz 6772616 BLAKE2B dbc95219a1c641003a1dce638afcb4f8fac4d291258d7e9e8723fd10835e3eaedfe6b28bfc77db5457d2484053079854ac8ae7ef28d614062ff20d0455764f4d SHA512 99c5609fdeb02c56561b382678f9e33a6fd4dbc454e3dd80bd871a2dfb5ad81ce721125c2def3571de3b80bfbcaa12b322d9a46176e17cfa4c72eafed90e9942
+DIST genpatches-6.1-136.extras.tar.xz 4056 BLAKE2B beb562de00607a2dad56c4fd338f2c5c0453d116336aa8167263547b2a48def2551b051e9cf53ae0c9525cdb280596b3ad1f740721f425ac150fb654881a5d76 SHA512 28a227ee754d258b671213a54489454134922b5d9bc2b4f9f6f51ecb2f23f237e9f0a2ec190e3aa3be46f038d5d35db1a7957b7d4ebb6eef2883ad94d1fb5af2
 DIST genpatches-6.12-10.base.tar.xz 680556 BLAKE2B 1e8b7fc1e380a238f2d3eb9778e0632a3d8d2a9fd59578c866b80d0f6d8452e737aecd3a443f576c9df434d2a81968be7382006db2ca032c9253168bb4463633 SHA512 f5a3dfe69b2dc0517f29a019b20abda79e608bdba568e838c1ceb8d26613fd7536c30f5f92336820a2cf33e89e7470455333b530292e0b63590e2def4d089147
 DIST genpatches-6.12-10.experimental.tar.xz 78160 BLAKE2B d145325c0a3bbdc93b1e7ed86f860576192aa7260cea083508efc581257cfeced92f390c398299adb1c989a513c15a5252e79e9e05737eabb89a98cbda9f5d91 SHA512 5b3b355fbf2109d83104f92486df4ad3881f1a78b3dada8285e195486def7d1668c55c797460504647e43d5a8f4fbaac7523e9c4745387c314fd1a8410083c5c
 DIST genpatches-6.12-10.extras.tar.xz 4060 BLAKE2B 9cf7abbfb23624ba1acd2c7fa972154d9c66bcba6e9170c9ba860f7370263cc9c8fa2dce8f1d663bdd10f2f95539a91f1c1f6e914c3a0bffae641c6c73cbec54 SHA512 cf3dc0120d4048cce2f2eb7f105cdeb9c70a95381518523bcbd8df126ad8fb5035b1d6862bd01f5530830e74f27d1a64f8c999382aeca327e80f385b7bb9ceb5
@@ -85,6 +87,7 @@ EBUILD gentoo-kernel-6.1.122.ebuild 3940 BLAKE2B e25216f0e811fcf6b8fdebf47e1b373
 EBUILD gentoo-kernel-6.1.123.ebuild 3940 BLAKE2B 8911136c4a459ae5d78375628ab9414a74639aa403ec4e838fb3378c032a3fcd0b5e1a407c645e9b53878b9ff2dab53778c40b126c66659bc34abc228c0ba475 SHA512 f7da7e65135152f3a90fc85d42ccdcb99d022f7f1e19299f7988b52e911d7213b81484bd3685773a23a21da16fafee7480e2be595d75e4df23fc9240c002f8ee
 EBUILD gentoo-kernel-6.1.124.ebuild 3940 BLAKE2B 8911136c4a459ae5d78375628ab9414a74639aa403ec4e838fb3378c032a3fcd0b5e1a407c645e9b53878b9ff2dab53778c40b126c66659bc34abc228c0ba475 SHA512 f7da7e65135152f3a90fc85d42ccdcb99d022f7f1e19299f7988b52e911d7213b81484bd3685773a23a21da16fafee7480e2be595d75e4df23fc9240c002f8ee
 EBUILD gentoo-kernel-6.1.125.ebuild 3940 BLAKE2B 8911136c4a459ae5d78375628ab9414a74639aa403ec4e838fb3378c032a3fcd0b5e1a407c645e9b53878b9ff2dab53778c40b126c66659bc34abc228c0ba475 SHA512 f7da7e65135152f3a90fc85d42ccdcb99d022f7f1e19299f7988b52e911d7213b81484bd3685773a23a21da16fafee7480e2be595d75e4df23fc9240c002f8ee
+EBUILD gentoo-kernel-6.1.126.ebuild 3940 BLAKE2B 8911136c4a459ae5d78375628ab9414a74639aa403ec4e838fb3378c032a3fcd0b5e1a407c645e9b53878b9ff2dab53778c40b126c66659bc34abc228c0ba475 SHA512 f7da7e65135152f3a90fc85d42ccdcb99d022f7f1e19299f7988b52e911d7213b81484bd3685773a23a21da16fafee7480e2be595d75e4df23fc9240c002f8ee
 EBUILD gentoo-kernel-6.12.10.ebuild 4187 BLAKE2B 2fe745f8d9278a6ef0b4545e8a9298b71d911003a70f8a4e4929bcb6d48a0e50273a1d6a96f4158b75c9edbbd562567ccb627471b812a16b97615cb04255b286 SHA512 e5060cb5e03adeac9a4d9c6b7477f9296f6354dbcc66c1c65e717f4819547138a30709b7ced7cb17b281822c0367b678408e5748817a15cd6a297677224c61da
 EBUILD gentoo-kernel-6.12.7.ebuild 4187 BLAKE2B bb85bd698eb5080f332b7d751533d72383812e796f57f2377e695ed9b181b01c7edba86e6b416b496519746b4211579fffebf9bf440bd805953522e01b14e555 SHA512 0cc6fcb09cfe7d9b9add4a0d2f952173a181dd05993210cf3b733b5aeca9d210347ea95b72fe56c7213be003a2e9ab92c9ee584dcd063ae8022f6d44443a5260
 EBUILD gentoo-kernel-6.12.8.ebuild 4187 BLAKE2B e1f65a640a39ed20634b049b18159280f5f5d99d9de414d1bf0252f573030377f7ea1a65f9ac66a67b9e2c4cc7cad7b8db3931236382f3feb3dc8cd8cd2e1abd SHA512 8c6fc3e9fe5063a79f6673d44be94b24e3d14b6fee71038bf47b77e7b174f6aa193179702272f4d7c97ce8ab8c3f5c5fc88243152da91788dd0c3fe58542cc23
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.126.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.126.ebuild
new file mode 100644
index 000000000000..1009a9df0132
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.126.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 10 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.102-gentoo
+GENTOO_CONFIG_VER=g15
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )
+	sparc? ( savedconfig )
+"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		arm | hppa | riscv | sparc)
+			> .config || die
+		;;
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 953530168004..f15fe55a24b2 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -28,6 +28,9 @@ DIST genpatches-6.1-134.extras.tar.xz 4056 BLAKE2B 7612c02201b9db803c7b7c0b0c6e8
 DIST genpatches-6.1-135.base.tar.xz 6772832 BLAKE2B 7aad4f211cbebf17baf43c2009e2343f3bb737d8665def616fe5aeed2816e9dffab4762d8a4cb3929c325315db5787d7404dbffe05ac23c3fc0c3327d5449d55 SHA512 ad3a1ffbba27a5ad0895367023db24be96cdb365c02dd77c49fa1e47866db77962a022d268cdebd156ac6e00bcfc24cd571b82b4a772a65f2f8d72874b8e8184
 DIST genpatches-6.1-135.experimental.tar.xz 17448 BLAKE2B 8cf360e805c815a87c69fada8a78bfcd65e3f6bc812dbd4a330b49da26d57149ba8ed46d4fa43754cb35912872a5f090fc05a0327baf2a9255bc992a37704f8d SHA512 a032e6450e2d804d8f488b8f2430ecf0a89d9a7c7bc438a10e5f9126b58a0e83fd9d8caf419ba724ff2f8c6c9c986119a4e582c243e7e12333bf955bdd26ca38
 DIST genpatches-6.1-135.extras.tar.xz 4060 BLAKE2B 3940d48e36b2986d8e97e8cfb56bbbc1118efa61a6077eb4a0c68a8962e03bf1d9896bcdc85f7fb478ff88219f4c10db7af7e83bbd328df2077fd56f309298d6 SHA512 6ad629028fe2b1d38d3949dca050673cf89b57fe229492a9964253f6129183d85ea9200fd3c008d95b0f58251029541895e1675d7ab5cf4c22446006a9765f14
+DIST genpatches-6.1-136.base.tar.xz 6772616 BLAKE2B dbc95219a1c641003a1dce638afcb4f8fac4d291258d7e9e8723fd10835e3eaedfe6b28bfc77db5457d2484053079854ac8ae7ef28d614062ff20d0455764f4d SHA512 99c5609fdeb02c56561b382678f9e33a6fd4dbc454e3dd80bd871a2dfb5ad81ce721125c2def3571de3b80bfbcaa12b322d9a46176e17cfa4c72eafed90e9942
+DIST genpatches-6.1-136.experimental.tar.xz 17448 BLAKE2B 245a9df2e791915864072375c0f62eb720c4b536bfb9ee1d901beb8ac450381f00564a7df8955529ce23c4fbfff98a8302c8d06b71f81e7310ee682c083e0dd1 SHA512 bf40e8e02439d1a74e99192a642b4c1adcb9ffa349d193d3d12fb6c184264d6076926d2325421e00c518aec2472c36bd5ea95141a91a2632ebf11ff8ac6c1139
+DIST genpatches-6.1-136.extras.tar.xz 4056 BLAKE2B beb562de00607a2dad56c4fd338f2c5c0453d116336aa8167263547b2a48def2551b051e9cf53ae0c9525cdb280596b3ad1f740721f425ac150fb654881a5d76 SHA512 28a227ee754d258b671213a54489454134922b5d9bc2b4f9f6f51ecb2f23f237e9f0a2ec190e3aa3be46f038d5d35db1a7957b7d4ebb6eef2883ad94d1fb5af2
 DIST genpatches-6.12-11.base.tar.xz 711536 BLAKE2B a9911cbb7cca5e6f3b06adba52289957eaccbdef25aa1d1f610ac7d7fde2a1cce46095e3d48b281a9ff0a9e88559a492833f0f39cf151ba560d6f3ff8fa5a4b3 SHA512 d33a54716e726cc8d19b366a7ad1cc51822eba4fa329eda596e6e7dbd851a9725db4e5f4bb827f36a26604b7c0b5a60154a2310f99b18265fb3c68251420fc1c
 DIST genpatches-6.12-11.experimental.tar.xz 78152 BLAKE2B 20a933a7a74056026ef8b74fd0a4cf41c425855e042a0e6cf9a1b1f0eda77a2c186712fbf59188ffcb31a3c3ba954f7df4e35c5c2dce26c2479af6854af1381d SHA512 90cccbf1c8523197e56661ad34c71d2345dbbebf1f58e4678e45bb75f0b3a057614e996788e7eccec01b5bceffa93d77d6cf259475c1619d8907927a44cadb77
 DIST genpatches-6.12-11.extras.tar.xz 4056 BLAKE2B f8c2a145a06ea061100ba4d16e873a3186c4025d48610180aed135a8802494855decd8a58c24ffa4dd394cac843e41f45dd8aa93c28e03cdb1d46d8ce496da17 SHA512 e2808c8a70aaf3ef76348542a0aa0656f1ccdbe3523b22e5539d0c3952b4013aafddca5d881bc0458aab33f1b652f178d89ae4e596a9f541274f74eaf97ad16b
@@ -68,6 +71,7 @@ EBUILD gentoo-sources-6.1.121.ebuild 740 BLAKE2B b43c0d889fa88f68c0d3fe7fb86b278
 EBUILD gentoo-sources-6.1.123.ebuild 742 BLAKE2B 165c7c6b3f027d31469f2e47bc93cc8474daf68a1b6dbd86a2e001af369136acab62c2bf8455ff7376e7ca3c05e0c4682a9f4147f152bd4a5f7b86c95c7b0262 SHA512 2cd6dca75721a6974f6b5f84a02b3ba730b6ade0ff66f4571fe2bebb72a0bf3c59c1d26eecbb3ee0610e0f6a03dd8d2343b36e34a7e5fa070eae578d91b4b8a4
 EBUILD gentoo-sources-6.1.124.ebuild 742 BLAKE2B bba0e9316b07bcff1c85fc9cc39cd62f2a158e70e4383ae5f16932170870b591cef658fe46dafa4c52aee9e32340304634901a6ea009078a428b1efb24473f9a SHA512 2c73de92be88194a87700c1af5a776d0987bd8bdbf63837457f63c6e530c0f4ce5f6e0ac8040942e2987d44e7c4be17540601bdfa1c8efcf176341362cee9251
 EBUILD gentoo-sources-6.1.125.ebuild 742 BLAKE2B 7429f552afc4e1aace0ec5ce6f4ef5b990b1f99e7ffe131703892a027fac6d9dddc4005f4f5fa028464192ce38ea131f5c4e79c140207feefa74ba0d7d6ede39 SHA512 4330fa6dff2e0c29ff1cead3c8b280d24e98cfc28390f4f98bc8fb4ca754977a5be82707f0e12c305b99869bc962d330fadbeed7f1ee1cf5f89296f6a5117223
+EBUILD gentoo-sources-6.1.126.ebuild 742 BLAKE2B b42a3c7df6cd6ad67c7a6d5ddcbafad5fae1ad46156f33c49481037e1a8d71b1f746e0aea11451f0f16ccb1c6e73a0b6833d23fddc723f594cb5c2f4041d4332 SHA512 6858137ff7f09df31e3a4bf610b1b4b9941fbbe252f7892ef6f3577dd288c4b19150a7fded55e641272caa5e98b74a9447a4a64c2638dd60648590ce830312c4
 EBUILD gentoo-sources-6.12.10.ebuild 928 BLAKE2B 5dd2bf9aaaa0faf2a59555fac109db8854e6c14a55575c5259aa534fa4fb16c15332da4e9b4070fa966599529cd81d7a29da10c3b166e0fd10f143e3a2f49c6c SHA512 66704c13423c9937939b14ec03c75603d5adee7d1aeac20ee1b2267215bb36b3be3f9f23cfd26b62ab6b11a2d69c4d44d57d78e8088682cc6bcb2d85ca94173c
 EBUILD gentoo-sources-6.12.8.ebuild 928 BLAKE2B ebe67a3ed19514f07ec22da85631e495b3ea775b0327ce4bb0e0e4ea17b6ee31988136a94a5c93188590fdd197ec6cff512bb27a3c8505309973e680eb91dc34 SHA512 1020ff78610ca30879ddbaaf11397798a8763f074eb9da164b97607ed6ea907768b274c00c9872f453274a3142c17d3a51d84c10a63591d82ff90de9d2879ca5
 EBUILD gentoo-sources-6.12.9.ebuild 928 BLAKE2B 4364c7f416e0a8045f824bd40d52a147a86d17f7d7b35cf3cf60c3b34032509b52cb682eb028067a813cb51ba5db7d0f8ff43481757e3211af9b5adf125637dc SHA512 427cf65c50855d9265edd0312951b8a3e7cb125697da06367936e197e7c03dc7469bbbac0f752521881c65773820264468dbe8d62fdb1deaaeb0d3069cfe2673
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.1.126.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.126.ebuild
new file mode 100644
index 000000000000..f5c3d7197fcf
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.1.126.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="136"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="experimental"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 763cb14143f1..98aabd5f7cb1 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -38,6 +38,8 @@ DIST linux-6.1.124.tar.sign 991 BLAKE2B 7971f9507ecef5558140dae20d7dd94940a5d53c
 DIST linux-6.1.124.tar.xz 135262588 BLAKE2B 6e261cbbe8140bd80237675c8680d20dc155afcd9645191e07b432c10d2ef9e04177f3071ea0301ad2ae28db50cff625cc2c2bd57d31e77ebc3674399adc8a09 SHA512 0adeebd2f6d90aee2e04783d8b7c674a755b0eec4a762a3722399f23066f53818315657b531a316bef8f1f4f60e1a1aff1fb6d7464a3bbd9ceed07a64095aea6
 DIST linux-6.1.125.tar.sign 991 BLAKE2B 2fea5a2d05b049e07bd96cebf4865edc816f9f7bdceab2f7578d6873abc3f6cd27c43cf435bced2c3cb5ef44ccd354899dd184f404eea2a1bd4e66e858f12b4f SHA512 105570d87e41a54a26dd18b19d5375eb570cc5ea8341e04e88e7f8ef1b52636677de6f006b8be55282750707b60dba30cf66cb235762cf0200c48ee1cad461c8
 DIST linux-6.1.125.tar.xz 135233848 BLAKE2B 4672c10bc13474e3926ee7164e65bd2fd1fbfa3fd9fb05ed8f16cc3d9329f75731ddeeb7fadd087cba1e3009e141380d47954bf72cbe52052d3d483ad82f2443 SHA512 a3704caa861698bca1dc70c77cdb2ae87b00a68aee396ff03b5de6425f50557be1ae5fa0feb1619f2754c7cc25a19dc45778a4ff8c01be01564e566eaf38fd0a
+DIST linux-6.1.126.tar.sign 991 BLAKE2B f10002d40b71ce98dc9f29d6f65ce43e81026f505e34b71f34f261f9c7089952c1a86e0821d8c405f7042b77b35c3e6a59fbed441b037df500869678159fb4a9 SHA512 c2c0be96a4b568e8e62f063d7e10f2069e1134aa068d74bfa49074c10def38c33228bcb1ac15a819451ad8009ac768a73caba68a43599104f78416a4d71b7aa8
+DIST linux-6.1.126.tar.xz 135237884 BLAKE2B 3460821f9d8798ad578730683b53cdb6db7f62bfb607ff4e53ef01a94ea6ce2b5bbe50e6a6bbb81c42230ed8bdf066a203ff6b1a2be46d85c6925e061bb4cec2 SHA512 690e8320c83c7839f6d4f8fe6ce84cda2ae2b5166d6383a29e7659073348fd87dc5602630ab0e831804ed3f2cdd3c703f75fd46796d57c1ac477cfb4bf1bab50
 DIST linux-6.12.10.tar.sign 991 BLAKE2B 80ba784ca679c8c531c932cbf37dffbedfc50b4ce2a860b8f196c0db13213f0d2ee114dd747eb9c4fde868a44c0fdb2c19cfed1914c30bd94dc22f4fac5c6953 SHA512 0e58b435ee000dba1343c20b6d544d7ee19541a2258ae3754b8882bd2a0d2082d41149994b76b717f6b92321a659c9c90ff0f59aff3c17e691858add64555092
 DIST linux-6.12.10.tar.xz 148033172 BLAKE2B 3146bbc9075b84db4c6ad3a64cbb91e3c379d0b8e9e90029eaf6a5bd37ea2b8a0a4ac1227e73d0e8acd20cab392841e046e148523bdb206302ea6c37a934b451 SHA512 34252b61399495e71c945b617e05d2c55e44a0d9ac0b118bbfc698da54927550f33d067ca6ee8bb2fbcc773aba767ddfaea4c52c3fa357771c69793b76cd75d1
 DIST linux-6.12.7.tar.sign 989 BLAKE2B f991ff0c9c1c5ecd7a7ab2d1f2179ebcc68253230134adea804aa95206611ea7b2034d3e653ecb257bc800189720e4c59c30fb1f788fa1bc0abb1ef914a45807 SHA512 261ed11790468b753a45b074fb578d2d3b88277df1c508a8e5e0ce3221ca1f8a9549afbec12e90ef96acf788be4ea7aa82e46ebc54225a51d4ca2a3aead5344e
@@ -69,6 +71,7 @@ EBUILD vanilla-kernel-6.1.122.ebuild 3884 BLAKE2B ddfee1aaf8746615bdea9254735ec3
 EBUILD vanilla-kernel-6.1.123.ebuild 3884 BLAKE2B b4892cf5fe787f83cfadcd0aa6f1d78569d4bb2625228a2fc344a58fee4a5577c1db58be489ca0a75125c52aadff963d1dafd5d9f6303058e0c282e68b4453aa SHA512 f32e04c19b0297849931208e9385d8440b47acbf7d5f215595b503b3ada10f4a3a84d3f78d0c64015dbd6ad49510f8031d5db56e01a327e631c119a25588ce0a
 EBUILD vanilla-kernel-6.1.124.ebuild 3765 BLAKE2B 6514f931929426b920ff820035a33ed6dfa69af7befe234c0f8c88db8806e2805eba2bd93bce3c12ee880c256b90ced1abde98c18c68e86ad1c92b5e59e98cfa SHA512 09782adf4d53ba93e36824446e531a364eb3835785ea6b3f930e622a942f553bebaf8ef23da76e9c89bfa0da37fa9d060259d45e85eb113aa2479135345f4e0f
 EBUILD vanilla-kernel-6.1.125.ebuild 3765 BLAKE2B 6514f931929426b920ff820035a33ed6dfa69af7befe234c0f8c88db8806e2805eba2bd93bce3c12ee880c256b90ced1abde98c18c68e86ad1c92b5e59e98cfa SHA512 09782adf4d53ba93e36824446e531a364eb3835785ea6b3f930e622a942f553bebaf8ef23da76e9c89bfa0da37fa9d060259d45e85eb113aa2479135345f4e0f
+EBUILD vanilla-kernel-6.1.126.ebuild 3765 BLAKE2B 6514f931929426b920ff820035a33ed6dfa69af7befe234c0f8c88db8806e2805eba2bd93bce3c12ee880c256b90ced1abde98c18c68e86ad1c92b5e59e98cfa SHA512 09782adf4d53ba93e36824446e531a364eb3835785ea6b3f930e622a942f553bebaf8ef23da76e9c89bfa0da37fa9d060259d45e85eb113aa2479135345f4e0f
 EBUILD vanilla-kernel-6.1.9999.ebuild 3423 BLAKE2B 129dcee9c807c2b5b57bd572e413c2ada69a82e516618ffca0716e3eb4627ab39022937fa9d591990c45ace930e9212a74a19c7c9312b289fd8ebb42a3d3a642 SHA512 d160fb8984ab9babf2ab9e966fa010f20fe80a77ae87be05487372967fcc044b641a3649aa709a25db229a295f87bf70fbbc3a915e36d4952f8a2c250f1306bf
 EBUILD vanilla-kernel-6.12.10.ebuild 3883 BLAKE2B 00885614fd20a67e629468ff0e03e60ac80fd35284674ebf1c4b2d3173e96250c1072791448041bcb625e09bf8921909ead84491f5a0ffc6b65a51c0a626de22 SHA512 4152f6492a4620c8761a3ee21267f64b8afc2ca22f0ad28c3e4704071d652ba1f4e3a35d98fa676b465cccb51ca773898855c1e9ad5b0626ad5a7c616c29fb12
 EBUILD vanilla-kernel-6.12.7.ebuild 4002 BLAKE2B 834f96c73cc93d984cdb3bba2ab0c4a347aafea7a038ce7f67db58eebf9b651f7e4a75e1a9a428892a373cf8cbc7fe871f47c7b040e8fc6203e73f0da154e740 SHA512 467c3d885517bd1d9b4afef459c9ef6e02c2060fc8175e01c23702a6ca95f0df9fe7593a7f1d954c083adff868313b500fb514c641c83908ec11f5a5c95eb75b
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.126.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.126.ebuild
new file mode 100644
index 000000000000..f922ce9dc716
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.126.ebuild
@@ -0,0 +1,132 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.102-gentoo
+GENTOO_CONFIG_VER=g15
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_uncompress_verify_unpack \
+			"${DISTDIR}"/linux-${PV}.tar.{xz,sign}
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		arm | hppa)
+			> .config || die
+		;;
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index ac0f406d1589..f6df4e88e914 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -7,13 +7,13 @@ DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f
 DIST patch-5.10.233.xz 6476496 BLAKE2B be807be55a22c33c5acaf5becab8374b4f1ff5a10af1899ba181d3bc0e3e6e648e964675adc52a350e2eaa11b685a3b8680ee644a92308e2ad8f73e651488225 SHA512 ea2e0987deae3e63d4750eff20bb7d4be4a9f0700811b8ca95607918fe3eaf3d523b108f42d4eb4c444761a3244e31d70510848cc83740ac68e63e10a732e150
 DIST patch-5.15.176.xz 6532700 BLAKE2B 1f15c23c723dbc35fec0ed305d320aa6c9c6feffc63e07b9860aaeecd6fe2f7392bb95ecae00aa96b60a48052847b34e09e2623a763d2e6b5d750027c61a77c0 SHA512 7d47dc0392b5d02229d112505e96562a0a8b7e032513ce77b9a565fa0248ee6dfe26938039191c1973ca67e75953863cb64bd6b2803f152d9ca5163c323d0aa3
 DIST patch-5.4.289.xz 5882012 BLAKE2B f4f550cd13dbb930682ccd9a1e64dfdef879f419d402348c34490b6f1259aa2abdf13b8d37b9ae734653dfdcf4f60a000be1d5e515c992457a9122200fec9733 SHA512 bf5f04523e8186fe512f7563a6bf98cdc12864dbf72998a7dd79686631e75d900912df74d3136607e46c997a0650613e67b7500c31658025eb8958c19a37df1d
-DIST patch-6.1.125.xz 5697064 BLAKE2B 703c1937ca0ee2d2a91efca149a849ea9554473c586db5a66b8064db06004768b8983e19bcc803542274389f221ba78e22e1c087289c3fa5e4ddc9ee2548a1bf SHA512 59ac80448c5ae0704771838ad7288b10b03ef6a019bc7021173e8f0a2df62205ce8c112ebd15ba044a0448e5085666fb9d63dd05a4b7aec4eb8c30fb847c65bb
+DIST patch-6.1.126.xz 5696704 BLAKE2B b5553f995d610b335019c157d5246c472c266fb3e6d4b185cb786acf037f029eeae5b246aeaafe42687685ea15eebdb4991bc9edbed970063482ff3e7106a37d SHA512 331400c4179baaf521d53b9d466dc7857419d6ed2c5040ac765f0e17423869ae7a2426ba5986c3a7ba8a992fe782f0aa4d3e1c0461758f9469c3957767a373c1
 DIST patch-6.12.10.xz 781776 BLAKE2B d23e3782e515d73bd86640e29e9580b617db7c2185e1b44164e2e7fe699e5c668246e2654df5556cc1f1d5da7e4234a3890756b7b9ff481645eb24c98362ced6 SHA512 cb5e1d9e6381dd7f9a68359aeaf2467dbe754434697c7b80c5d950976fc8b38ede5cde59683e03ab1ebc75702dc3c8152461fd61dd67073051ef4707ca7103bd
 DIST patch-6.6.72.xz 3729052 BLAKE2B 364a72ede5004a77366aaaf87229d7904d248c4da9d6d837f3e08763b59a8828f44918e12f7e7b03acd448c74d533aa9d2ebe371b9c7841a2ca3806c6acc7cd2 SHA512 b444f212d3923a1270b728737f662a2d009554bdc4b186515de259b64fd8525db4813c0e4b2d1f73908152e506eb4e4be934660b146739cbdbe9e4042a642c92
 EBUILD vanilla-sources-5.10.233.ebuild 426 BLAKE2B 50821aa558c5e1d7d69c57795ac7fcf0f83e1284db11abf31b5eaf870e28b6c356df27c4ddc74e00f11be5c7564b40219619c466b68e78b15a67afd59f26e6de SHA512 cf52b712c691f668c75e06f13e85c74fe85c31829bc0c1a077d9c9ea7e9e8f606721c47bc6c9d84971d86448ae792a8251d00e4992360c97eedfa139a3304282
 EBUILD vanilla-sources-5.15.176.ebuild 426 BLAKE2B 50821aa558c5e1d7d69c57795ac7fcf0f83e1284db11abf31b5eaf870e28b6c356df27c4ddc74e00f11be5c7564b40219619c466b68e78b15a67afd59f26e6de SHA512 cf52b712c691f668c75e06f13e85c74fe85c31829bc0c1a077d9c9ea7e9e8f606721c47bc6c9d84971d86448ae792a8251d00e4992360c97eedfa139a3304282
 EBUILD vanilla-sources-5.4.289.ebuild 426 BLAKE2B 50821aa558c5e1d7d69c57795ac7fcf0f83e1284db11abf31b5eaf870e28b6c356df27c4ddc74e00f11be5c7564b40219619c466b68e78b15a67afd59f26e6de SHA512 cf52b712c691f668c75e06f13e85c74fe85c31829bc0c1a077d9c9ea7e9e8f606721c47bc6c9d84971d86448ae792a8251d00e4992360c97eedfa139a3304282
-EBUILD vanilla-sources-6.1.125.ebuild 433 BLAKE2B 35e176ec4412789dff75107349dc6aaab7e52ce3d613016422458bc3649774d7b679f01f93a34f6f6dafba00dab7e4a86a30585c778428e36a266742364c30cf SHA512 56f5529cb0b06a0333d573fa1ec09861fc798ce10c0c9ee0a9a9ec08a8417bfa78a348ed0393737260148fe47c74f5df9e378cdbb8f29772d3388aebbe672386
+EBUILD vanilla-sources-6.1.126.ebuild 433 BLAKE2B 35e176ec4412789dff75107349dc6aaab7e52ce3d613016422458bc3649774d7b679f01f93a34f6f6dafba00dab7e4a86a30585c778428e36a266742364c30cf SHA512 56f5529cb0b06a0333d573fa1ec09861fc798ce10c0c9ee0a9a9ec08a8417bfa78a348ed0393737260148fe47c74f5df9e378cdbb8f29772d3388aebbe672386
 EBUILD vanilla-sources-6.12.10.ebuild 433 BLAKE2B 35e176ec4412789dff75107349dc6aaab7e52ce3d613016422458bc3649774d7b679f01f93a34f6f6dafba00dab7e4a86a30585c778428e36a266742364c30cf SHA512 56f5529cb0b06a0333d573fa1ec09861fc798ce10c0c9ee0a9a9ec08a8417bfa78a348ed0393737260148fe47c74f5df9e378cdbb8f29772d3388aebbe672386
 EBUILD vanilla-sources-6.6.72.ebuild 433 BLAKE2B 35e176ec4412789dff75107349dc6aaab7e52ce3d613016422458bc3649774d7b679f01f93a34f6f6dafba00dab7e4a86a30585c778428e36a266742364c30cf SHA512 56f5529cb0b06a0333d573fa1ec09861fc798ce10c0c9ee0a9a9ec08a8417bfa78a348ed0393737260148fe47c74f5df9e378cdbb8f29772d3388aebbe672386
 MISC metadata.xml 340 BLAKE2B e283ab9d2ebb7212e3ba37850c93761f165b4697a2ee6dbf07a67ce907df8ec71b3290a411cb81af8d8d8869b7e45c572487d4d2667dc0a0971986f0f6d1aa8e SHA512 bd0f7f570230dd5bd9f6e270345a3ebc556eb2dbcd19b04e33b5c6df8d9e6735a6e23fe934b39d9ef130ab5e78c6fdd29d7a167cb8ee4ac8ce919c75cec7425c
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.1.125.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.1.126.ebuild
index fe614dc5495e..fe614dc5495e 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-6.1.125.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-6.1.126.ebuild
diff --git a/sys-kernel/zen-sources/Manifest b/sys-kernel/zen-sources/Manifest
index 04b8b636dbdd..2ad5f743276f 100644
--- a/sys-kernel/zen-sources/Manifest
+++ b/sys-kernel/zen-sources/Manifest
@@ -1,6 +1,6 @@
-DIST genpatches-6.12-8.base.tar.xz 575036 BLAKE2B aa22e2f16cec22a76f2ccba2acd9d55b66a93851e01d2cf0af19e9904c6210550ece4699e19918a88f8ed5d5e78dd5d81afdd2a94541ec97d349bfebae26835c SHA512 4251ebdbcec4649663541c8dba7eaed3b674612aeb68a0cbef94e0d0ea5820370a8996f33c316a3fcd6ee94eafb489dc32a22504e94843a71f464a3650647e1c
-DIST genpatches-6.12-8.extras.tar.xz 4056 BLAKE2B e6aa730acecdbb82f7983e34df47db46f473a792d19b848d4e4a5d25b52bc7d247217a12f708698f0473ef6eae33eacc704bdb36053378ae8b86e4d80713421b SHA512 c9da9965144e3adc7cc6d0168a1fcfb8165102ccaec2cdb9c4fc909d8e2002578263e12f1c2f56f21ec3b9d2d7a0a69b53dcd7d9dccbe40a9417ca0f6cfb43cb
+DIST genpatches-6.12-13.base.tar.xz 806528 BLAKE2B 0eec1195d5a497e64556d992893f251a54c558151aef1fc1d03de0b95bdbe03588ef486875e7676f9635da62e975dd8509279ed2d96b4dcb3796e1d8a4bb3768 SHA512 3cf8549679aae42fe56a25c0f9d5eb5c59fb867c77dc22c21446064e55d91276ec75f60f5737ab9a39c82dd0e74ab1ee3bd62b5a78f7448827b5577257976aed
+DIST genpatches-6.12-13.extras.tar.xz 4056 BLAKE2B af48fba5d81bf8e13658555d94fa131e3f8fa06144148dd11b58823f802c5c4aea823fc4cd8f308ba6518638b65637d0b8a030d513d4b2a05384fc8f40550d94 SHA512 d7b1290d44696284fde4980ad3b90a190659056739a084ae704d1edf1a06ee166fa78960a42999b9e6e2d8aad4fd330621c8865f5e2517f1453c916d6375a365
 DIST linux-6.12.tar.xz 147906904 BLAKE2B b2ec2fc69218cacabbbe49f78384a5d259ca581b717617c12b000b16f4a4c59ee348ea886b37147f5f70fb9a7a01c1e2c8f19021078f6b23f5bc62d1c48d5e5e SHA512 a37b1823df7b4f72542f689b65882634740ba0401a42fdcf6601d9efd2e132e5a7650e70450ba76f6cd1f13ca31180f2ccee9d54fe4df89bc0000ade4380a548
-DIST linux-v6.12.5-zen1.patch.zst 157222 BLAKE2B 602c33c9489e859c966ea211ca346590c3b97ecd179d67963b1ed93009b29fa293e21e7aad24dd3013d15881ad41b7f271faa94e097703e99cde8d264f81ab0e SHA512 04ed8a1bc2ea6bf2f73e79d23515d9ccb9930102e209bfaba3ce9d1154b33b039f429752f07a2c6ac5d6fc294c797bcf9dab7b217b73b18357bbd59a865afe0a
-EBUILD zen-sources-6.12.5.ebuild 1386 BLAKE2B 9669e116c0b5de26362ca0cdfe8bc12103874996590629d211917625ef8f5fe8eede4a990fe83e2f2f0c58e80239668382355160238cb8f1d6c241c37b7808a8 SHA512 97004a72a08d6ea0e7f7a22bddf91dd50319ad51d2afa8f127e4d26e737185870a75341debdb8e68d0967bc84477a5e979b8143fc6ea0395a6db95fdfb4fcf8a
+DIST linux-v6.12.10-zen1.patch.zst 166324 BLAKE2B e4003dc5ed2278f85c8ae75bcb16088d58a7d04396c7b1b680861b485e97a02006182d1b0882560b1cdb533401adf3e9bb173a8d06f7740af1d87543ee195f36 SHA512 0c642025c0fb4db5abe69fc2a90e24b92e55cb6e81a533e03d1a3d4498d746096199aeea3d6d64bccfa84f6808c68e89696b51371fe8bef19bb2136d284c16bc
+EBUILD zen-sources-6.12.10.ebuild 1387 BLAKE2B 99acdaec12b167556709835f45a7d41e2f36c4ee919285fd10ed7dc55644acb022b3ed644b318c7ad9629508bbe8385049e24a9e60e82789f9d653242aca0968 SHA512 0939900ec6213b1f51df2dcf8cf013995191c38b461956ae73f494ceabea6dd84938091ebd33db853bcb7e7b1ce75e8b2868906f1d353cc852f460212483510b
 MISC metadata.xml 404 BLAKE2B 1836329a9cab0f03e4ee80056d5db141d5721875794ef39844c014c0426fd558b3a2bc6f1a7bbcb72d99ad81f4a071f451da9adc4a6fdb380e8c7bd7bb10ed2d SHA512 2c48e149eb08a53121a799256eec33895daa0dce32ea5325f5f3b055c3a661de8294e21f114f6c7ad609818215261c57c53d124fc0d3679f87168039905a9516
diff --git a/sys-kernel/zen-sources/zen-sources-6.12.5.ebuild b/sys-kernel/zen-sources/zen-sources-6.12.10.ebuild
index 58799a16cf7d..0830c036303a 100644
--- a/sys-kernel/zen-sources/zen-sources-6.12.5.ebuild
+++ b/sys-kernel/zen-sources/zen-sources-6.12.10.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="8"
+K_GENPATCHES_VER="13"
 K_SECURITY_UNSUPPORTED="1"
 K_NOSETEXTRAVERSION="1"
 
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 8436f758f4cb..10a6c7c245b6 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/freeipmi/Manifest b/sys-libs/freeipmi/Manifest
index d2a58b21e7ad..e815efbfff64 100644
--- a/sys-libs/freeipmi/Manifest
+++ b/sys-libs/freeipmi/Manifest
@@ -10,7 +10,9 @@ AUX ipmiseld.confd 192 BLAKE2B 52b125e63ca3e13fcb24f5b304f73c78269fc58b2c3e40cb1
 DIST freeipmi-1.6.10.tar.gz 3431062 BLAKE2B e217570d8fcf78ca9d04aad4d5bd46b4120beb21f2dcfb083bc9779a4541856e08ec6e87549651ee3c9b62fe54521585e192c784254dd9482bf9da09935853ae SHA512 90b6b78cdd119c2a1f332f007333aa6df70c6e3de0fd81ab007025392ee7cb7a01ab4a7a174d1f2e760c55d78f21ebbbe9667af661ccdd669e4b54edb1346937
 DIST freeipmi-1.6.11.tar.gz 3429533 BLAKE2B abc803341db4e48fe1a81da1d9cce2e7a808e51f41fb5b18019fa25bec41b443275f737553fe8b7bfd1dd9ad06d08b2097ca9f8e78a431e20d1a0e89d0e8cda6 SHA512 db37bb1ec559f88764ac08491b616d24e49c9a8ba070717e940fea4886d877819064cb00221aac703d0d149dc38e562924e192e992222e18b0e8b548248487a4
 DIST freeipmi-1.6.14.tar.gz 3464254 BLAKE2B b0b3fdc45c910f5fd3e837b4186103c754fc399c05be6b3406346a9629de4392334dfce5320fabfa895f8d398399a54b58c8b6663979e428c10269dd57b35067 SHA512 5dab6430d257776cad1aed39cb2e2536af42c56e3f53774111efc15b0dfc19241eedfbcbfb1f088dd8be38ce694bff9779050daaec9ad0b2d4dad329ce8f3fe3
+DIST freeipmi-1.6.15.tar.gz 3464927 BLAKE2B 0363b9ca58d264f9703e1615469dc5df53143e4b21111004602ab24e371d6291aacb6cef04500822cc5e86d0aec55e80f8162bfda0a98a2af1e326ec377460ba SHA512 113005f751a22584b657afa27c5659af8cae3b503f7c6358ac98c7f2461165c882b9ccfa8ad1cc4e3041f10de334def9b4faff03f2b83d56e69d891463f8931a
 EBUILD freeipmi-1.6.10-r1.ebuild 2988 BLAKE2B 93ef70d463f5953d4767d77dc0b5c86608e35467b88d82dc117f9d8c3fc2125e7a50b09af894d9dd05be191e5098f9aad0d55cafda4d674404360b61e1da01c0 SHA512 4ba941a27940b9c595dcc0e254afe4506987626def549610c188b806c2cbdce63820e0c47129c2f1e25862abd3ae6e9e33816560c54347697cbf12cd669bd872
 EBUILD freeipmi-1.6.11.ebuild 2578 BLAKE2B b8f5dfdd537399ce03b1d781c5ad6ae5aff19ae3b96f91b61181d65b7f23eea5d7c63e5caf56a67eb55f434dd79f10655a6a682395c016f394dfb1b991bf0f2e SHA512 e3266274dd8b9c5929d9f07fa114b94a14684b6b90819faa448e697a87528a2caad4142efcbf27a441704b7c613eaf1d6731912f00e338b7c756c7391b78cc74
 EBUILD freeipmi-1.6.14.ebuild 2578 BLAKE2B b8f5dfdd537399ce03b1d781c5ad6ae5aff19ae3b96f91b61181d65b7f23eea5d7c63e5caf56a67eb55f434dd79f10655a6a682395c016f394dfb1b991bf0f2e SHA512 e3266274dd8b9c5929d9f07fa114b94a14684b6b90819faa448e697a87528a2caad4142efcbf27a441704b7c613eaf1d6731912f00e338b7c756c7391b78cc74
+EBUILD freeipmi-1.6.15.ebuild 2576 BLAKE2B b235db04f6ce30522e58ba09aa63cd462ec4d992d323820cbb1cc0fe3808a192bd4ac2d0935c3fdeb0d92a155672742be20060b2a14e18e2db889bcb91adea27 SHA512 170bb32dbd2fd42223406a7ba1d790b2232855d3d69349a6a692abe619e900903ac1033b0dcfb7e66870de0d5c3216b0b39dbd1e2a1f895e372ec90d700d6de2
 MISC metadata.xml 569 BLAKE2B 80068547ab42d075842e19f6ca65c9aa4b7c25aeddffc01a179e02fd6364804eefe3b7aa26434756de638f22a19da815d8b930a7d5bc81048e228ee72c81cd3a SHA512 f910ad6c63c49a2f2ddadc82c202cc9cf414eda5babdbe675048c6a5c2df4f093663ff8cf99da69563d4c67fa8bc0c18bfb9a8b8a752f8ce63bd1de8feed52e1
diff --git a/sys-libs/freeipmi/freeipmi-1.6.15.ebuild b/sys-libs/freeipmi/freeipmi-1.6.15.ebuild
new file mode 100644
index 000000000000..d768511e3e55
--- /dev/null
+++ b/sys-libs/freeipmi/freeipmi-1.6.15.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+MY_P="${P/_/.}"
+DESCRIPTION="Provides Remote-Console and System Management Software as per IPMI v1.5/2.0"
+HOMEPAGE="https://www.gnu.org/software/freeipmi/"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~x86"
+IUSE="debug doc nagios without-root"
+
+RDEPEND="dev-libs/libgcrypt:="
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+"
+RDEPEND="
+	${RDEPEND}
+	nagios? (
+		|| ( net-analyzer/icinga net-analyzer/nagios )
+		dev-lang/perl
+	)
+"
+
+src_configure() {
+	# bug #943813
+	append-cflags -std=gnu17
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable doc)
+		$(usev without-root --with-dont-check-for-root)
+		--disable-static
+		--disable-init-scripts
+		--localstatedir="${EPREFIX}"/var
+		ac_cv_path_CPP_FOR_BUILD="$(tc-getPROG CPP cpp)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# freeipmi by defaults install _all_ commands to /usr/sbin, but
+	# quite a few can be run remotely as standard user, so move them
+	# in /usr/bin afterwards.
+	dodir /usr/bin
+	local prog
+	for prog in ipmi{detect,ping,power,console}; do
+		mv "${ED}"/usr/{s,}bin/${prog} || die
+
+		# The default install symlinks these commands to add a dash
+		# after the ipmi prefix; we repeat those after move for
+		# consistency.
+		rm "${ED}"/usr/sbin/${prog/ipmi/ipmi-}
+		dosym ${prog} /usr/bin/${prog/ipmi/ipmi-}
+	done
+
+	# Install the nagios plugin in its proper place, if desired
+	if use nagios; then
+		dodir /usr/$(get_libdir)/nagios/plugins
+		mv "${ED}"/usr/share/doc/${PF}/contrib/nagios/nagios_ipmi_sensors.pl \
+			"${ED}"/usr/$(get_libdir)/nagios/plugins/ || die
+		fperms 0755 /usr/$(get_libdir)/nagios/plugins/nagios_ipmi_sensors.pl
+
+		insinto /etc/icinga/conf.d
+		newins "${FILESDIR}"/freeipmi.icinga freeipmi-command.cfg
+	fi
+
+	dodoc AUTHORS ChangeLog* DISCLAIMER* NEWS README* TODO doc/*.txt
+
+	keepdir \
+		/var/cache/ipmiseld \
+		/var/cache/ipmimonitoringsdrcache \
+		/var/lib/freeipmi \
+		/var/log/ipmiconsole
+
+	# starting from version 1.2.0 the two daemons are similar enough
+	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 ipmidetectd
+	newconfd "${FILESDIR}"/ipmidetectd.confd ipmidetectd
+
+	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 bmc-watchdog
+	newconfd "${FILESDIR}"/bmc-watchdog.confd bmc-watchdog
+
+	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 ipmiseld
+	newconfd "${FILESDIR}"/ipmiseld.confd ipmiseld
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 4a02fbd419e7..5abc41b1a25b 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -53,5 +53,5 @@ EBUILD glibc-2.38-r13.ebuild 55028 BLAKE2B fcee988603b8bcec9cf184c54e040c9190a98
 EBUILD glibc-2.39-r11.ebuild 54663 BLAKE2B ef95a8014c990f42738c5b66b73416a55fab1b433af10d879a60d4d798ed3b9fca747242fb09d110f6a258e37bdbb384a85cc59dd8dc80f375c6faaa30ab4932 SHA512 3e8c216ac02f129a37de9d475980d911fb1ff77d09949f87ff6c5ffa666afdc6a35004d32d60d8a78b1abc17a823083442a68cbea6df35d4409897648ce8783f
 EBUILD glibc-2.40-r5.ebuild 54662 BLAKE2B 62dd423d70cd8598bc4e69dc49e9b5442d283af497b80c58a99fcc6d4977936b0171c0c76325978fd43ddccd7e3c6496984c90a171bfd7b27ce5296bd204f7e9 SHA512 4daab8f45afa47660e9edce14ce5733702a5c229e1dea24e702858425d30201686eb62b0fd2d6a9c99343e4c6e138352f18eacde24d99aada8ce610f001c5b33
 EBUILD glibc-2.40-r7.ebuild 55146 BLAKE2B ddaf2453c38b1841a5fbbab2710f5a9214dd25453d6fdfd89e461ac9b075678c98a78c859e6f516c9bea7138d4209441e76296a2157f7c4406d66fcf0c736d35 SHA512 7bbb58df4ef7d6a28657586dbe51a940c0e2f2aafd77f3c28a3ee97e6ae73a91c6d2197eda0850efa8208e32cd64d76e9a4e87f8a89cdb03a95bc0dd302ad25c
-EBUILD glibc-9999.ebuild 55413 BLAKE2B 6dc835df5a542d95fd6726832f52abd48c29e40fa514f115b9fcc9e20280f8776a0c09bbc0dff90aaa0e9aa23f120a331f576d1ae6c474a6758c8a372838d069 SHA512 0ae72e47d06167f5c8c096d4442d3c0317626f61c6698ad7f0e18c4193e1fbe08a59e778e645ca1d6fea58d63e66a62123d3b555bcd67f0bfa3020f82451e77c
+EBUILD glibc-9999.ebuild 55431 BLAKE2B 7fb939c3f383369493edb056fa4a32174ecc115170fbd8b00efc4ee22598e166028bb45f845bb3a2cdf45b17d824bac36cacf1d0efc3a3840fde7c76c2f2caf0 SHA512 fe80af7ddc0865c52a2ba219ea670c0e67c74fc80b8069aa16838e072a2f8c8e2d497bc4c19c8e0a412d75b431c80c2865c6277db34af505d827706d7d6be2a6
 MISC metadata.xml 2142 BLAKE2B 765ba540eb10afccd1bade4de56f0c13ce269225500a62d1d17328194de69e7fa15d359a14eac6bfa8a36df45344db3d52f5e1811b174cf1fa2bfb95ad7760a7 SHA512 2f4a148c076a0967663d14e76b85a698ddae7093ff299b0dc95a6c3b00957c9bf73443f2bace9670eb62a45465efbcca892bb52b6aac8577acb2bc5f74a7397c
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index b331be70e2de..9622057c7724 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -193,6 +193,7 @@ XFAIL_NSPAWN_TEST_LIST=(
 	# upstream, as systemd-nspawn's default seccomp whitelist is too strict.
 	# https://sourceware.org/PR30603
 	test-errno-linux
+	tst-aarch64-pkey
 	tst-bz21269
 	tst-mlock2
 	tst-ntp_gettime
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 0ab64a7e5cdb..2a973e2be540 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index 4ba6c7274837..bb87e3680814 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -7,6 +7,7 @@ EBUILD dist-kernel-6.1.122.ebuild 384 BLAKE2B a52e2309b15bb06c5bd0a8b6bff8b72933
 EBUILD dist-kernel-6.1.123.ebuild 384 BLAKE2B 8b3c7749d299a6b4bb76b38086d4380589109acd42fcfc6d83aba4abaddd68e2d7d7cc2bd7f875b2aae4b43ea23f3d4018a95142f25592130df64a6510a11835 SHA512 56986d903c4ca4a4908b4a8431646d7360ba13c9fb19d1a208364873e5e590abd21b56182507577a6f1804ce694bc629c0d57fc441d2c5f5ec566a156eb2f3f3
 EBUILD dist-kernel-6.1.124.ebuild 384 BLAKE2B 8b3c7749d299a6b4bb76b38086d4380589109acd42fcfc6d83aba4abaddd68e2d7d7cc2bd7f875b2aae4b43ea23f3d4018a95142f25592130df64a6510a11835 SHA512 56986d903c4ca4a4908b4a8431646d7360ba13c9fb19d1a208364873e5e590abd21b56182507577a6f1804ce694bc629c0d57fc441d2c5f5ec566a156eb2f3f3
 EBUILD dist-kernel-6.1.125.ebuild 384 BLAKE2B 8b3c7749d299a6b4bb76b38086d4380589109acd42fcfc6d83aba4abaddd68e2d7d7cc2bd7f875b2aae4b43ea23f3d4018a95142f25592130df64a6510a11835 SHA512 56986d903c4ca4a4908b4a8431646d7360ba13c9fb19d1a208364873e5e590abd21b56182507577a6f1804ce694bc629c0d57fc441d2c5f5ec566a156eb2f3f3
+EBUILD dist-kernel-6.1.126.ebuild 384 BLAKE2B 8b3c7749d299a6b4bb76b38086d4380589109acd42fcfc6d83aba4abaddd68e2d7d7cc2bd7f875b2aae4b43ea23f3d4018a95142f25592130df64a6510a11835 SHA512 56986d903c4ca4a4908b4a8431646d7360ba13c9fb19d1a208364873e5e590abd21b56182507577a6f1804ce694bc629c0d57fc441d2c5f5ec566a156eb2f3f3
 EBUILD dist-kernel-6.12.10.ebuild 391 BLAKE2B 926b825d18aef6b926c1e0289eeff525136082cfb5928efcc3cda2cfa56dbec42ad8517bf89775d2ac2a924a1ef7c037027915ac16a927c4f3295504a5427d76 SHA512 6f27426736759c6e711793f771681b03d00c68071f16e57b80c9bfa5dc4ffee361795fea4e9bbf20fd38014e7c3a7a02ed74d4947e1a6319b86b010a9fe62e5a
 EBUILD dist-kernel-6.12.7.ebuild 391 BLAKE2B faf9961702c345fdfea71944ba12e9cf174ca7c364f0f87504b44014a61b66e6b53e6d44f32f1cae9b50a1d982b2539fac8b9e28a47d84090d4e9ef012d7e755 SHA512 2e0d2fae9ca3407a3c1dd1c98ab9298eb6368d89f2a993f52e3164e0a5d1391b73e0ad45235af4331eb4c9c61d0259b0565aaa5ef1944fe1a91869671c73f7bb
 EBUILD dist-kernel-6.12.8.ebuild 391 BLAKE2B 926b825d18aef6b926c1e0289eeff525136082cfb5928efcc3cda2cfa56dbec42ad8517bf89775d2ac2a924a1ef7c037027915ac16a927c4f3295504a5427d76 SHA512 6f27426736759c6e711793f771681b03d00c68071f16e57b80c9bfa5dc4ffee361795fea4e9bbf20fd38014e7c3a7a02ed74d4947e1a6319b86b010a9fe62e5a
diff --git a/virtual/dist-kernel/dist-kernel-6.1.126.ebuild b/virtual/dist-kernel/dist-kernel-6.1.126.ebuild
new file mode 100644
index 000000000000..2fba55980890
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.1.126.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+SLOT="0/${PVR}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)
+"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index f78f50bc141b..38cfb3952a26 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/airdcpp-webui/Manifest b/www-apps/airdcpp-webui/Manifest
index d65cc86249f9..073cc5cb69b9 100644
--- a/www-apps/airdcpp-webui/Manifest
+++ b/www-apps/airdcpp-webui/Manifest
@@ -1,9 +1,7 @@
-DIST airdcpp-webui-2.11.5.tgz 8591663 BLAKE2B 37df77b5e4dd6d2ea1c9b83e25938d3618f32f0d9daa5b744a2684dd7b3b0ad2c6c03f676833e81bf5e4839a5fbeec487d04b5b891e1603a34c5723dc5ca300b SHA512 33beae8a96273ab5ed603163d567ae2c4588519dd136e19826607cc90eab9b1e436ff1ea585bfc5d852ebecd7da80c46a7699c02b98bafacc5509fe3f2eedf74
-DIST airdcpp-webui-2.12.0.tgz 8456530 BLAKE2B d5ec8a2f00e48d25c44b8a8beee404a0089b55b6db261cc57fd76cfc9ebb7639a91bc7b51aa515889fdf896fb042d35b32f4c5b38d8bfb9686ae0eeb5a051005 SHA512 fb4b79366c3d375619b4bd28a048ddd9e05d6787aaa3703163fbb50ab6ec63ac5272b4f67a43b1cf023f1bf7b59fee872c3019bf5e576dfdb748a0d347bed644
 DIST airdcpp-webui-2.12.1.tgz 8684258 BLAKE2B c13976dfea205319d80a6614f5aacca35ab2b0bdeeceb8b3ffdbd83b120d23f4a035abf4b23b5d7631fc169906559b1286146768a8062ae3f20268d1995c4f96 SHA512 0fc04b32dfcf5ca30cfcce7d40783d006b2f7226bb188a1f65aedd7ee591890228a2383f4f31a7ef1ccc9bc531d63d6a81aa1e35551653b8b1c35d7dfd89362b
 DIST airdcpp-webui-2.13.0.tgz 8754974 BLAKE2B c6cc75b7cc6b360415080a33c57cf075559b71a8a98c8b1272124cb4cab1cce534b95b3b3bcc9a27f6f2686e12c72d914e3fac1b9645c676be7d0751cbb4bccb SHA512 2efac4acbdf545f427ec9ec1615fefb390949c9b53aec132e5298f50969bd42c6a824316b39a5f00f74d0305cc296195bd00989d27b8ee38583c12a3cde25e5e
-EBUILD airdcpp-webui-2.11.5.ebuild 462 BLAKE2B 3700d4523b8785050e4bc37d4f7cb796c4161a49930be35adddcf4231d677b2f56a88b780cb4f1f728ed6d2bcb347814ce12180233472b94cb58d1e0babfbaa3 SHA512 cf4859a79aa2600addc51a8b93c791e97b496ec1c283320f083263f5d6f12b2c31457d30bd08de620ae2ecbdd79b0c14b3b4b6181ab682be2c334100aebd1884
-EBUILD airdcpp-webui-2.12.0.ebuild 464 BLAKE2B 9e7e0dd4e8c092b53ccb1d3a23bc2d5c7c31bdd9c0a9b1645b7f718152ddc71e6278646d5701a0b91302ab799c916e17d2f681eac31f81c5886709dcc0ebe661 SHA512 04e9575ca3cbcfba4c5ee7811695b1ab0032d2e254c24b244d42c01557ced7193a910458f3d72384e8c7981104630f4221c46a2e4b14ba92a2743a3f4444da74
+DIST airdcpp-webui-2.13.1.tgz 8856022 BLAKE2B c418bc193414559fc995f1c900726aef4b954b4903e657d951dc26ffe1aaa1122e065274186d302e5f76bf4db26c5b1291d69d61d4ab6c46185aa215af55fdef SHA512 b8a89b734a16126f96a803d9cd2255dca3cf79e2245e969944e8640a2df340dd837965a226b5d2b5391d964372eb59e7165596ea5f02d64de2feeef22ab06fce
 EBUILD airdcpp-webui-2.12.1.ebuild 462 BLAKE2B 3700d4523b8785050e4bc37d4f7cb796c4161a49930be35adddcf4231d677b2f56a88b780cb4f1f728ed6d2bcb347814ce12180233472b94cb58d1e0babfbaa3 SHA512 cf4859a79aa2600addc51a8b93c791e97b496ec1c283320f083263f5d6f12b2c31457d30bd08de620ae2ecbdd79b0c14b3b4b6181ab682be2c334100aebd1884
 EBUILD airdcpp-webui-2.13.0.ebuild 464 BLAKE2B 9e7e0dd4e8c092b53ccb1d3a23bc2d5c7c31bdd9c0a9b1645b7f718152ddc71e6278646d5701a0b91302ab799c916e17d2f681eac31f81c5886709dcc0ebe661 SHA512 04e9575ca3cbcfba4c5ee7811695b1ab0032d2e254c24b244d42c01557ced7193a910458f3d72384e8c7981104630f4221c46a2e4b14ba92a2743a3f4444da74
+EBUILD airdcpp-webui-2.13.1.ebuild 464 BLAKE2B 24d3692d016d29806e1d2126b94350c39c53bedc946f28c0cfd90213308b35cf992b644690583e4ff73f81586d1479f07fe97d7c692829bd9f40181950958eeb SHA512 17e537707fb39ebe85284a1ccc23eca85fb8fc06291cbe15a15c755519c04b45417972526227f95cec09c4c10022ddb2cbed4923b53e37e021639594a270fdcd
 MISC metadata.xml 437 BLAKE2B 02be4b42bb953f24eda2cdafa2d4b74f52fe9cf231c9408ac16f3039f4608cb405268f2923f4340e6ee243300e6207ec76ad56b103077cd0a4ad2f21d2dcd81f SHA512 6a242d28851aea65d1a16f9455eff6947980ca175e5dc53439021d673d0faaf79f44263edcad1eed1d062e93d4e383ade8e95906cd1370da25e5534e07a8e98c
diff --git a/www-apps/airdcpp-webui/airdcpp-webui-2.11.5.ebuild b/www-apps/airdcpp-webui/airdcpp-webui-2.11.5.ebuild
deleted file mode 100644
index 8dd1e7ebd813..000000000000
--- a/www-apps/airdcpp-webui/airdcpp-webui-2.11.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Web interface for airdcpp-webclient"
-HOMEPAGE="https://airdcpp-web.github.io/"
-SRC_URI="https://registry.npmjs.org/${PN}/-/${P}.tgz"
-S="${WORKDIR}/package"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="=net-p2p/airdcpp-webclient-${PV%.*}*"
-
-src_install() {
-	insinto "/usr/share/airdcpp/web-resources"
-	doins -r dist/.
-}
diff --git a/www-apps/airdcpp-webui/airdcpp-webui-2.12.0.ebuild b/www-apps/airdcpp-webui/airdcpp-webui-2.13.1.ebuild
index 0c8325700397..0b1bf043d331 100644
--- a/www-apps/airdcpp-webui/airdcpp-webui-2.12.0.ebuild
+++ b/www-apps/airdcpp-webui/airdcpp-webui-2.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index bf26f3a21eee..87431f88f867 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index 63893ca5fda9..7a6b1058aceb 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -4,7 +4,7 @@ AUX nginx-unit.service 237 BLAKE2B 7e8b373372b7908bee80f4a57718a6b9ef7fd99872057
 DIST nginx-unit-1.33.0.tar.gz 1025455 BLAKE2B d17c02def260c325284c807b51c44b23bfe72b2be52bb98909b33e0f904cf833b1b254a5679ac0482fa0b3f4e4e1964017819bc05b3f7ea7ce18029d6ea9d68d SHA512 c0b2a7e8ede3fc11b52c6c44d7460c52e35dfed9b9ae6cfb5bd90c24859f601bc462626aa68a24191689bb5406250d391428c06641d84e3cf1d8615e7485fb93
 DIST nginx-unit-1.34.0.tar.gz 1054742 BLAKE2B 4d31f6851d46f2a775c15a70f6eeb76763327b25a8ecc064c5068fb790911bebe1ea4a4d8e5bb3de05ddbe432a8f63ca9b8bae53d1fe09baadc0de0618310ee1 SHA512 5cf2e977464675a0d840342e697b12595f4595ffcc99b812b479b163e325fe8d383fd6723a3e139d10a2449f25793e624d44ebe6e57aade0f49d249542efae56
 DIST nginx-unit-1.34.1.tar.gz 1054774 BLAKE2B ee595554ec0f43f9c2e9b36c2f8bec32530238917b56610d8b99e94befff9a6f2018b295ff11edd1f08ec60c7980dd099a78cf49465f2dfb83a8677db0a08540 SHA512 51bcab68d9a015f4e2710312af28afd7f7179a4b9c57dfc26f5bd4a94ad93c1cd4246a92e131a4ff460d51f3003acae636b5a62c2f257671b26eea3080858352
-EBUILD nginx-unit-1.33.0.ebuild 2298 BLAKE2B 9b3faf520ca8ea87663fa1bc14a96a28bd9f2650ea7fb81040fd4a456bf760de9bd23e590fdfe60d64d6be542d062787a516e21c5a33d3e6149916c3eebd5b0d SHA512 521ffbb0778013b1aa6790fd0f913da98da4452aa0c675a118875de9b2fc08f9acc4c709917e73634fcbb1b95aef0758db7f2bd027bad40df5477e4b9e9d2f43
-EBUILD nginx-unit-1.34.0.ebuild 2227 BLAKE2B 208b94d3ddeb0edac736d6806079095595081e75b98730ba82f940acd7e3565cf1dc1269c90b05d8a42f419111eeaef5f1cbdbd96e11d00dd8cd70ff7d2fed6b SHA512 7fdce4e84a47c180a519c2e5563db55a01afae084a957f2b5994668f778984152c319186f2776e253f31cd5a73bff40ade2614a3827e1066b51d1f167919eb56
-EBUILD nginx-unit-1.34.1.ebuild 2227 BLAKE2B fdc78569ab3989cc32c61eacdfeafa0109bc28d96e5e8bb3feae44e3c5a69478066c370a2f29628dfd413f213d2a13facd2e3de8d574cf1ac53e7e445e0eaa94 SHA512 6d0519427785241f91788c253c7e69222e419378eb6e0b95eba988e8c3c4765d181ab60ee8ea1c0f68f482119942afa4fddd2146aa875a85aba263c444266150
+EBUILD nginx-unit-1.33.0.ebuild 2326 BLAKE2B 04f4ec27ca32017eb8a645db76a68213a0d062bb328e566bd05837facc9037f0be5bbaa5cb44002879b8b1d626049af93ac8b9465b8d46fef31b0ae76d3d170e SHA512 a9e3be0629361e88ec427b707b080aa1ae67b46971dd4b5ae5de112ef9fe3c927cbdb9c15491e00d37f9713b0f747a7b38c2f0a479f90903c767bb0ce95d056c
+EBUILD nginx-unit-1.34.0.ebuild 2255 BLAKE2B 295008ab28666354358c70e9c35e4c0857a3c38afd2676cbe77da4c44079f47b481b8f5a0aca16dbf365c89a510aaf0d3c5a97941fde9ed202c107940100b282 SHA512 acade7548be19b588ddc18249b4408c9052003f79b7e1e771656f401b247166d81ca41234f212b0fe4cc00da8db787fbaac77e8ebc522a73149bd70dfd76fa47
+EBUILD nginx-unit-1.34.1.ebuild 2255 BLAKE2B 295008ab28666354358c70e9c35e4c0857a3c38afd2676cbe77da4c44079f47b481b8f5a0aca16dbf365c89a510aaf0d3c5a97941fde9ed202c107940100b282 SHA512 acade7548be19b588ddc18249b4408c9052003f79b7e1e771656f401b247166d81ca41234f212b0fe4cc00da8db787fbaac77e8ebc522a73149bd70dfd76fa47
 MISC metadata.xml 830 BLAKE2B fba25edba205efbc1b147f616b836569d45578ce661057d78bbfcf30a850b560b35417bed519072ceb11fabcb3d53938205c95193dd567224f0048884e66f4d4 SHA512 6e0e32e10e6878ea7853993087636fba3941735d28b3229e683b25491ff4cce49cec1b116c3ac2cc92db7e9231b7a78f9756970b4e968cbd0d4addb1a7fbdfa0
diff --git a/www-servers/nginx-unit/nginx-unit-1.33.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.33.0.ebuild
index 3cf0a4849fe0..09aa0eb950e2 100644
--- a/www-servers/nginx-unit/nginx-unit-1.33.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.33.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -32,6 +32,9 @@ DEPEND="perl? ( dev-lang/perl:= )
 	)
 	ssl? ( dev-libs/openssl:0= )
 	virtual/libcrypt:0="
+BDEPEND="
+	sys-apps/which
+"
 RDEPEND="${DEPEND}
 	acct-user/nginx-unit
 	acct-group/nginx-unit"
diff --git a/www-servers/nginx-unit/nginx-unit-1.34.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.34.0.ebuild
index c2653283b9e1..20f2c7f88c5b 100644
--- a/www-servers/nginx-unit/nginx-unit-1.34.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.34.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,6 +33,9 @@ DEPEND="perl? ( dev-lang/perl:= )
 	)
 	ssl? ( dev-libs/openssl:0= )
 	virtual/libcrypt:0="
+BDEPEND="
+	sys-apps/which
+"
 RDEPEND="${DEPEND}
 	acct-user/nginx-unit
 	acct-group/nginx-unit"
diff --git a/www-servers/nginx-unit/nginx-unit-1.34.1.ebuild b/www-servers/nginx-unit/nginx-unit-1.34.1.ebuild
index 8270be84e262..20f2c7f88c5b 100644
--- a/www-servers/nginx-unit/nginx-unit-1.34.1.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.34.1.ebuild
@@ -33,6 +33,9 @@ DEPEND="perl? ( dev-lang/perl:= )
 	)
 	ssl? ( dev-libs/openssl:0= )
 	virtual/libcrypt:0="
+BDEPEND="
+	sys-apps/which
+"
 RDEPEND="${DEPEND}
 	acct-user/nginx-unit
 	acct-group/nginx-unit"
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index a105780c91ef..13ecd7ece08a 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index f400da9ecdf1..0f23cbb8fe0b 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -1,13 +1,13 @@
-AUX 2.0/gentoo.lang 3901 BLAKE2B 774a8c7c01e8188339d1ae4b10df39b58ef78015cc2eb7cd3a723d025c1ae9ff2567dd84e56a2d9f2fd47d78b9ef26517dd76cb6e114aaab8eca452c8097712c SHA512 62c3257663eb684c1eeddb8393d8529e63c2535aa2c2839c76cac2a75f0c059025aa22db5e1bb569242526f1f2ee53708c7339e81eb37843f876be498762f9fc
+AUX 2.0/gentoo.lang 3802 BLAKE2B 37f36263285dc2986d7ce5b4983a1414a4a26944f6a27113cdb69dc76e6903e888b9b74934e4aa90d9a72639a456e8de9cc82f2648309bda5b0fb6825770879b SHA512 3e6c58140e6abcd0feaca4dad050d924bd2604b7cc95b507cb7871d4548bc039cfcdcf865c71b8d9ae1ae919e40b1542140840e12c1d65a0b162542754c3957a
 AUX 2.10.5-G_CONST_RETURN.patch 6799 BLAKE2B e3276c433d2bb6286ea8f6d5b45fc602a798c0261d12e065e8c5e1ed132f686bba93e450db7aa13a155f09841939733208dbcff9d2517f698536df1b7099b1ac SHA512 1a36c45a067cf999494b14f30d3322aa596343b5f77e54e337a382f6fc9857803cdf2f97a44433e4c055a0dc235fa270d335b6536fc682f0d952f06a2ce44546
 AUX 2.10.5-gcc14.patch 749 BLAKE2B 90b929f90459ce6f75c72675e0f5923e61c06aefc1611fc753c04ea88ff079a00a188428aa49d4569026c73d62a3649c05f3e867979373fc1f290f9102e1ad7d SHA512 d2133c47beea420c357abb4e9a98ae5388b3760a39cfd6361c24758a016ee725ee0a8f860259369c907cd19061aa82c1b1a4f200b88512bc2513d4f085d758b6
 AUX 3.24.11-gcc14.patch 2157 BLAKE2B 3ad0dbafb78355160353893e1026e8e19f07ff172b6689d6314efc1a444bcd503677a3ca9a7310ecca811c4f8dd8b88aba4c7a213cb3f35dd12d63fa016ee52b SHA512 88e7b6c90977d7a799e24f1d83b8d9de183bc318bf6a313c3f5e808851e1102311a77469bc33994ff67f7c16bc7273b580fbb7c9bd29f6147efdbcb65e43f4ea
-AUX 4.6-gentoo.lang 3889 BLAKE2B 1797c9e3ef615b36f3098104295fbadee18b8434d299bbab9603c5a00abdfb51c3a7db2f937885d8aa191067fd6e2ffbc1cf278b0d9333c67bcb07e24be5a7ba SHA512 a4ca3f24df56556c5d42aac19d36608d20466287b9e364154b1877c2a5aeab82a374fdf7dc64afbabbf9269d5a8fa88e1dd59d8a24a52fab219db09ec29a3d98
+AUX 4.6-gentoo.lang 3790 BLAKE2B 98e8183ae36ab25a27ad664f5d11c738e0ae736502a1eaacab86bdc61e69d0b064fd9928fa1a4a5cf663ed1761c313c5459a47b7eb8f14877ea9c8cc2422fb37 SHA512 c48d7265ffff0eaaa8d8055b64212a92b67bbbaf4ba9a5b19ae54a4bf5696e5c89d6d7e8ddac0e78b611922e56d7dc12e19769494114582684a97412eede8c8c
 DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb852e00d02c7937ad4a2ce3af9e48700da943d8d6834efcce9810dd49a54f39d4a074dc086a557128da51a593b2f23e58d48 SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d
 DIST gtksourceview-3.24.11.tar.xz 1438232 BLAKE2B a25762255a12887c8151465689e3acbd5864a6638044500acd087832888a092b8aad5d885d31c9dbe057ce183510afa2342bccb2a2675719dbba7e82be72368a SHA512 3490b34c6432a2e2ef292ad5bf982fdd22d33b1472434549b4ea8ddae0fc8808e128ef947e4d0dcb41e8de5e601b202f52532bbbbfa11d35050acfc42f9936b2
 DIST gtksourceview-4.8.4.tar.xz 1159636 BLAKE2B 0fb649522ff904993b7673c380b8ffb6458c0727b6af906e5328d972fb5385a2a668c2ca45b7dd3533f9f00b2ed9eaade55ee7b20a0b75fb1c031b917c27af2d SHA512 9e4262e52a92b3a052f33b799622d4fd4dcc7cc5355df12f160d0e60a6d6c135bc52f07eb40c06b357d5d74bec7228d4ec545a69ee5af69429d4170cc1e2243d
-EBUILD gtksourceview-2.10.5-r3.ebuild 1336 BLAKE2B fa12ff8b5d0b42ecdaa45493993cf3d5aed45ad25f982a7d619bfc159f5989fb8b91faa4f00de54d12e677eb849b1df709869bf8a3118c4cb4d7c8bff44c8e3a SHA512 4031a0cb28d268e3bdb82aa29f987b343fe203739c7ba30017fded4ee1643b1f2d4dfed1c4e0c0b92ea1d34d5f9922a919cc282312ac2d33bddd1872d1091e1c
+EBUILD gtksourceview-2.10.5-r4.ebuild 1336 BLAKE2B fa12ff8b5d0b42ecdaa45493993cf3d5aed45ad25f982a7d619bfc159f5989fb8b91faa4f00de54d12e677eb849b1df709869bf8a3118c4cb4d7c8bff44c8e3a SHA512 4031a0cb28d268e3bdb82aa29f987b343fe203739c7ba30017fded4ee1643b1f2d4dfed1c4e0c0b92ea1d34d5f9922a919cc282312ac2d33bddd1872d1091e1c
 EBUILD gtksourceview-3.24.11-r1.ebuild 1203 BLAKE2B d2d5319a02673cf8ad0ff01056f0865f377bd5716539fab0a26ce8fc1c30ef8be643625673bb6ae7b5fdec1b842e6f1c6252cae4e57eeaff31a703f2a270c705 SHA512 b08dd2c1ad24dc99bb5435013aa2d9a76a7e3cdcb39c32332ee5ba52db5e3d5c42ea93144cc452134c71565ea822144f3fefd260f0a1039037883c71d4eca08e
-EBUILD gtksourceview-3.24.11-r2.ebuild 1250 BLAKE2B 29016569ce81a1946c3fabfb5677d342adbfff9145fe90eb20bc1281e0831e6869a6b275bf0b66630fc1c38913fd7187493e9edab276d934d7816ae290f79457 SHA512 1171e1db2bac49d0d4fe63dd692a993c5018fd1d10b87ea63d6955b590e7690a5cc952849d5e8fe6f06399a84753427c6fac1826c17bcceb5469d72a29077a7a
-EBUILD gtksourceview-4.8.4.ebuild 1739 BLAKE2B 7cd651e679ceb4ed1acf25a88b70bf236c1ab834b066db55a0162cc46d22b0549f5c3839903e58f1943eaccbb964db32e943fe6c80c573dfe46488385ad9ea3f SHA512 c811661428d086f6bbb1fc2bf7abb17753366152172b2165714a943ea23f89382c50bd3653b40f328fcb357e23b06bce7fb933155f94a057380f93eec0b90736
+EBUILD gtksourceview-3.24.11-r3.ebuild 1250 BLAKE2B 29016569ce81a1946c3fabfb5677d342adbfff9145fe90eb20bc1281e0831e6869a6b275bf0b66630fc1c38913fd7187493e9edab276d934d7816ae290f79457 SHA512 1171e1db2bac49d0d4fe63dd692a993c5018fd1d10b87ea63d6955b590e7690a5cc952849d5e8fe6f06399a84753427c6fac1826c17bcceb5469d72a29077a7a
+EBUILD gtksourceview-4.8.4-r1.ebuild 1739 BLAKE2B 7cd651e679ceb4ed1acf25a88b70bf236c1ab834b066db55a0162cc46d22b0549f5c3839903e58f1943eaccbb964db32e943fe6c80c573dfe46488385ad9ea3f SHA512 c811661428d086f6bbb1fc2bf7abb17753366152172b2165714a943ea23f89382c50bd3653b40f328fcb357e23b06bce7fb933155f94a057380f93eec0b90736
 MISC metadata.xml 430 BLAKE2B 97632c64552f8f8414314de16a73981465cdce4c553d550618ebaf6fdfd1ef100e32c008b6442cbbea68ad1f97ca0631f332ed9bc4fc1884fbf4ecc608b70ec0 SHA512 3c8df69407d401080882427ca5d135a462d246fc29878dbef7b0614e1ab150cb0c9349f5398397cb7c94adc854271066000a0d4ac118f8be342e2a02464e8ff9
diff --git a/x11-libs/gtksourceview/files/2.0/gentoo.lang b/x11-libs/gtksourceview/files/2.0/gentoo.lang
index 56f6366ca282..57417947da7e 100644
--- a/x11-libs/gtksourceview/files/2.0/gentoo.lang
+++ b/x11-libs/gtksourceview/files/2.0/gentoo.lang
@@ -7,7 +7,7 @@
 		Leonardo Ferreira Fontenelle <leo.fontenelle@gmail.com>, 2006.
 	Rewritten for gtksourceview-2 by:
 		Rene 'Necoro' Neumann <necoro@necoro.net>, 2007
-	
+
 	Distributed under the same license(s) as gtksourceview.
 
 	TODO:
@@ -87,9 +87,9 @@
 
 		<!-- extra portage commands -->
 		<context id="portcmds" style-ref="command">
-			<match>\b(e(begin|end|conf|install|make|warn|infon?|error|patch)|die|use(_(with|enable))?|inherit|has|(has|best)_version|unpack|(do|new)(ins|s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)|do(python|sed|dir|hard|sym|html|jar|mo)|keepdir|prepall(|docs|info|man|strip)|prep(info|lib|lib\.(so|a)|man|strip)|(|doc|ins|exe)into|f(owners|perms)|(exe|ins|dir)opts)\b</match>
+			<match>\b(e(begin|end|conf|make|warn|infon?|error)|die|use(_(with|enable))?|inherit|has|(has|best)_version|unpack|(do|new)(ins|s?bin|doc|lib(\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)|do(python|dir|sym|jar|mo)|keepdir|(|doc|ins|exe)into|f(owners|perms)|(exe|ins|dir)opts)\b</match>
 		</context>
-		
+
 		<context id="built-in-command">
 			<include> <!-- do not include "sh:built-in-command" as it is replaced down there - which would lead to an endless loop -->
 				<context ref="sh:built-in-command-1" />
diff --git a/x11-libs/gtksourceview/files/4.6-gentoo.lang b/x11-libs/gtksourceview/files/4.6-gentoo.lang
index 4889b4ceca29..4e8c14832e27 100644
--- a/x11-libs/gtksourceview/files/4.6-gentoo.lang
+++ b/x11-libs/gtksourceview/files/4.6-gentoo.lang
@@ -7,7 +7,7 @@
 		Leonardo Ferreira Fontenelle <leo.fontenelle@gmail.com>, 2006.
 	Rewritten for gtksourceview-2 by:
 		Rene 'Necoro' Neumann <necoro@necoro.net>, 2007
-	
+
 	Distributed under the same license(s) as gtksourceview.
 
 	TODO:
@@ -87,9 +87,9 @@
 
 		<!-- extra portage commands -->
 		<context id="portcmds" style-ref="command">
-			<match>\b(e(begin|end|conf|install|make|warn|infon?|error|patch)|die|use(_(with|enable))?|inherit|has|(has|best)_version|unpack|(do|new)(ins|s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)|do(python|sed|dir|hard|sym|html|jar|mo)|keepdir|prepall(|docs|info|man|strip)|prep(info|lib|lib\.(so|a)|man|strip)|(|doc|ins|exe)into|f(owners|perms)|(exe|ins|dir)opts)\b</match>
+			<match>\b(e(begin|end|conf|make|warn|infon?|error)|die|use(_(with|enable))?|inherit|has|(has|best)_version|unpack|(do|new)(ins|s?bin|doc|lib(\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)|do(python|dir|sym|jar|mo)|keepdir|(|doc|ins|exe)into|f(owners|perms)|(exe|ins|dir)opts)\b</match>
 		</context>
-		
+
 		<context id="built-in-command">
 			<include> <!-- do not include "sh:built-in-command" as it is replaced down there - which would lead to an endless loop -->
 				<context ref="sh:reserved-word" />
diff --git a/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild b/x11-libs/gtksourceview/gtksourceview-2.10.5-r4.ebuild
index 5dc42f20caa8..5dc42f20caa8 100644
--- a/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-2.10.5-r4.ebuild
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.11-r2.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.11-r3.ebuild
index b92bfa7d0cb3..b92bfa7d0cb3 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.11-r2.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.11-r3.ebuild
diff --git a/x11-libs/gtksourceview/gtksourceview-4.8.4.ebuild b/x11-libs/gtksourceview/gtksourceview-4.8.4-r1.ebuild
index ea22d83d59a5..ea22d83d59a5 100644
--- a/x11-libs/gtksourceview/gtksourceview-4.8.4.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-4.8.4-r1.ebuild
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index dabc7f0e3c43..2ac025c1cc94 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index 63cdfed81566..c1530f75502d 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -1,6 +1,8 @@
 AUX desktop-files.patch 1727 BLAKE2B df568ed9a5b9b70448864e113fb031e90c0d40deb5912b41007131cc8b36c88b4c7a1c3c973e6685fd1ae44bbe38a9ab5993408db002cb2ca5943d1f2ac413ac SHA512 639ee4bdfab4184dde9f025a4375ff740f1f99dea584a4aee2c8a007ed493bb2d0727c32eb7b7847ab246c3dca41ef105362792a326a23c5d7e31c4c2738cffe
 AUX lumina-session 2011 BLAKE2B bec6e1161c89ef0ae5f6506d57b6deff09f907b2c16b0d3404eb61369f1c3fa6f19400557f18dc3081e19652badae541d9f84be8717851b5a583392caaef303f SHA512 79e06e1761b079c96984c84f225e23a545d012ad94148080c3659c85f75b322dd050fc4b1908f72de1cdd22bab6b62e0d1de4f8c77f29073e88488671b0836db
 DIST lumina-1.6.2.tar.gz 20818383 BLAKE2B ecb2d4c1f3ce94f247cd86640bd6394807ed5d9a34b2256d333894e6528c0d3dac1ddcab8c790a63df67c2738ab7af8dd2ef0cae67c534e10c4b2edd8919ad8c SHA512 0bebdc89644af49232ad9a0b753dee501f3e99d6615ce926c71790932d228e3c6676ca4835aeaf6badf5455102278261e48bed0d3004fe9209aca68d620cae02
+DIST lumina-1.6.2_p1.tar.gz 20946587 BLAKE2B 2cd9b75342d5bd18b96beebcaed531f84c187c2c3bd13aa392b35efac0d45014ad86e393c18f2a5079b71cf7a21aca39e47068a5e7dda11a68feaa2a6c0f1d11 SHA512 47809465bd8c7cff39441d1dc20903b8de887e7309f4de43f57575eb0c63b68d00ee712bb3beaa7f229d9364c53cd51178ee0c9fdd66a01d6165155605b4aaf4
 EBUILD lumina-1.6.2-r1.ebuild 1988 BLAKE2B 4ddb06b378759d9ca060d9d420c0ebfc761647a1ac79c63b92b85adbe39563cd8c719aadf144686fe13bc191e1d368689401ab2e4c197835a8a8531bba653ce5 SHA512 77f62ca44c7a25c411b45b6bcb15fc3cb2254ae5a91b12e3ce16f34737bc44cc4642a80f7674725f7afbefd75e5d9763ef83830d29cdb9e7cc61b3527aa598a9
 EBUILD lumina-1.6.2-r3.ebuild 2095 BLAKE2B 8b5367a59f8db8ec7035a9a4b978cde4a8dc6c0618884dccf577863feea1f042904a226075b7c68649a5c1d0c1259856a87b6b08ac398e79e7d628bd0429f3c1 SHA512 de2dabdd5eb72e2fd783f81f52bce5500cdfc4bd6d5b08daa5bbf17529a8ca5fe981030b5485b55e3886acdbe301ecd23a579fb583cd9b4a6f03d3fd4439fa26
+EBUILD lumina-1.6.2_p1.ebuild 2013 BLAKE2B f1eb07a72879fe8a49595bf5ae91360b083b3fc9893ae1dba7166eb56034acad4300641dc08dabc4ddd4f1c126f9822742233a63f591ef8b3972bc0c04ecfd7e SHA512 3c7d834e80ed705293ce52fdf4c3371a812a5a56252aeb676e0a8fbf44834836a01bfc67bdac8131fbc6fd8e2fbe5405f80c4bba6fdd0dc5fb23e93742fcd390
 MISC metadata.xml 1993 BLAKE2B 3aecadf1e1e139a45ffd6f68941ac6f6609679ea34092e091daea5d736ed75178c3680e2dff87c98e0e5f77fa9336f8fde04c7279af67cdbf85bd537af230e0c SHA512 0e51fd432836ee7e4450baa1cf8d1aa80e6fc7bcf30f0c6bf75e564d8e882a170d538ac64b4479047b9dda15b1fa4ceabdabe393caa50a08a0daee5787c5556c
diff --git a/x11-wm/lumina/lumina-1.6.2_p1.ebuild b/x11-wm/lumina/lumina-1.6.2_p1.ebuild
new file mode 100644
index 000000000000..b3b9afaa5cf3
--- /dev/null
+++ b/x11-wm/lumina/lumina-1.6.2_p1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="af ar az bg bn bs ca cs cy da de el en_AU en_GB en_ZA es et eu fa fi fr fr_CA fur gl he hi hr hu id is it ja ka ko lt lv mk mn ms mt nb ne nl pa pl pt pt_BR ro ru sa sk sl sr sv sw ta tg th tr uk ur uz vi zh_CN zh_HK zh_TW zu"
+inherit plocale cmake xdg optfeature
+
+DESCRIPTION="Lumina desktop environment"
+HOMEPAGE="https://lumina-desktop.org/ https://github.com/lumina-desktop/lumina"
+COMMIT="a521c780862034bf2cd18fc0b258c0541def6dc5"
+SRC_URI="https://github.com/andreygrozin/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="desktop-utils"
+
+DEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[widgets]
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libxcb
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-wm
+	desktop-utils? ( app-text/poppler[qt5] )"
+
+RDEPEND="${DEPEND}
+	app-admin/sysstat
+	media-sound/alsa-utils
+	sys-apps/dbus
+	sys-fs/inotify-tools
+	sys-power/acpi
+	|| (
+		x11-apps/xbacklight
+		sys-power/acpilight
+	)
+	x11-apps/xinit
+	x11-apps/xrandr
+	x11-misc/numlockx
+	x11-misc/xcompmgr
+	x11-wm/fluxbox"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	dev-qt/qtpaths:5
+	kde-frameworks/extra-cmake-modules"
+
+DOCS=( README.md )
+
+src_configure() {
+	local mycmakeargs=( -DUtils=$(usex desktop-utils) )
+	cmake_src_configure
+	plocale_find_changes "${S}/src-qt5/core/${PN}-desktop/i18n" "${PN}-desktop_" '.ts'
+}
+
+src_install() {
+	cmake_src_install
+	einstalldocs
+
+	remove_locale() {
+		rm -f "${ED}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm
+	}
+
+	plocale_for_each_disabled_locale remove_locale
+}
+
+pkg_postinst() {
+	optfeature_header "Additional runtime features:"
+	optfeature "screensaver support" x11-misc/xscreensaver
+}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 48a4a3744a43..b45f175b7dec 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/thunar-shares-plugin/Manifest b/xfce-extra/thunar-shares-plugin/Manifest
index 5f058ca395d5..2f77911d4711 100644
--- a/xfce-extra/thunar-shares-plugin/Manifest
+++ b/xfce-extra/thunar-shares-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST thunar-shares-plugin-0.3.2.tar.bz2 365609 BLAKE2B 25f959d81b689dabe930910402dddb047208caf9400db9830b1e5a1f8fad6b676706ce79b9c7e0036292c995451998ff40cadd60ae2eaa47bcaf7994772081ba SHA512 26c3085b3ede065a0c9cdaf5a97d1617d581148e14d35e690f592316beb4e261f31cf864b5f47449030a77cdab33a22cfd4f9f36ccc47d4736e754de459b89e3
+DIST thunar-shares-plugin-0.4.0.tar.bz2 424024 BLAKE2B 789385d30cee139e8346b5c1e566b8af93fdb84e7a82bda535562c6d93edc71c5424f6e151bc390842cacf6352c59a945519688861b3a262c8f7101e90ca5df8 SHA512 ec09de7a9149118dde83fa81a495c0a05b9f297aebf2b6c24b8432feea1c3cadadd3147c48158a2532022aaaf2cb1e461871e5489d3eeff08ff02b7e5942352d
 EBUILD thunar-shares-plugin-0.3.2.ebuild 711 BLAKE2B 0a6b67da4c28685f7527f86f2ee263131a224c1b170927f96ceb27de9bbc69b1ddf90f132db1ad1885ecf10c458052cd1e7d1ee23f430a3d965f1ba1dedfe71e SHA512 c4d410a4bcdb05a8d2ea501813eff5b630c34e9a962e90c8355f5d03335635810a097f3e8027822651741cf07563d8524f6c3f4dc325a39677a68e9e1e917d73
+EBUILD thunar-shares-plugin-0.4.0.ebuild 751 BLAKE2B cbe050a0fff0f1435d0da96802a09b25bc0b2ae90a19cc10ccde7cc259299947d069902723817bc2c99c907b96fe7a0663ebda0984d542fd317339330dcf28c6 SHA512 52d0b9f7a1e7415e79d7b3fd0ee7779f74ea2019cbe5796942d01c4c9a5d04f6c78eeb07723679764c4c19aac31ff94912c53bb7232583ee45482e39cd61cae3
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.4.0.ebuild b/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.4.0.ebuild
new file mode 100644
index 000000000000..3e54d10ec171
--- /dev/null
+++ b/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.4.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Thunar plugin to share files using Samba"
+HOMEPAGE="
+	https://goodies.xfce.org/projects/thunar-plugins/thunar-shares-plugin
+	https://gitlab.xfce.org/thunar-plugins/thunar-shares-plugin/
+"
+SRC_URI="
+	https://archive.xfce.org/src/thunar-plugins/thunar-shares-plugin/${PV%.*}/${P}.tar.bz2
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.26.0
+	>=x11-libs/gtk+-3.22.0:3
+	>=xfce-base/thunar-1.7:=
+	>=xfce-base/xfconf-4.12.0:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}